From 00adf6de810f403273d77779adfd8a8034001e72 Mon Sep 17 00:00:00 2001
From: fergusean <github@seanf.me>
Date: Fri, 13 Feb 2015 00:12:13 -0500
Subject: [PATCH 001/370] Skip inquiring PHP for temp directory when it's user
 defined

---
 src/PhpWord/Settings.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 67b1dbed..d0c09205 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -298,12 +298,11 @@ class Settings
      */
     public static function getTempDir()
     {
-        $tempDir = sys_get_temp_dir();
-
         if (!empty(self::$tempDir)) {
             $tempDir = self::$tempDir;
+        } else {
+            $tempDir = sys_get_temp_dir();
         }
-
         return $tempDir;
     }
 

From daf7d1114470d858ccbf10e3895e29f4c53f4d5c Mon Sep 17 00:00:00 2001
From: ejuhjav <ejuhjav@luukku.com>
Date: Wed, 20 May 2015 13:17:11 +0200
Subject: [PATCH 002/370] Update elements.rst

Fixed a typo in the $lineStyle example (defined previously as $linestyle but used as $lineStyle)
---
 docs/elements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index eb70f9ad..0980eed0 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -497,7 +497,7 @@ Line elements can be added to sections by using ``addLine``.
 
 .. code-block:: php
 
-    $linestyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
+    $lineStyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
     $section->addLine($lineStyle)
 
 Available line style attributes:

From 62d3f97e30a5b7262c6655c9a87686254daf5793 Mon Sep 17 00:00:00 2001
From: Frank Meyer <Meyer@Geoplex.de>
Date: Tue, 21 Jul 2015 14:07:23 +0200
Subject: [PATCH 003/370] dded the ability to enable gridlines and axislabels
 on charts added options 'showAxisLabels', 'showGridX', 'showGridY' to charts
 style element

---
 samples/Sample_32_Chart.php                |  8 +-
 src/PhpWord/Style/Chart.php                | 90 ++++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Chart.php |  9 ++-
 3 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/samples/Sample_32_Chart.php b/samples/Sample_32_Chart.php
index bc18392e..b6830fa0 100644
--- a/samples/Sample_32_Chart.php
+++ b/samples/Sample_32_Chart.php
@@ -22,11 +22,16 @@ $categories = array('A', 'B', 'C', 'D', 'E');
 $series1 = array(1, 3, 2, 5, 4);
 $series2 = array(3, 1, 7, 2, 6);
 $series3 = array(8, 3, 2, 5, 4);
+$showGridLines = false;
+$showAxisLabels = false;
 
 foreach ($chartTypes as $chartType) {
     $section->addTitle(ucfirst($chartType), 2);
     $chart = $section->addChart($chartType, $categories, $series1);
     $chart->getStyle()->setWidth(Converter::inchToEmu(2.5))->setHeight(Converter::inchToEmu(2));
+    $chart->getStyle()->setShowGridX($showGridLines);
+    $chart->getStyle()->setShowGridY($showGridLines);
+    $chart->getStyle()->setShowAxisLabels($showAxisLabels);
     if (in_array($chartType, $twoSeries)) {
         $chart->addSeries($categories, $series2);
     }
@@ -43,7 +48,8 @@ $section = $phpWord->addSection(array('colsNum' => 2, 'breakType' => 'continuous
 
 $chartTypes = array('pie', 'bar', 'column', 'line', 'area');
 $multiSeries = array('bar', 'column', 'line', 'area');
-$style = array('width' => Converter::cmToEmu(5), 'height' => Converter::cmToEmu(4), '3d' => true);
+$style = array('width' => Converter::cmToEmu(5), 'height' => Converter::cmToEmu(4), '3d' => true, 
+                'showAxisLabels' => $showAxisLabels, 'showGridX' => $showGridLines, 'showGridY' => $showGridLines);
 foreach ($chartTypes as $chartType) {
     $section->addTitle(ucfirst($chartType), 2);
     $chart = $section->addChart($chartType, $categories, $series1, $style);
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 13b72a33..112a0a4a 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -46,6 +46,27 @@ class Chart extends AbstractStyle
      */
     private $is3d = false;
 
+    /**
+     * Show labels for axis
+     *
+     * @var bool
+     */
+    private $showAxisLabels = false;
+
+    /**
+     * Show Gridlines for Y-Axis
+     *
+     * @var bool
+     */
+    private $gridY = false;
+
+    /**
+     * Show Gridlines for X-Axis
+     *
+     * @var bool
+     */
+    private $gridX = false;
+
     /**
      * Create a new instance
      *
@@ -124,4 +145,73 @@ class Chart extends AbstractStyle
 
         return $this;
     }
+
+    /**
+     * Show labels for axis
+     *
+     * @return bool
+     */
+    public function showAxisLabels()
+    {
+        return $this->showAxisLabels;
+    }
+
+    /**
+     * Set show Gridlines for Y-Axis
+     *
+     * @param bool $value
+     * @return self
+     */
+    public function setShowAxisLabels($value = true)
+    {
+        $this->showAxisLabels = $this->setBoolVal($value, $this->showAxisLabels);
+
+        return $this;
+    }
+
+    /**
+     * Show Gridlines for Y-Axis
+     *
+     * @return bool
+     */
+    public function showGridY()
+    {
+        return $this->gridY;
+    }
+
+    /**
+     * Set show Gridlines for Y-Axis
+     *
+     * @param bool $value
+     * @return self
+     */
+    public function setShowGridY($value = true)
+    {
+        $this->gridY = $this->setBoolVal($value, $this->gridY);
+
+        return $this;
+    }
+
+    /**
+     * Show Gridlines for X-Axis
+     *
+     * @return bool
+     */
+    public function showGridX()
+    {
+        return $this->gridX;
+    }
+
+    /**
+     * Set show Gridlines for X-Axis
+     *
+     * @param bool $value
+     * @return self
+     */
+    public function setShowGridX($value = true)
+    {
+        $this->gridX = $this->setBoolVal($value, $this->gridX);
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 8423762c..abc2962a 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -264,6 +264,7 @@ class Chart extends AbstractPart
      */
     private function writeAxis(XMLWriter $xmlWriter, $type)
     {
+        $style = $this->element->getStyle();
         $types = array(
             'cat' => array('c:catAx', 1, 'b', 2),
             'val' => array('c:valAx', 2, 'l', 1),
@@ -273,7 +274,7 @@ class Chart extends AbstractPart
         $xmlWriter->startElement($axisType);
 
         $xmlWriter->writeElementBlock('c:axId', 'val', $axisId);
-        $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);
+        $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);        
         $xmlWriter->writeElementBlock('c:crossAx', 'val', $axisCross);
         $xmlWriter->writeElementBlock('c:auto', 'val', 1);
 
@@ -281,10 +282,12 @@ class Chart extends AbstractPart
             $xmlWriter->writeElementBlock('c:delete', 'val', 0);
             $xmlWriter->writeElementBlock('c:majorTickMark', 'val', 'none');
             $xmlWriter->writeElementBlock('c:minorTickMark', 'val', 'none');
-            $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none'); // nextTo
+            if($style->showAxisLabels())
+                $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'nextTo');
+            else $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none');
             $xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero');
         }
-        if (isset($this->options['radar'])) {
+        if (isset($this->options['radar']) || ($type == "cat" && $style->showGridX()) || ($type == "val" && $style->showGridY())) {
             $xmlWriter->writeElement('c:majorGridlines');
         }
 

From 3a251770e89d0052b50c6b41551291692d46d559 Mon Sep 17 00:00:00 2001
From: Frank Meyer <FrankyMeyer@gmail.com>
Date: Tue, 21 Jul 2015 14:56:29 +0200
Subject: [PATCH 004/370] Removed complains of php-codesniffer

removed whitespace
changed inline if statement
---
 src/PhpWord/Writer/Word2007/Part/Chart.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index abc2962a..56df1027 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -274,7 +274,7 @@ class Chart extends AbstractPart
         $xmlWriter->startElement($axisType);
 
         $xmlWriter->writeElementBlock('c:axId', 'val', $axisId);
-        $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);        
+        $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);
         $xmlWriter->writeElementBlock('c:crossAx', 'val', $axisCross);
         $xmlWriter->writeElementBlock('c:auto', 'val', 1);
 
@@ -282,9 +282,12 @@ class Chart extends AbstractPart
             $xmlWriter->writeElementBlock('c:delete', 'val', 0);
             $xmlWriter->writeElementBlock('c:majorTickMark', 'val', 'none');
             $xmlWriter->writeElementBlock('c:minorTickMark', 'val', 'none');
-            if($style->showAxisLabels())
+            if($style->showAxisLabels()) {
                 $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'nextTo');
-            else $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none');
+            }
+            else {
+                $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none');
+            }
             $xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero');
         }
         if (isset($this->options['radar']) || ($type == "cat" && $style->showGridX()) || ($type == "val" && $style->showGridY())) {

From a6528471c26f280cb74cd1add9e8ae1c5676956a Mon Sep 17 00:00:00 2001
From: Frank Meyer <FrankyMeyer@gmail.com>
Date: Tue, 21 Jul 2015 15:11:34 +0200
Subject: [PATCH 005/370] changed if statement due to error in codesniffer

---
 src/PhpWord/Writer/Word2007/Part/Chart.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 56df1027..92d61e6e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -282,10 +282,9 @@ class Chart extends AbstractPart
             $xmlWriter->writeElementBlock('c:delete', 'val', 0);
             $xmlWriter->writeElementBlock('c:majorTickMark', 'val', 'none');
             $xmlWriter->writeElementBlock('c:minorTickMark', 'val', 'none');
-            if($style->showAxisLabels()) {
+            if ($style->showAxisLabels()) {
                 $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'nextTo');
-            }
-            else {
+            } else {
                 $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none');
             }
             $xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero');

From 304765162e7c01e8954c69a405966fcf80ee8931 Mon Sep 17 00:00:00 2001
From: Russ <ComputerTinker@users.noreply.github.com>
Date: Wed, 22 Jul 2015 08:57:15 -0500
Subject: [PATCH 006/370] #574 Incorrect Constant Names in \Style\Font.php

Correct constants mapped to "dotDash" and "dotDashHeavy", leaving old spellings for backwards compatibility.
---
 src/PhpWord/Style/Font.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 8980258b..148dadc9 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -33,8 +33,10 @@ class Font extends AbstractStyle
     const UNDERLINE_DASHLONG = 'dashLong';
     const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy';
     const UNDERLINE_DOUBLE = 'dbl';
-    const UNDERLINE_DOTHASH = 'dotDash';
-    const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy';
+    const UNDERLINE_DOTHASH = 'dotDash';  // Incorrect spelling, for backwards compatibility
+    const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy';  // Incorrect spelling, for backwards compatibility
+    const UNDERLINE_DOTDASH = 'dotDash';  // Correct spelling
+    const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy';  // Correct spelling
     const UNDERLINE_DOTDOTDASH = 'dotDotDash';
     const UNDERLINE_DOTDOTDASHHEAVY = 'dotDotDashHeavy';
     const UNDERLINE_DOTTED = 'dotted';

From e9296107461090db6d8ff491bc89249c0d99280e Mon Sep 17 00:00:00 2001
From: Russ <ComputerTinker@users.noreply.github.com>
Date: Wed, 22 Jul 2015 09:01:01 -0500
Subject: [PATCH 007/370] Map Underline Codes to Corrected Constant Values

---
 src/PhpWord/Reader/MsDoc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index c63d8d9e..f3878fa8 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -1686,7 +1686,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASH;
                                     break;
                                 case 0x09:
-                                    $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASH;
+                                    $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASH;
                                     break;
                                 case 0x0A:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASH;
@@ -1701,7 +1701,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHHEAVY;
                                     break;
                                 case 0x19:
-                                    $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASHHEAVY;
+                                    $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASHHEAVY;
                                     break;
                                 case 0x1A:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASHHEAVY;

From 13a1c9f24f99402edc574bbade7961dc8a524a67 Mon Sep 17 00:00:00 2001
From: Sebastian Schwaiger <ses@principiamentis.com>
Date: Wed, 29 Jul 2015 11:16:04 +0200
Subject: [PATCH 008/370] A chart object can also be added to a table cell

---
 src/PhpWord/Element/AbstractContainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 57d646a0..13512694 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -211,7 +211,7 @@ abstract class AbstractContainer extends AbstractElement
             'Title'         => array('Section'),
             'TOC'           => array('Section'),
             'PageBreak'     => array('Section'),
-            'Chart'         => array('Section'),
+            'Chart'         => array('Section', 'Cell'),
         );
 
         // Special condition, e.g. preservetext can only exists in cell when

From cb034879b40c0aa1faee6a699eb50ce48cbf8c4d Mon Sep 17 00:00:00 2001
From: Russ <me@russkenny.com>
Date: Thu, 6 Aug 2015 12:50:31 -0500
Subject: [PATCH 009/370] Add Date Formats to Field Element

Fix a typo (d-M-yyy H:mm), and expand the list of valid date formats.
---
 src/PhpWord/Element/Field.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 1eaa6f24..b277494e 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -47,9 +47,23 @@ class Field extends AbstractElement
         ),
         'DATE'=>array(
             'properties'=> array(
-               'dateformat' =>array('d-M-yyyy', 'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-M-yy', 'yyyy-MM-dd',
-                    'd-MMM-yy', 'd/M/yyyy', 'd MMM. yy', 'd/M/yy', 'MMM-yy', 'd-M-yyy H:mm', 'd-M-yyyy H:mm:ss',
-                    'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss')
+               'dateformat' =>array(
+                    /* Generic formats */
+                    'yyyy-MM-dd', 'yyyy-MM', 'MMM-yy', 'MMM-yyyy', 'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss', 
+                    
+                    /* Day-Month-Year formats */
+                    'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-MMM-yy', 'd MMM. yy', 
+                    'd-M-yy', 'd-M-yy H:mm', 'd-M-yy H:mm:ss', 'd-M-yy H:mm am/pm', 'd-M-yy H:mm:ss am/pm', 'd-M-yy HH:mm', 'd-M-yy HH:mm:ss', 
+                    'd/M/yy', 'd/M/yy H:mm', 'd/M/yy H:mm:ss', 'd/M/yy H:mm am/pm', 'd/M/yy H:mm:ss am/pm', 'd/M/yy HH:mm', 'd/M/yy HH:mm:ss',
+                    'd-M-yyyy', 'd-M-yyyy H:mm', 'd-M-yyyy H:mm:ss', 'd-M-yyyy H:mm am/pm', 'd-M-yyyy H:mm:ss am/pm', 'd-M-yyyy HH:mm', 'd-M-yyyy HH:mm:ss', 
+                    'd/M/yyyy', 'd/M/yyyy H:mm', 'd/M/yyyy H:mm:ss', 'd/M/yyyy H:mm am/pm', 'd/M/yyyy H:mm:ss am/pm', 'd/M/yyyy HH:mm', 'd/M/yyyy HH:mm:ss',
+                    
+                    /* Month-Day-Year formats */
+                    'dddd, MMMM d yyyy', 'MMMM d yyyy', 'MMM-d-yy', 'MMM. d yy', 
+                    'M-d-yy', 'M-d-yy H:mm', 'M-d-yy H:mm:ss', 'M-d-yy H:mm am/pm', 'M-d-yy H:mm:ss am/pm', 'M-d-yy HH:mm', 'M-d-yy HH:mm:ss', 
+                    'M/d/yy', 'M/d/yy H:mm', 'M/d/yy H:mm:ss', 'M/d/yy H:mm am/pm', 'M/d/yy H:mm:ss am/pm', 'M/d/yy HH:mm', 'M/d/yy HH:mm:ss',
+                    'M-d-yyyy', 'M-d-yyyy H:mm', 'M-d-yyyy H:mm:ss', 'M-d-yyyy H:mm am/pm', 'M-d-yyyy H:mm:ss am/pm', 'M-d-yyyy HH:mm', 'M-d-yyyy HH:mm:ss', 
+                    'M/d/yyyy', 'M/d/yyyy H:mm', 'M/d/yyyy H:mm:ss', 'M/d/yyyy H:mm am/pm', 'M/d/yyyy H:mm:ss am/pm', 'M/d/yyyy HH:mm', 'M/d/yyyy HH:mm:ss')
             ),
             'options'=>array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat')
         )

From a9398e32c7f6f5371693878509da50c7eb0ea27c Mon Sep 17 00:00:00 2001
From: Russ <me@russkenny.com>
Date: Thu, 6 Aug 2015 13:22:01 -0500
Subject: [PATCH 010/370] Fix Hour Casing for Intended Formats to Work
 Correctly

Time formats should either be "h" or "HH".  There were some formats
which were incorrectly specified as "H".
---
 src/PhpWord/Element/Field.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index b277494e..4e8195b3 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -53,17 +53,17 @@ class Field extends AbstractElement
                     
                     /* Day-Month-Year formats */
                     'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-MMM-yy', 'd MMM. yy', 
-                    'd-M-yy', 'd-M-yy H:mm', 'd-M-yy H:mm:ss', 'd-M-yy H:mm am/pm', 'd-M-yy H:mm:ss am/pm', 'd-M-yy HH:mm', 'd-M-yy HH:mm:ss', 
-                    'd/M/yy', 'd/M/yy H:mm', 'd/M/yy H:mm:ss', 'd/M/yy H:mm am/pm', 'd/M/yy H:mm:ss am/pm', 'd/M/yy HH:mm', 'd/M/yy HH:mm:ss',
-                    'd-M-yyyy', 'd-M-yyyy H:mm', 'd-M-yyyy H:mm:ss', 'd-M-yyyy H:mm am/pm', 'd-M-yyyy H:mm:ss am/pm', 'd-M-yyyy HH:mm', 'd-M-yyyy HH:mm:ss', 
-                    'd/M/yyyy', 'd/M/yyyy H:mm', 'd/M/yyyy H:mm:ss', 'd/M/yyyy H:mm am/pm', 'd/M/yyyy H:mm:ss am/pm', 'd/M/yyyy HH:mm', 'd/M/yyyy HH:mm:ss',
+                    'd-M-yy', 'd-M-yy h:mm', 'd-M-yy h:mm:ss', 'd-M-yy h:mm am/pm', 'd-M-yy h:mm:ss am/pm', 'd-M-yy HH:mm', 'd-M-yy HH:mm:ss', 
+                    'd/M/yy', 'd/M/yy h:mm', 'd/M/yy h:mm:ss', 'd/M/yy h:mm am/pm', 'd/M/yy h:mm:ss am/pm', 'd/M/yy HH:mm', 'd/M/yy HH:mm:ss',
+                    'd-M-yyyy', 'd-M-yyyy h:mm', 'd-M-yyyy h:mm:ss', 'd-M-yyyy h:mm am/pm', 'd-M-yyyy h:mm:ss am/pm', 'd-M-yyyy HH:mm', 'd-M-yyyy HH:mm:ss', 
+                    'd/M/yyyy', 'd/M/yyyy h:mm', 'd/M/yyyy h:mm:ss', 'd/M/yyyy h:mm am/pm', 'd/M/yyyy h:mm:ss am/pm', 'd/M/yyyy HH:mm', 'd/M/yyyy HH:mm:ss',
                     
                     /* Month-Day-Year formats */
                     'dddd, MMMM d yyyy', 'MMMM d yyyy', 'MMM-d-yy', 'MMM. d yy', 
-                    'M-d-yy', 'M-d-yy H:mm', 'M-d-yy H:mm:ss', 'M-d-yy H:mm am/pm', 'M-d-yy H:mm:ss am/pm', 'M-d-yy HH:mm', 'M-d-yy HH:mm:ss', 
-                    'M/d/yy', 'M/d/yy H:mm', 'M/d/yy H:mm:ss', 'M/d/yy H:mm am/pm', 'M/d/yy H:mm:ss am/pm', 'M/d/yy HH:mm', 'M/d/yy HH:mm:ss',
-                    'M-d-yyyy', 'M-d-yyyy H:mm', 'M-d-yyyy H:mm:ss', 'M-d-yyyy H:mm am/pm', 'M-d-yyyy H:mm:ss am/pm', 'M-d-yyyy HH:mm', 'M-d-yyyy HH:mm:ss', 
-                    'M/d/yyyy', 'M/d/yyyy H:mm', 'M/d/yyyy H:mm:ss', 'M/d/yyyy H:mm am/pm', 'M/d/yyyy H:mm:ss am/pm', 'M/d/yyyy HH:mm', 'M/d/yyyy HH:mm:ss')
+                    'M-d-yy', 'M-d-yy h:mm', 'M-d-yy h:mm:ss', 'M-d-yy h:mm am/pm', 'M-d-yy h:mm:ss am/pm', 'M-d-yy HH:mm', 'M-d-yy HH:mm:ss', 
+                    'M/d/yy', 'M/d/yy h:mm', 'M/d/yy h:mm:ss', 'M/d/yy h:mm am/pm', 'M/d/yy h:mm:ss am/pm', 'M/d/yy HH:mm', 'M/d/yy HH:mm:ss',
+                    'M-d-yyyy', 'M-d-yyyy h:mm', 'M-d-yyyy h:mm:ss', 'M-d-yyyy h:mm am/pm', 'M-d-yyyy h:mm:ss am/pm', 'M-d-yyyy HH:mm', 'M-d-yyyy HH:mm:ss', 
+                    'M/d/yyyy', 'M/d/yyyy h:mm', 'M/d/yyyy h:mm:ss', 'M/d/yyyy h:mm am/pm', 'M/d/yyyy h:mm:ss am/pm', 'M/d/yyyy HH:mm', 'M/d/yyyy HH:mm:ss')
             ),
             'options'=>array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat')
         )

From d11b2467aa0d36bea5c1febfb1fd05b605338d36 Mon Sep 17 00:00:00 2001
From: Russ <me@russkenny.com>
Date: Thu, 6 Aug 2015 15:57:18 -0500
Subject: [PATCH 011/370] Fix Empty Dropdown Entry

Pad any empty dropdown entries we find so that xmlWriter doesn't
generate an error.
---
 src/PhpWord/Writer/Word2007/Element/FormField.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index 432dc9c2..f8a6a128 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -165,6 +165,9 @@ class FormField extends Text
         $xmlWriter->writeElementBlock('w:result', 'w:val', $value);
         $xmlWriter->writeElementBlock('w:default', 'w:val', $default);
         foreach ($entries as $entry) {
+            if ($entry == null || $entry == '') {
+                $entry = str_repeat(' ', self::FILLER_LENGTH);
+            }
             $xmlWriter->writeElementBlock('w:listEntry', 'w:val', $entry);
         }
         $xmlWriter->endElement();

From f7afdebb0331b393a157bb0874c7cf5209a9fbe3 Mon Sep 17 00:00:00 2001
From: Henri MEDOT <anrikun@hotmail.com>
Date: Thu, 12 Nov 2015 18:51:04 +0100
Subject: [PATCH 012/370] Added support for linebreaks <br /> in
 Shared\Html::addHtml()

---
 src/PhpWord/Shared/Html.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index cdc88b43..d9a3f40e 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -128,6 +128,7 @@ class Html
             'ul'        => array('List',        null,   null,       $styles,    $data,  3,              null),
             'ol'        => array('List',        null,   null,       $styles,    $data,  7,              null),
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
+            'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
         );
 
         $newElement = null;
@@ -374,4 +375,17 @@ class Html
 
         return $styles;
     }
+
+    /**
+     * Parse line break
+     *
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @return null
+     */
+    private static function parseLineBreak($element)
+    {
+        $element->addTextBreak();
+
+        return null;
+    }
 }

From a68634c3f1f9ee73a006022fbfa703be2f2ba6de Mon Sep 17 00:00:00 2001
From: Gareth Ellis <garethellis@gmail.com>
Date: Thu, 4 Feb 2016 13:40:16 +0000
Subject: [PATCH 013/370] Properly fixing #257 and helps out on #324

---
 src/PhpWord/Shared/Html.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 64bcab1e..f9b28366 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -177,9 +177,7 @@ class Html
             $cNodes = $node->childNodes;
             if (count($cNodes) > 0) {
                 foreach ($cNodes as $cNode) {
-                    if ($element instanceof AbstractContainer) {
-                        self::parseNode($cNode, $element, $styles, $data);
-                    }
+                    self::parseNode($cNode, $element, $styles, $data);
                 }
             }
         }
@@ -232,11 +230,9 @@ class Html
     {
         $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
-        // Commented as source of bug #257. `method_exists` doesn't seems to work properly in this case.
-        // @todo Find better error checking for this one
-        // if (method_exists($element, 'addText')) {
+        if( is_callable(array($element, 'addText')) ) {
             $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
-        // }
+        }
 
         return null;
     }

From 3c3eecd4da24bf27957b2fdf73b30a03f2d3abc1 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <garethellis@gmail.com>
Date: Thu, 4 Feb 2016 14:06:11 +0000
Subject: [PATCH 014/370] PHPCS fixes

---
 src/PhpWord/Shared/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index f9b28366..ad2e285f 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -230,7 +230,7 @@ class Html
     {
         $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
-        if( is_callable(array($element, 'addText')) ) {
+        if (is_callable(array($element, 'addText'))) {
             $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
         }
 

From 17521e75939133191156e2bec2e70940e5ba1e16 Mon Sep 17 00:00:00 2001
From: Gareth Ellis <garethellis@gmail.com>
Date: Thu, 4 Feb 2016 14:06:47 +0000
Subject: [PATCH 015/370] PHPCS fixes

---
 src/PhpWord/Shared/Html.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index ad2e285f..64bcab1e 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -177,7 +177,9 @@ class Html
             $cNodes = $node->childNodes;
             if (count($cNodes) > 0) {
                 foreach ($cNodes as $cNode) {
-                    self::parseNode($cNode, $element, $styles, $data);
+                    if ($element instanceof AbstractContainer) {
+                        self::parseNode($cNode, $element, $styles, $data);
+                    }
                 }
             }
         }
@@ -230,9 +232,11 @@ class Html
     {
         $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
-        if (is_callable(array($element, 'addText'))) {
+        // Commented as source of bug #257. `method_exists` doesn't seems to work properly in this case.
+        // @todo Find better error checking for this one
+        // if (method_exists($element, 'addText')) {
             $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
-        }
+        // }
 
         return null;
     }

From d2daa5a48cfd182ce256802024f114b868d2384d Mon Sep 17 00:00:00 2001
From: Gareth Ellis <garethellis@gmail.com>
Date: Thu, 4 Feb 2016 14:14:53 +0000
Subject: [PATCH 016/370] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7d6dc2e..2b80b62c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Place announcement text here.
 - Improved error message for the case when `autoload.php` is not found. - @RomanSyroeshko #371
 - Renamed the `align` option of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles into `alignment`. - @RomanSyroeshko
 - Improved performance of `TemplateProcessor::setValue()`. - @kazitanvirahsan #614, #617
+- Fixed some HTML tags not rendering any output (p, header & table) - #257, #324 - @twmobius and @garethellis 
 
 ### Deprecated
 - `getAlign` and `setAlign` methods of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles.

From 0857f36572269aa12c33485384c6ccbfb938e7a7 Mon Sep 17 00:00:00 2001
From: Denis Solovyov <solovyov@bdcolors.com>
Date: Fri, 12 Feb 2016 17:37:44 +0200
Subject: [PATCH 017/370] Add TextRun as container for CheckBox

---
 src/PhpWord/Element/AbstractContainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index d211ae07..260d2300 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -207,7 +207,7 @@ abstract class AbstractContainer extends AbstractElement
             'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
-            'CheckBox'      => array('Section', 'Header', 'Footer', 'Cell'),
+            'CheckBox'      => array('Section', 'Header', 'Footer', 'Cell', 'TextRun'),
             'TextBox'       => array('Section', 'Header', 'Footer', 'Cell'),
             'Footnote'      => array('Section', 'TextRun', 'Cell'),
             'Endnote'       => array('Section', 'TextRun', 'Cell'),

From adfcc62e644f1fe6ce24f5392803cebdf9a02760 Mon Sep 17 00:00:00 2001
From: Sam Sullivan <samsullivan09@gmail.com>
Date: Mon, 11 Apr 2016 12:48:43 -0500
Subject: [PATCH 018/370] imagesavealpha() in Writer\AbstractWriter

---
 src/PhpWord/Writer/AbstractWriter.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 55b20232..c6b64c28 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -360,6 +360,10 @@ abstract class AbstractWriter implements WriterInterface
             // Retrive GD image content or get local media
             if (isset($element['isMemImage']) && $element['isMemImage']) {
                 $image = call_user_func($element['createFunction'], $element['source']);
+                if ($element['imageType'] === 'image/png') {
+                    // PNG images need to preserve alpha channel information
+                    imagesavealpha($image, true);
+                }
                 ob_start();
                 call_user_func($element['imageFunction'], $image);
                 $imageContents = ob_get_contents();

From f4ec74a4c5338f1df4a3dbb58a19b946ab627005 Mon Sep 17 00:00:00 2001
From: Sam Sullivan <samsullivan09@gmail.com>
Date: Mon, 11 Apr 2016 12:49:18 -0500
Subject: [PATCH 019/370] imagesavealpha() in Element\Image

---
 src/PhpWord/Element/Image.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index f5cc7ccc..64ddfd86 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -335,6 +335,10 @@ class Image extends AbstractElement
         // Read image binary data and convert to hex/base64 string
         if ($this->sourceType == self::SOURCE_GD) {
             $imageResource = call_user_func($this->imageCreateFunc, $actualSource);
+            if ($this->imageType === 'image/png') {
+                // PNG images need to preserve alpha channel information
+                imagesavealpha($imageResource, true);
+            }
             ob_start();
             call_user_func($this->imageFunc, $imageResource);
             $imageBinary = ob_get_contents();

From 133b727f592eef4c47d099f543fcdbe45833bc42 Mon Sep 17 00:00:00 2001
From: ale rimoldi <ale.comp_06@xox.ch>
Date: Mon, 25 Jul 2016 10:11:52 +0200
Subject: [PATCH 020/370] table->setStretch() optionally avoids the table to
 stretch to the page width (only for word output)

---
 src/PhpWord/Style/Table.php                 | 33 +++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Style/Table.php | 15 ++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 24f50667..4b411cdc 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -28,6 +28,8 @@ class Table extends Border
     const WIDTH_AUTO = 'auto'; // Automatically determined width
     const WIDTH_PERCENT = 'pct'; // Width in fiftieths (1/50) of a percent (1% = 50 unit)
     const WIDTH_TWIP = 'dxa'; // Width in twentieths (1/20) of a point (twip)
+    const STRETCH_AUTO = 'autofit'; // Automatically stretch the table to fit the page width
+    const STRETCH_FIXED = 'fixed'; // Do not stretch the table to fit the page width
 
     /**
      * Is this a first row style?
@@ -121,6 +123,11 @@ class Table extends Border
      */
     private $unit = self::WIDTH_AUTO;
 
+    /**
+     * @var string Stretch the table to the page width
+     */
+    private $stretch = self::STRETCH_AUTO;
+
     /**
      * Create new table style
      *
@@ -563,6 +570,32 @@ class Table extends Border
         return $this;
     }
 
+    /**
+     * Get stretch
+     *
+     * @return string
+     */
+    public function getStretch()
+    {
+        return $this->stretch;
+    }
+
+    /**
+     * Set stretch
+     *
+     * Stretch the table to the page width
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setStretch($value = null)
+    {
+        $enum = array(self::STRETCH_AUTO, self::STRETCH_FIXED);
+        $this->stretch = $this->setEnumVal($value, $enum, $this->stretch);
+
+        return $this;
+    }
+
     /**
      * Get table style only property by checking if it's a firstRow
      *
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 8bbad107..b3686f90 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -74,6 +74,7 @@ class Table extends AbstractStyle
         $styleWriter->write();
 
         $this->writeWidth($xmlWriter, $style->getWidth(), $style->getUnit());
+        $this->writeLayout($xmlWriter, $style->getStretch());
         $this->writeMargin($xmlWriter, $style);
         $this->writeBorder($xmlWriter, $style);
 
@@ -104,6 +105,20 @@ class Table extends AbstractStyle
         $xmlWriter->endElement(); // w:tblW
     }
 
+    /**
+     * Enable/Disable automatic resizing of the table
+     *
+     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     * @param string $layout autofit / fixed
+     * @return void
+     */
+    private function writeLayout(XMLWriter $xmlWriter, $stretch)
+    {
+        $xmlWriter->startElement('w:tblLayout');
+        $xmlWriter->writeAttribute('w:type', $stretch);
+        $xmlWriter->endElement(); // w:tblLayout
+    }
+
     /**
      * Write margin.
      *

From 98d2e0df335d8ef820efe9c7843add2966a603fb Mon Sep 17 00:00:00 2001
From: Michael Spahn <m.spahn@bitexpert.de>
Date: Tue, 16 Aug 2016 17:10:51 +0200
Subject: [PATCH 021/370] Implement PageBreak for odt writer

---
 .../Writer/ODText/Element/PageBreak.php       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/PhpWord/Writer/ODText/Element/PageBreak.php

diff --git a/src/PhpWord/Writer/ODText/Element/PageBreak.php b/src/PhpWord/Writer/ODText/Element/PageBreak.php
new file mode 100644
index 00000000..47b4eeba
--- /dev/null
+++ b/src/PhpWord/Writer/ODText/Element/PageBreak.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\ODText\Element;
+
+/**
+ * PageBreak element writer
+ */
+class PageBreak extends AbstractElement
+{
+    /**
+     * Write element
+     */
+    public function write()
+    {
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->startElement('text:p');
+        $xmlWriter->writeAttribute('text:style-name', 'P1');
+        $xmlWriter->endElement();
+    }
+}

From 49492b25162e5ec89aaacfb11cfbe9dceddd33fd Mon Sep 17 00:00:00 2001
From: Brandon Skrtich <bskrtich@gmail.com>
Date: Fri, 26 Aug 2016 11:06:19 -0600
Subject: [PATCH 022/370] Fix incorrect image size between windows and mac.

See Issue #224
---
 src/PhpWord/Style/Image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Image.php b/src/PhpWord/Style/Image.php
index f2c88b5f..497c6781 100644
--- a/src/PhpWord/Style/Image.php
+++ b/src/PhpWord/Style/Image.php
@@ -60,9 +60,9 @@ class Image extends Frame
     public function __construct()
     {
         parent::__construct();
-        $this->setUnit('px');
+        $this->setUnit(self::UNIT_PT);
 
-        // Backward compatilibity setting
+        // Backward compatibility setting
         // @todo Remove on 1.0.0
         $this->setWrap(self::WRAPPING_STYLE_INLINE);
         $this->setHPos(self::POSITION_HORIZONTAL_LEFT);

From 23e19a2d47da150aa138ab462cfa7684418e3b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Mourey?= <s+github@stephanemourey.fr>
Date: Mon, 12 Sep 2016 16:43:21 +0200
Subject: [PATCH 023/370] Fix division by zero

See #886
---
 src/PhpWord/Writer/ODText/Style/Paragraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 1d821810..494142d7 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -37,8 +37,8 @@ class Paragraph extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $marginTop = is_null($style->getSpaceBefore()) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
-        $marginBottom = is_null($style->getSpaceAfter()) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
+        $marginTop = ($style->getSpaceBefore()==0) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
+        $marginBottom = ($style->getSpaceAfter()==0) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
 
         $xmlWriter->startElement('style:style');
         $xmlWriter->writeAttribute('style:name', $style->getStyleName());

From d52d9b8985d763f227c59ae95353ab26658ca422 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Thu, 27 Oct 2016 23:12:26 +0200
Subject: [PATCH 024/370] Add support for XE and INDEX fields

---
 samples/Sample_27_Field.php                   | 12 ++++-
 src/PhpWord/Element/Field.php                 | 52 ++++++++++++++++++-
 src/PhpWord/Writer/Word2007/Element/Field.php | 42 +++++++++++++--
 tests/PhpWord/Element/FieldTest.php           | 14 +++++
 4 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index 57747895..7e2b968e 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -14,10 +14,18 @@ $section->addText('Date field:');
 $section->addField('DATE', array('dateformat' => 'dddd d MMMM yyyy H:mm:ss'), array('PreserveFormat'));
 
 $section->addText('Page field:');
-$section->addField('PAGE', array('format' => 'ArabicDash'));
+$section->addField('PAGE', array('format' => 'Arabic'));
 
 $section->addText('Number of pages field:');
-$section->addField('NUMPAGES', array('format' => 'Arabic', 'numformat' => '0,00'), array('PreserveFormat'));
+$section->addField('NUMPAGES', array('numformat' => '0,00', 'format' => 'Arabic'), array('PreserveFormat'));
+
+$textrun = $section->addTextRun();
+$textrun->addText('An index field is ');
+$textrun->addField('XE', array(), array('Bold'), 'FieldValue');
+$textrun->addText('here:');
+
+$section->addText('The actual index:');
+$section->addField('INDEX', array(), array('PreserveFormat'));
 
 $textrun = $section->addTextRun(array('alignment' => \PhpOffice\PhpWord\SimpleType\Jc::CENTER));
 $textrun->addText('This is the date of lunar calendar ');
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 48dc1d2e..b5dec19a 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -40,7 +40,8 @@ class Field extends AbstractElement
         ),
         'NUMPAGES'=>array(
            'properties'=>array(
-               'format' => array('Arabic', 'ArabicDash', 'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN'),
+               'format' => array('Arabic', 'ArabicDash', 'CardText', 'DollarText', 'Ordinal', 'OrdText',
+                   'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper'),
                'numformat' => array('0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%')
            ),
            'options'=>array('PreserveFormat')
@@ -52,6 +53,14 @@ class Field extends AbstractElement
                     'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss')
             ),
             'options'=>array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat')
+        ),
+        'XE'=>array(
+            'properties' => array(),
+            'options' => array('Bold', 'Italic')
+        ),
+        'INDEX'=>array(
+            'properties' => array(),
+            'options'=>array('PreserveFormat')
         )
     );
 
@@ -62,6 +71,13 @@ class Field extends AbstractElement
      */
     protected $type;
 
+    /**
+     * Field text
+     *
+     * @var string
+     */
+    protected $text;
+
     /**
      * Field properties
      *
@@ -83,11 +99,12 @@ class Field extends AbstractElement
      * @param array $properties
      * @param array $options
      */
-    public function __construct($type = null, $properties = array(), $options = array())
+    public function __construct($type = null, $properties = array(), $options = array(), $text = null)
     {
         $this->setType($type);
         $this->setProperties($properties);
         $this->setOptions($options);
+        $this->setText($text);
     }
 
     /**
@@ -184,4 +201,35 @@ class Field extends AbstractElement
     {
         return $this->options;
     }
+
+    /**
+     * Set Field text
+     *
+     * @param string $text
+     *
+     * @return string
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function setText($text)
+    {
+        if (isset($text)) {
+            if (is_string($text)) {
+                $this->text = $text;
+            } else {
+                throw new \InvalidArgumentException("Invalid text");
+            }
+        }
+        return $this->text;
+    }
+
+    /**
+     * Get Field text
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index ae4c66ba..ad8032c7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -38,13 +38,18 @@ class Field extends Text
         }
 
         $instruction = ' ' . $element->getType() . ' ';
+        if ($element->getText() != null) {
+            $instruction .= '"' . $element->getText() . '" ';
+        }
         $properties  = $element->getProperties();
         foreach ($properties as $propkey => $propval) {
             switch ($propkey) {
                 case 'format':
-                case 'numformat':
                     $instruction .= '\* ' . $propval . ' ';
                     break;
+                case 'numformat':
+                    $instruction .= '\# ' . $propval . ' ';
+                    break;
                 case 'dateformat':
                     $instruction .= '\@ "' . $propval . '" ';
                     break;
@@ -66,22 +71,49 @@ class Field extends Text
                 case 'LastUsedFormat':
                     $instruction .= '\l ';
                     break;
+                case 'Bold':
+                    $instruction .= '\b ';
+                    break;
+                case 'Italic':
+                    $instruction .= '\i ';
+                    break;
             }
         }
 
         $this->startElementP();
 
-        $xmlWriter->startElement('w:fldSimple');
-        $xmlWriter->writeAttribute('w:instr', $instruction);
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'begin');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:instrText');
+        $xmlWriter->writeAttribute('xml:space', 'preserve');
+        $xmlWriter->text($instruction);
+        $xmlWriter->endElement(); // w:instrText
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'separate');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:rPr');
         $xmlWriter->startElement('w:noProof');
         $xmlWriter->endElement(); // w:noProof
         $xmlWriter->endElement(); // w:rPr
-
         $xmlWriter->writeElement('w:t', '1');
         $xmlWriter->endElement(); // w:r
-        $xmlWriter->endElement(); // w:fldSimple
+        
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'end');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
 
         $this->endElementP(); // w:p
     }
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index b9afad1f..a37722e5 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -70,6 +70,20 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('SakaEraCalendar', 'PreserveFormat'), $oField->getOptions());
     }
 
+    /**
+     * New instance with type and properties and options and text
+     */
+    public function testConstructWithTypePropertiesOptionsText()
+    {
+        $oField = new Field('XE', array(), array('Bold'), 'FieldValue');
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('XE', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('Bold'), $oField->getOptions());
+        $this->assertEquals('FieldValue', $oField->getText());
+    }
+
     /**
      * Test setType exception
      *

From 0953065b8c2d20c1b49f62dac7920dba91cf14cd Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 28 Oct 2016 00:20:47 +0200
Subject: [PATCH 025/370] improve code coverage

---
 tests/PhpWord/Element/FieldTest.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index a37722e5..d4e47e62 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -119,4 +119,16 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $object = new Field('PAGE');
         $object->setOptions(array('foo' => 'bar'));
     }
+
+    /**
+     * Test setText exception
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid text
+     */
+    public function testSetTextException()
+    {
+        $object = new Field('XE');
+        $object->setText(array());
+    }
 }

From e7229fc15c12858a6f6bba4750f96e1332e7b1b9 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 28 Oct 2016 22:27:05 +0200
Subject: [PATCH 026/370] make FontStyle based on paragraph if it set

---
 src/PhpWord/Style/Font.php                    |  2 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  7 +++-
 .../Writer/Word2007/Part/StylesTest.php       | 40 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index b625e3b8..9056844a 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -725,7 +725,7 @@ class Font extends AbstractStyle
     }
 
     /**
-     * Set shading
+     * Set Paragraph
      *
      * @param mixed $value
      * @return self
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 7bcb8d92..9ad87510 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -170,6 +170,9 @@ class Styles extends AbstractPart
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
+        } else if (!is_null($paragraphStyle)) {
+        	// if type is 'paragraph' it should have a styleId
+            $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 
         // Style name
@@ -178,7 +181,9 @@ class Styles extends AbstractPart
         $xmlWriter->endElement();
 
         // Parent style
-        $xmlWriter->writeElementIf(!is_null($paragraphStyle), 'w:basedOn', 'w:val', 'Normal');
+        if (!is_null($paragraphStyle)) {
+             $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+        }
 
         // w:pPr
         if (!is_null($paragraphStyle)) {
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index f40387a1..df20ab3b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -18,7 +18,10 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles
@@ -74,4 +77,41 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertEquals('Normal', $element->getAttribute('w:val'));
     }
+
+    public function testFontStyleBasedOn()
+    {
+        $phpWord = new PhpWord();
+
+        $baseParagraphStyle = new Paragraph();
+        $baseParagraphStyle->setAlignment(Jc::CENTER);
+        $baseParagraphStyle = $phpWord->addParagraphStyle('BaseStyle', $baseParagraphStyle);
+         
+        $childFont = new Font();
+        $childFont->setParagraph($baseParagraphStyle);
+        $childFont->setSize(16);
+        $childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
+         
+        $otherFont = new Font();
+        $otherFont->setSize(20);
+        $otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        // Normal style generated?
+        $path = '/w:styles/w:style[@w:styleId="BaseStyle"]/w:name';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style with paragraph should have it's base style set to that paragraphs style name
+        $path = '/w:styles/w:style[w:name/@w:val="ChildFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style without paragraph should not have a base style set
+        $path = '/w:styles/w:style[w:name/@w:val="OtherFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertNull($element);
+    }
 }

From 77ed1565c3d058c4ad6f3b655efdba90a0ebf0d8 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 28 Oct 2016 22:27:05 +0200
Subject: [PATCH 027/370] make FontStyle based on paragraph if it set

---
 src/PhpWord/Style/Font.php                    |  2 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  7 +++-
 .../Writer/Word2007/Part/StylesTest.php       | 40 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index b625e3b8..9056844a 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -725,7 +725,7 @@ class Font extends AbstractStyle
     }
 
     /**
-     * Set shading
+     * Set Paragraph
      *
      * @param mixed $value
      * @return self
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 7bcb8d92..9ad87510 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -170,6 +170,9 @@ class Styles extends AbstractPart
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
+        } else if (!is_null($paragraphStyle)) {
+        	// if type is 'paragraph' it should have a styleId
+            $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 
         // Style name
@@ -178,7 +181,9 @@ class Styles extends AbstractPart
         $xmlWriter->endElement();
 
         // Parent style
-        $xmlWriter->writeElementIf(!is_null($paragraphStyle), 'w:basedOn', 'w:val', 'Normal');
+        if (!is_null($paragraphStyle)) {
+             $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+        }
 
         // w:pPr
         if (!is_null($paragraphStyle)) {
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index f40387a1..df20ab3b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -18,7 +18,10 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles
@@ -74,4 +77,41 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertEquals('Normal', $element->getAttribute('w:val'));
     }
+
+    public function testFontStyleBasedOn()
+    {
+        $phpWord = new PhpWord();
+
+        $baseParagraphStyle = new Paragraph();
+        $baseParagraphStyle->setAlignment(Jc::CENTER);
+        $baseParagraphStyle = $phpWord->addParagraphStyle('BaseStyle', $baseParagraphStyle);
+         
+        $childFont = new Font();
+        $childFont->setParagraph($baseParagraphStyle);
+        $childFont->setSize(16);
+        $childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
+         
+        $otherFont = new Font();
+        $otherFont->setSize(20);
+        $otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        // Normal style generated?
+        $path = '/w:styles/w:style[@w:styleId="BaseStyle"]/w:name';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style with paragraph should have it's base style set to that paragraphs style name
+        $path = '/w:styles/w:style[w:name/@w:val="ChildFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style without paragraph should not have a base style set
+        $path = '/w:styles/w:style[w:name/@w:val="OtherFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertNull($element);
+    }
 }

From 18474c56c42516c22a49399f912da3932742ed70 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 28 Oct 2016 23:27:24 +0200
Subject: [PATCH 028/370] replace tab with spaces

---
 src/PhpWord/Writer/Word2007/Part/Styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 9ad87510..637c60ff 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -171,7 +171,7 @@ class Styles extends AbstractPart
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
         } else if (!is_null($paragraphStyle)) {
-        	// if type is 'paragraph' it should have a styleId
+            // if type is 'paragraph' it should have a styleId
             $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 

From c50e3c581a47a79ae1f3de8ec3df9847f0352f55 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 28 Oct 2016 23:27:24 +0200
Subject: [PATCH 029/370] replace tab with spaces

---
 src/PhpWord/Writer/Word2007/Part/Styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 9ad87510..637c60ff 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -171,7 +171,7 @@ class Styles extends AbstractPart
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
         } else if (!is_null($paragraphStyle)) {
-        	// if type is 'paragraph' it should have a styleId
+            // if type is 'paragraph' it should have a styleId
             $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 

From 46eebe2136babf70cba9508ae6d2e047743b66a8 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Tue, 8 Nov 2016 23:22:22 +0100
Subject: [PATCH 030/370] add support for Image creation from string image data

---
 src/PhpWord/Element/Image.php       | 31 +++++++++++++++--
 tests/PhpWord/Element/ImageTest.php | 53 +++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index bf2b03d6..d7e5a665 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -35,6 +35,7 @@ class Image extends AbstractElement
     const SOURCE_LOCAL = 'local'; // Local images
     const SOURCE_GD = 'gd'; // Generated using GD
     const SOURCE_ARCHIVE = 'archive'; // Image in archives zip://$archive#$image
+    const SOURCE_STRING = 'string'; // Image from string
 
     /**
      * Image source
@@ -379,6 +380,8 @@ class Image extends AbstractElement
         // Check image data
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
             $imageData = $this->getArchiveImageSize($source);
+        } else if ($this->sourceType == self::SOURCE_STRING) {
+            $imageData = $this->getStringImageSize($source);
         } else {
             $imageData = @getimagesize($source);
         }
@@ -416,9 +419,15 @@ class Image extends AbstractElement
         } elseif (strpos($source, 'zip://') !== false) {
             $this->memoryImage = false;
             $this->sourceType = self::SOURCE_ARCHIVE;
+        } elseif (filter_var($source, FILTER_VALIDATE_URL) !== false) {
+            $this->memoryImage = true;
+            $this->sourceType = self::SOURCE_GD;
+        } elseif (@file_exists($source)) {
+            $this->memoryImage = false;
+            $this->sourceType = self::SOURCE_LOCAL;
         } else {
-            $this->memoryImage = (filter_var($source, FILTER_VALIDATE_URL) !== false);
-            $this->sourceType = $this->memoryImage ? self::SOURCE_GD : self::SOURCE_LOCAL;
+            $this->memoryImage = true;
+            $this->sourceType = self::SOURCE_STRING;
         }
     }
 
@@ -460,6 +469,24 @@ class Image extends AbstractElement
         return $imageData;
     }
 
+    /**
+     * get image size from string
+     * 
+     * @param string $source
+     * 
+     * @codeCoverageIgnore this method is just a replacement for getimagesizefromstring which exists only as of PHP 5.4
+     */
+    private function getStringImageSize($source)
+    {
+        if (!function_exists('getimagesizefromstring')) {
+            $uri = 'data://application/octet-stream;base64,'  . base64_encode($source);
+            return @getimagesize($uri);
+        } else {
+            return @getimagesizefromstring($source);
+        }
+        return false;
+    }
+
     /**
      * Set image functions and extensions.
      *
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index c463b0c4..9ef9694b 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -156,4 +156,57 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $image = new Image("zip://{$archiveFile}#{$imageFile}");
         $this->assertEquals('image/jpeg', $image->getImageType());
     }
+
+    /**
+     * Test getting image as string
+     */
+    public function testImageAsStringFromFile()
+    {
+        $image = new Image(__DIR__ . '/../_files/images/earth.jpg');
+
+        $this->assertNotNull($image->getImageStringData());
+        $this->assertNotNull($image->getImageStringData(true));
+    }
+
+    /**
+     * Test getting image from zip as string
+     */
+    public function testImageAsStringFromZip()
+    {
+        $archiveFile = __DIR__ . '/../_files/documents/reader.docx';
+        $imageFile = 'word/media/image1.jpeg';
+        $image = new Image("zip://{$archiveFile}#{$imageFile}");
+
+        $this->assertNotNull($image->getImageStringData());
+        $this->assertNotNull($image->getImageStringData(true));
+    }
+
+    /**
+     * Test construct from string
+     */
+    public function testConstructFromString()
+    {
+        $source = file_get_contents(__DIR__ . '/../_files/images/earth.jpg');
+
+        $image = new Image($source);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Image', $image);
+        $this->assertEquals($source, $image->getSource());
+        $this->assertEquals(md5($source), $image->getMediaId());
+        $this->assertEquals('image/jpeg', $image->getImageType());
+        $this->assertEquals('jpg', $image->getImageExtension());
+        $this->assertEquals('imagecreatefromjpeg', $image->getImageCreateFunction());
+        $this->assertEquals('imagejpeg', $image->getImageFunction());
+        $this->assertTrue($image->isMemImage());
+    }
+
+    /**
+     * Test invalid string image
+     *
+     * @expectedException \PhpOffice\PhpWord\Exception\InvalidImageException
+     */
+    public function testInvalidImageString()
+    {
+        $object = new Image('this_is-a_non_valid_image');
+        $object->getSource();
+    }
 }

From 1a1b362f401ba84eb2133f465a1d4027a7467c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Mourey?= <s+github@stephanemourey.fr>
Date: Tue, 13 Dec 2016 21:51:44 +0100
Subject: [PATCH 031/370] Update Paragraph.php

---
 src/PhpWord/Writer/ODText/Style/Paragraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 494142d7..14adda85 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -37,8 +37,8 @@ class Paragraph extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $marginTop = ($style->getSpaceBefore()==0) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
-        $marginBottom = ($style->getSpaceAfter()==0) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
+        $marginTop = ($style->getSpaceBefore() ==0 ) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
+        $marginBottom = ($style->getSpaceAfter() == 0) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
 
         $xmlWriter->startElement('style:style');
         $xmlWriter->writeAttribute('style:name', $style->getStyleName());

From b6a9f7c9b3d809e10c38834a27a94058526ac5df Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sat, 21 Jan 2017 19:06:49 +0100
Subject: [PATCH 032/370] fix paper size and add tests for Paper class

---
 src/PhpWord/Style/Paper.php       | 14 ++++--
 tests/PhpWord/Style/PaperTest.php | 72 +++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpWord/Style/PaperTest.php

diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index ed1c59eb..eb0bcd77 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\Shared\Converter;
+
 /**
  * Paper size from ISO/IEC 29500-1:2012 pg. 1656-1657
  *
@@ -100,6 +102,7 @@ class Paper extends AbstractStyle
         'A3'        => array(297, 420, 'mm'),
         'A4'        => array(210, 297, 'mm'),
         'A5'        => array(148, 210, 'mm'),
+        'B5'        => array(176, 250, 'mm'),
         'Folio'     => array(8.5, 13, 'in'),
         'Legal'     => array(8.5, 14, 'in'),
         'Letter'    => array(8.5, 11, 'in'),
@@ -157,11 +160,14 @@ class Paper extends AbstractStyle
         $this->size = $this->setEnumVal($size, array_keys($this->sizes), $this->size);
 
         list($width, $height, $unit) = $this->sizes[$this->size];
-        $multipliers = array('mm' => 56.5217, 'in' => 1440);
-        $multiplier = $multipliers[$unit];
 
-        $this->width = (int)round($width * $multiplier);
-        $this->height = (int)round($height * $multiplier);
+        if ($unit == 'mm') {
+            $this->width = Converter::cmToTwip($width / 10);
+            $this->height = Converter::cmToTwip($height / 10);
+        } else {
+            $this->width = Converter::inchToTwip($width);
+            $this->height = Converter::inchToTwip($height);
+        }
 
         return $this;
     }
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
new file mode 100644
index 00000000..8e1dd960
--- /dev/null
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\TestHelperDOCX;
+
+/**
+ * Test class for PhpOffice\PhpWord\Style\Paper
+ *
+ * @runTestsInSeparateProcesses
+ */
+class PaperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Tear down after each test
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Test initiation for paper
+     */
+    public function testInitiation()
+    {
+        $object = new Paper();
+
+        $this->assertEquals('A4', $object->getSize());
+    }
+
+    /**
+     * Test paper size for B5 format
+     */
+    public function testB5Size()
+    {
+        $object = new Paper('B5');
+
+        $this->assertEquals('B5', $object->getSize());
+        $this->assertEquals(9977.9527559055, $object->getWidth(), '', 0.000000001);
+        $this->assertEquals(14173.228346457, $object->getHeight(), '', 0.000000001);
+    }
+
+    /**
+     * Test paper size for Folio format
+     */
+    public function testFolioSize()
+    {
+        $object = new Paper();
+        $object->setSize('Folio');
+
+        $this->assertEquals('Folio', $object->getSize());
+        $this->assertEquals(12240, $object->getWidth(), '', 0.1);
+        $this->assertEquals(18720, $object->getHeight(), '', 0.1);
+    }
+}

From fc3bc29a026ab31825390873da874b50f9e8863c Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sun, 22 Jan 2017 11:09:44 +0100
Subject: [PATCH 033/370] fix default page size

---
 src/PhpWord/Style/Section.php       | 14 +++++++-------
 tests/PhpWord/Style/SectionTest.php | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index 62eb8f11..be8a3aad 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -35,14 +35,14 @@ class Section extends Border
      *
      * @const int|float
      */
-    const DEFAULT_WIDTH = 11870;        // In twips.
-    const DEFAULT_HEIGHT = 16787;       // In twips.
-    const DEFAULT_MARGIN = 1440;        // In twips.
-    const DEFAULT_GUTTER = 0;           // In twips.
-    const DEFAULT_HEADER_HEIGHT = 720;  // In twips.
-    const DEFAULT_FOOTER_HEIGHT = 720;  // In twips.
+    const DEFAULT_WIDTH = 11905.511811024; // In twips.
+    const DEFAULT_HEIGHT = 16837.79527559; // In twips.
+    const DEFAULT_MARGIN = 1440;           // In twips.
+    const DEFAULT_GUTTER = 0;              // In twips.
+    const DEFAULT_HEADER_HEIGHT = 720;     // In twips.
+    const DEFAULT_FOOTER_HEIGHT = 720;     // In twips.
     const DEFAULT_COLUMN_COUNT = 1;
-    const DEFAULT_COLUMN_SPACING = 720; // In twips.
+    const DEFAULT_COLUMN_SPACING = 720;    // In twips.
 
     /**
      * Page Orientation
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index ed25ac36..d15dc490 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -33,14 +33,14 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $oSettings = new Section();
 
         $this->assertEquals('portrait', $oSettings->getOrientation());
-        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
-        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
+        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
+        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
         $this->assertEquals('A4', $oSettings->getPaperSize());
 
         $oSettings->setSettingValue('orientation', 'landscape');
         $this->assertEquals('landscape', $oSettings->getOrientation());
-        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
-        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
+        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
+        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
 
         $iVal = rand(1, 1000);
         $oSettings->setSettingValue('borderSize', $iVal);
@@ -110,7 +110,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         // Section Settings
         $oSettings = new Section();
 
-        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
+        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
         $iVal = rand(1, 1000);
         $oSettings->setSettingValue('pageSizeW', $iVal);
         $this->assertEquals($iVal, $oSettings->getPageSizeW());
@@ -124,7 +124,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         // Section Settings
         $oSettings = new Section();
 
-        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
+        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
         $iVal = rand(1, 1000);
         $oSettings->setSettingValue('pageSizeH', $iVal);
         $this->assertEquals($iVal, $oSettings->getPageSizeH());
@@ -140,8 +140,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
 
         $oSettings->setLandscape();
         $this->assertEquals('landscape', $oSettings->getOrientation());
-        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
-        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
+        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
+        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
     }
 
     /**
@@ -154,8 +154,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
 
         $oSettings->setPortrait();
         $this->assertEquals('portrait', $oSettings->getOrientation());
-        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
-        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
+        $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
+        $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
     }
 
     /**

From 1ab93e7e8a188ba9a984784b9c5c0a90d492ee06 Mon Sep 17 00:00:00 2001
From: sergeizelenyi <sergeizelenyi@gmail.com>
Date: Mon, 23 Jan 2017 16:15:33 +0300
Subject: [PATCH 034/370] added functionality specified alias and tag

---
 src/PhpWord/Element/SDT.php                 | 46 +++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Element/SDT.php |  4 ++
 2 files changed, 50 insertions(+)

diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 58a477d9..68a79108 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -45,6 +45,20 @@ class SDT extends Text
      */
     private $listItems = array();
 
+    /**
+     * Alias
+     *
+     * @var string
+     */
+    private $alias;
+
+    /**
+     * Tag
+     *
+     * @var string
+     */
+    private $tag;
+
     /**
      * Create new instance
      *
@@ -127,4 +141,36 @@ class SDT extends Text
 
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getTag()
+    {
+        return $this->tag;
+    }
+
+    /**
+     * @param string $tag
+     */
+    public function setTag($tag)
+    {
+        $this->tag = $tag;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+     * @param mixed $alias
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 313bf7e0..b4b241aa 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -43,6 +43,8 @@ class SDT extends Text
         }
         $type = $element->getType();
         $writeFormField = "write{$type}";
+        $alias = $element->getAlias();
+        $tag = $element->getTag();
 
         $this->startElementP();
 
@@ -50,6 +52,8 @@ class SDT extends Text
 
         // Properties
         $xmlWriter->startElement('w:sdtPr');
+        $xmlWriter->writeElementBlock('w:alias', 'w:val', $alias);
+        $xmlWriter->writeElementBlock('w:tag', 'w:val', $tag);
         $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
         $xmlWriter->writeElementBlock('w:lock', 'w:val', 'sdtLocked');
         $this->$writeFormField($xmlWriter, $element);

From 8b960c79d5bb2ec1c24e4f97118edf574e457f54 Mon Sep 17 00:00:00 2001
From: sergeizelenyi <sergeizelenyi@gmail.com>
Date: Mon, 23 Jan 2017 16:43:56 +0300
Subject: [PATCH 035/370] stylization code

---
 src/PhpWord/Element/SDT.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 68a79108..89a14197 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -143,6 +143,8 @@ class SDT extends Text
     }
 
     /**
+     * Get tag
+     * 
      * @return string
      */
     public function getTag()
@@ -151,15 +153,22 @@ class SDT extends Text
     }
 
     /**
+     * Set tag
+     *
      * @param string $tag
+     * @return self
      */
     public function setTag($tag)
     {
         $this->tag = $tag;
+
+        return $this;
     }
 
     /**
-     * @return mixed
+     * Get alias
+     *
+     * @return string
      */
     public function getAlias()
     {
@@ -167,10 +176,15 @@ class SDT extends Text
     }
 
     /**
-     * @param mixed $alias
+     * Set alias
+     *
+     * @param string $alias
+     * @return self
      */
     public function setAlias($alias)
     {
         $this->alias = $alias;
+
+        return $this;
     }
 }

From d23409f687ec864ba6c489923be124ce29efb8e0 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sat, 28 Jan 2017 11:39:43 +0100
Subject: [PATCH 036/370] Add possibility to show/hide spelling and grammatical
 errors

---
 docs/general.rst                              | 13 +++++
 src/PhpWord/Settings.php                      | 52 +++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  4 ++
 tests/PhpWord/SettingsTest.php                | 14 +++++
 .../Writer/Word2007/Part/SettingsTest.php     | 38 ++++++++++++++
 5 files changed, 121 insertions(+)

diff --git a/docs/general.rst b/docs/general.rst
index 27d0448a..9b7eb54b 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -183,3 +183,16 @@ points to twips.
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Converter::inchToTwip(.5));
     // 2 cm right margin
     $sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(2));
+
+Language
+--------
+
+You can hide spelling errors:
+
+.. code-block:: php
+    \PhpOffice\PhpWord\Settings::setSpellingErrorsHidden(true);
+
+And hide grammatical errors:
+
+.. code-block:: php
+    \PhpOffice\PhpWord\Settings::setGrammaticalErrorsHidden(true);
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index e049c46e..b1ef2759 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -119,6 +119,18 @@ class Settings
      */
     private static $defaultFontSize = self::DEFAULT_FONT_SIZE;
 
+    /**
+     * Hide spelling errors
+     * @var boolean
+     */
+    private static $spellingErrorsHidden = false;
+
+    /**
+     * Hide grammatical errors
+     * @var boolean
+     */
+    private static $grammaticalErrorsHidden = false;
+
     /**
      * The user defined temporary directory.
      *
@@ -393,6 +405,46 @@ class Settings
         return false;
     }
 
+    /**
+     * Are spelling errors hidden
+     *
+     * @return boolean
+     */
+    public static function isSpellingErrorsHidden()
+    {
+        return self::$spellingErrorsHidden;
+    }
+    
+    /**
+     * Hide spelling errors
+     *
+     * @param boolean $spellingErrorsHidden
+     */
+    public static function setSpellingErrorsHidden($spellingErrorsHidden)
+    {
+        self::$spellingErrorsHidden = $spellingErrorsHidden;
+    }
+
+    /**
+     * Are grammatical errors hidden
+     *
+     * @return boolean
+     */
+    public static function isGrammaticalErrorsHidden()
+    {
+        return self::$grammaticalErrorsHidden;
+    }
+
+    /**
+     * Hide grammatical errors
+     *
+     * @param boolean $grammaticalErrorsHidden
+     */
+    public static function setGrammaticalErrorsHidden($grammaticalErrorsHidden)
+    {
+        self::$grammaticalErrorsHidden = $grammaticalErrorsHidden;
+    }
+
     /**
      * Load setting from phpword.yml or phpword.yml.dist
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index d881e13a..f13381d2 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\PhpWord\Settings as DocumentSettings;
+
 /**
  * Word2007 settings part writer: word/settings.xml
  *
@@ -104,6 +106,8 @@ class Settings extends AbstractPart
             'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
+            'w:hideSpellingErrors' => array('@attributes' => array('w:val' => DocumentSettings::isSpellingErrorsHidden() ? 'true' : 'false')),
+            'w:hideGrammaticalErrors' => array('@attributes' => array('w:val' => DocumentSettings::isGrammaticalErrorsHidden() ? 'true' : 'false')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
             'w:compat' => array(),
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index f5ac3ed6..0d007b74 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -114,6 +114,20 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse(Settings::setDefaultFontSize(null));
     }
 
+    /**
+     * Test set/get spelling and grammar
+     */
+    public function testSetGetSpellingGrammar()
+    {
+        $this->assertFalse(Settings::isSpellingErrorsHidden());
+        Settings::setSpellingErrorsHidden(true);
+        $this->assertTrue(Settings::isSpellingErrorsHidden());
+
+        $this->assertFalse(Settings::isGrammaticalErrorsHidden());
+        Settings::setGrammaticalErrorsHidden(true);
+        $this->assertTrue(Settings::isGrammaticalErrorsHidden());
+    }
+
     /**
      * Test load config
      */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 6ed23e44..7ae06e14 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -18,6 +18,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Settings;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -66,4 +67,41 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($doc->elementExists($path, $file));
         $this->assertEquals($phpWord->getCompatibility()->getOoxmlVersion(), 15);
     }
+
+    /**
+     * Test language
+     */
+    public function testLanguage()
+    {
+        $phpWord = new PhpWord();
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:themeFontLang';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+        
+        $this->assertEquals('en-US', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test spelling
+     */
+    public function testSpelling()
+    {
+        $phpWord = new PhpWord();
+        Settings::setSpellingErrorsHidden(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:hideSpellingErrors';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+        
+        $this->assertEquals('true', $element->getAttribute('w:val'));
+    }
 }

From 517c432ee68bd079e85542a8f6d8bb9a30a33758 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sun, 29 Jan 2017 13:16:54 +0100
Subject: [PATCH 037/370] fix image loading over https

---
 samples/Sample_13_Images.php        |  6 ++++
 src/PhpWord/Element/Image.php       | 43 ++++++++++++++++-------------
 tests/PhpWord/Element/ImageTest.php | 12 ++++++--
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index a3c2af23..1e6943db 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -20,6 +20,12 @@ $source = 'http://php.net/images/logos/php-med-trans-light.gif';
 $section->addText("Remote image from: {$source}");
 $section->addImage($source);
 
+// Image from string
+$source = 'resources/_mars.jpg';
+$fileContent = file_get_contents($source);
+$section->addText("Image from string");
+$section->addImage($fileContent);
+
 //Wrapping style
 $text = str_repeat('Hello World! ', 15);
 $wrappingStyles = array('inline', 'behind', 'infront', 'square', 'tight');
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index d7e5a665..b8b5cca1 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -340,6 +340,8 @@ class Image extends AbstractElement
             call_user_func($this->imageFunc, $imageResource);
             $imageBinary = ob_get_contents();
             ob_end_clean();
+        } elseif ($this->sourceType == self::SOURCE_STRING) {
+            $imageBinary = $this->source;
         } else {
             $fileHandle = fopen($actualSource, 'rb', false);
             if ($fileHandle !== false) {
@@ -366,33 +368,31 @@ class Image extends AbstractElement
     /**
      * Check memory image, supported type, image functions, and proportional width/height.
      *
-     * @param string $source
-     *
      * @return void
      *
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
-    private function checkImage($source)
+    private function checkImage()
     {
-        $this->setSourceType($source);
+        $this->setSourceType();
 
         // Check image data
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
-            $imageData = $this->getArchiveImageSize($source);
+            $imageData = $this->getArchiveImageSize($this->source);
         } else if ($this->sourceType == self::SOURCE_STRING) {
-            $imageData = $this->getStringImageSize($source);
+            $imageData = $this->getStringImageSize($this->source);
         } else {
-            $imageData = @getimagesize($source);
+            $imageData = @getimagesize($this->source);
         }
         if (!is_array($imageData)) {
-            throw new InvalidImageException(sprintf('Invalid image: %s', $source));
+            throw new InvalidImageException(sprintf('Invalid image: %s', $this->source));
         }
         list($actualWidth, $actualHeight, $imageType) = $imageData;
 
         // Check image type support
         $supportedTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG);
-        if ($this->sourceType != self::SOURCE_GD) {
+        if ($this->sourceType != self::SOURCE_GD && $this->sourceType != self::SOURCE_STRING) {
             $supportedTypes = array_merge($supportedTypes, array(IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM));
         }
         if (!in_array($imageType, $supportedTypes)) {
@@ -408,21 +408,26 @@ class Image extends AbstractElement
     /**
      * Set source type.
      *
-     * @param string $source
      * @return void
      */
-    private function setSourceType($source)
+    private function setSourceType()
     {
-        if (stripos(strrev($source), strrev('.php')) === 0) {
+        if (stripos(strrev($this->source), strrev('.php')) === 0) {
             $this->memoryImage = true;
             $this->sourceType = self::SOURCE_GD;
-        } elseif (strpos($source, 'zip://') !== false) {
+        } elseif (strpos($this->source, 'zip://') !== false) {
             $this->memoryImage = false;
             $this->sourceType = self::SOURCE_ARCHIVE;
-        } elseif (filter_var($source, FILTER_VALIDATE_URL) !== false) {
+        } elseif (filter_var($this->source, FILTER_VALIDATE_URL) !== false) {
             $this->memoryImage = true;
-            $this->sourceType = self::SOURCE_GD;
-        } elseif (@file_exists($source)) {
+            if (strpos($this->source, 'https') === 0) {
+                $fileContent = file_get_contents($this->source);
+                $this->source = $fileContent;
+                $this->sourceType = self::SOURCE_STRING;
+            } else {
+                $this->sourceType = self::SOURCE_GD;
+            }
+        } elseif (@file_exists($this->source)) {
             $this->memoryImage = false;
             $this->sourceType = self::SOURCE_LOCAL;
         } else {
@@ -496,18 +501,18 @@ class Image extends AbstractElement
     {
         switch ($this->imageType) {
             case 'image/png':
-                $this->imageCreateFunc = 'imagecreatefrompng';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefrompng';
                 $this->imageFunc = 'imagepng';
                 $this->imageExtension = 'png';
                 break;
             case 'image/gif':
-                $this->imageCreateFunc = 'imagecreatefromgif';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromgif';
                 $this->imageFunc = 'imagegif';
                 $this->imageExtension = 'gif';
                 break;
             case 'image/jpeg':
             case 'image/jpg':
-                $this->imageCreateFunc = 'imagecreatefromjpeg';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromjpeg';
                 $this->imageFunc = 'imagejpeg';
                 $this->imageExtension = 'jpg';
                 break;
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 9ef9694b..974e868c 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -131,7 +131,15 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      */
     public function testUnsupportedImage()
     {
-        $object = new Image('http://samples.libav.org/image-samples/RACECAR.BMP');
+        //disable ssl verification, never do this in real application, you should pass the certiciate instead!!!
+        $arrContextOptions = array(
+            "ssl" => array(
+                "verify_peer" => false,
+                "verify_peer_name" => false,
+            ),
+        );
+        stream_context_set_default($arrContextOptions);
+        $object = new Image('https://samples.libav.org/image-samples/RACECAR.BMP');
         $object->getSource();
     }
 
@@ -194,7 +202,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(md5($source), $image->getMediaId());
         $this->assertEquals('image/jpeg', $image->getImageType());
         $this->assertEquals('jpg', $image->getImageExtension());
-        $this->assertEquals('imagecreatefromjpeg', $image->getImageCreateFunction());
+        $this->assertEquals('imagecreatefromstring', $image->getImageCreateFunction());
         $this->assertEquals('imagejpeg', $image->getImageFunction());
         $this->assertTrue($image->isMemImage());
     }

From 217fd6ecf1906a1534a88a5e608f73464509163c Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sun, 29 Jan 2017 13:16:54 +0100
Subject: [PATCH 038/370] fix image loading over https

---
 samples/Sample_13_Images.php        |  6 ++++
 src/PhpWord/Element/Image.php       | 43 ++++++++++++++++-------------
 tests/PhpWord/Element/ImageTest.php | 12 ++++++--
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index a3c2af23..1e6943db 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -20,6 +20,12 @@ $source = 'http://php.net/images/logos/php-med-trans-light.gif';
 $section->addText("Remote image from: {$source}");
 $section->addImage($source);
 
+// Image from string
+$source = 'resources/_mars.jpg';
+$fileContent = file_get_contents($source);
+$section->addText("Image from string");
+$section->addImage($fileContent);
+
 //Wrapping style
 $text = str_repeat('Hello World! ', 15);
 $wrappingStyles = array('inline', 'behind', 'infront', 'square', 'tight');
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index d7e5a665..b8b5cca1 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -340,6 +340,8 @@ class Image extends AbstractElement
             call_user_func($this->imageFunc, $imageResource);
             $imageBinary = ob_get_contents();
             ob_end_clean();
+        } elseif ($this->sourceType == self::SOURCE_STRING) {
+            $imageBinary = $this->source;
         } else {
             $fileHandle = fopen($actualSource, 'rb', false);
             if ($fileHandle !== false) {
@@ -366,33 +368,31 @@ class Image extends AbstractElement
     /**
      * Check memory image, supported type, image functions, and proportional width/height.
      *
-     * @param string $source
-     *
      * @return void
      *
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
-    private function checkImage($source)
+    private function checkImage()
     {
-        $this->setSourceType($source);
+        $this->setSourceType();
 
         // Check image data
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
-            $imageData = $this->getArchiveImageSize($source);
+            $imageData = $this->getArchiveImageSize($this->source);
         } else if ($this->sourceType == self::SOURCE_STRING) {
-            $imageData = $this->getStringImageSize($source);
+            $imageData = $this->getStringImageSize($this->source);
         } else {
-            $imageData = @getimagesize($source);
+            $imageData = @getimagesize($this->source);
         }
         if (!is_array($imageData)) {
-            throw new InvalidImageException(sprintf('Invalid image: %s', $source));
+            throw new InvalidImageException(sprintf('Invalid image: %s', $this->source));
         }
         list($actualWidth, $actualHeight, $imageType) = $imageData;
 
         // Check image type support
         $supportedTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG);
-        if ($this->sourceType != self::SOURCE_GD) {
+        if ($this->sourceType != self::SOURCE_GD && $this->sourceType != self::SOURCE_STRING) {
             $supportedTypes = array_merge($supportedTypes, array(IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM));
         }
         if (!in_array($imageType, $supportedTypes)) {
@@ -408,21 +408,26 @@ class Image extends AbstractElement
     /**
      * Set source type.
      *
-     * @param string $source
      * @return void
      */
-    private function setSourceType($source)
+    private function setSourceType()
     {
-        if (stripos(strrev($source), strrev('.php')) === 0) {
+        if (stripos(strrev($this->source), strrev('.php')) === 0) {
             $this->memoryImage = true;
             $this->sourceType = self::SOURCE_GD;
-        } elseif (strpos($source, 'zip://') !== false) {
+        } elseif (strpos($this->source, 'zip://') !== false) {
             $this->memoryImage = false;
             $this->sourceType = self::SOURCE_ARCHIVE;
-        } elseif (filter_var($source, FILTER_VALIDATE_URL) !== false) {
+        } elseif (filter_var($this->source, FILTER_VALIDATE_URL) !== false) {
             $this->memoryImage = true;
-            $this->sourceType = self::SOURCE_GD;
-        } elseif (@file_exists($source)) {
+            if (strpos($this->source, 'https') === 0) {
+                $fileContent = file_get_contents($this->source);
+                $this->source = $fileContent;
+                $this->sourceType = self::SOURCE_STRING;
+            } else {
+                $this->sourceType = self::SOURCE_GD;
+            }
+        } elseif (@file_exists($this->source)) {
             $this->memoryImage = false;
             $this->sourceType = self::SOURCE_LOCAL;
         } else {
@@ -496,18 +501,18 @@ class Image extends AbstractElement
     {
         switch ($this->imageType) {
             case 'image/png':
-                $this->imageCreateFunc = 'imagecreatefrompng';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefrompng';
                 $this->imageFunc = 'imagepng';
                 $this->imageExtension = 'png';
                 break;
             case 'image/gif':
-                $this->imageCreateFunc = 'imagecreatefromgif';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromgif';
                 $this->imageFunc = 'imagegif';
                 $this->imageExtension = 'gif';
                 break;
             case 'image/jpeg':
             case 'image/jpg':
-                $this->imageCreateFunc = 'imagecreatefromjpeg';
+                $this->imageCreateFunc = $this->sourceType == self::SOURCE_STRING ? 'imagecreatefromstring' : 'imagecreatefromjpeg';
                 $this->imageFunc = 'imagejpeg';
                 $this->imageExtension = 'jpg';
                 break;
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 9ef9694b..974e868c 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -131,7 +131,15 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      */
     public function testUnsupportedImage()
     {
-        $object = new Image('http://samples.libav.org/image-samples/RACECAR.BMP');
+        //disable ssl verification, never do this in real application, you should pass the certiciate instead!!!
+        $arrContextOptions = array(
+            "ssl" => array(
+                "verify_peer" => false,
+                "verify_peer_name" => false,
+            ),
+        );
+        stream_context_set_default($arrContextOptions);
+        $object = new Image('https://samples.libav.org/image-samples/RACECAR.BMP');
         $object->getSource();
     }
 
@@ -194,7 +202,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(md5($source), $image->getMediaId());
         $this->assertEquals('image/jpeg', $image->getImageType());
         $this->assertEquals('jpg', $image->getImageExtension());
-        $this->assertEquals('imagecreatefromjpeg', $image->getImageCreateFunction());
+        $this->assertEquals('imagecreatefromstring', $image->getImageCreateFunction());
         $this->assertEquals('imagejpeg', $image->getImageFunction());
         $this->assertTrue($image->isMemImage());
     }

From aef7a0ba76ef774ea2731882870cb0800ce73398 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sun, 29 Jan 2017 14:34:19 +0100
Subject: [PATCH 039/370] add possibility to write w:evenAndOddHeaders in
 settings.xml

---
 src/PhpWord/Settings.php                      | 25 ++++++++++++++++++-
 src/PhpWord/Writer/Word2007/Part/Settings.php |  3 +++
 tests/PhpWord/SettingsTest.php                | 10 ++++++++
 .../Writer/Word2007/Part/SettingsTest.php     | 20 +++++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index e049c46e..3fbbb0a6 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -133,7 +133,14 @@ class Settings
      * @var bool
      */
     private static $outputEscapingEnabled = false;
-    
+
+    /**
+     * Enables different header for odd and even pages.
+     *
+     * @var bool
+     */
+    private static $evenAndOddHeaders = false;
+
     /**
      * Return the compatibility option used by the XMLWriter
      *
@@ -340,6 +347,22 @@ class Settings
         self::$outputEscapingEnabled = $outputEscapingEnabled;
     }
 
+    /**
+     * @return boolean
+     */
+    public static function isEvenAndOddHeaders()
+    {
+        return self::$evenAndOddHeaders;
+    }
+
+    /**
+     * @param boolean $evenAndOddHeaders
+     */
+    public static function setEvenAndOddHeaders($evenAndOddHeaders)
+    {
+        self::$evenAndOddHeaders = $evenAndOddHeaders;
+    }
+
     /**
      * Get default font name
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index d881e13a..82669f91 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\PhpWord\Settings as DocumentSettings;
+
 /**
  * Word2007 settings part writer: word/settings.xml
  *
@@ -103,6 +105,7 @@ class Settings extends AbstractPart
             'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
             'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
+            'w:evenAndOddHeaders' => array('@attributes' => array('w:val' => DocumentSettings::isEvenAndOddHeaders() ? 'true': 'false')),
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index f5ac3ed6..764fccd4 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -114,6 +114,16 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse(Settings::setDefaultFontSize(null));
     }
 
+    /**
+     * Test set/get even and odd headers
+     */
+    public function testSetGetEvenAndOddHeaders()
+    {
+        $this->assertFalse(Settings::isEvenAndOddHeaders());
+        Settings::setEvenAndOddHeaders(true);
+        $this->assertTrue(Settings::isEvenAndOddHeaders());
+    }
+
     /**
      * Test load config
      */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 6ed23e44..be018f8c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -18,6 +18,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Settings;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -66,4 +67,23 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($doc->elementExists($path, $file));
         $this->assertEquals($phpWord->getCompatibility()->getOoxmlVersion(), 15);
     }
+
+    /**
+     * Test even and odd headers
+     */
+    public function testEvenAndOddHeaders()
+    {
+        $phpWord = new PhpWord();
+        Settings::setEvenAndOddHeaders(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:evenAndOddHeaders';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('true', $element->getAttribute('w:val'));
+    }
 }

From f9cab8d02c94854155dd86bbf66b57ba3506b086 Mon Sep 17 00:00:00 2001
From: Andrey Tyshev <slowprog@gmail.com>
Date: Tue, 21 Feb 2017 21:42:56 +0300
Subject: [PATCH 040/370] Fix name of style definitions

---
 src/PhpWord/Reader/Word2007/Document.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index b89a99ad..e5063fd9 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -113,10 +113,10 @@ class Document extends AbstractPart
             'orientation'   => array(self::READ_VALUE, 'w:pgSz', 'w:orient'),
             'colsNum'       => array(self::READ_VALUE, 'w:cols', 'w:num'),
             'colsSpace'     => array(self::READ_VALUE, 'w:cols', 'w:space'),
-            'topMargin'     => array(self::READ_VALUE, 'w:pgMar', 'w:top'),
-            'leftMargin'    => array(self::READ_VALUE, 'w:pgMar', 'w:left'),
-            'bottomMargin'  => array(self::READ_VALUE, 'w:pgMar', 'w:bottom'),
-            'rightMargin'   => array(self::READ_VALUE, 'w:pgMar', 'w:right'),
+            'marginTop'     => array(self::READ_VALUE, 'w:pgMar', 'w:top'),
+            'marginLeft'    => array(self::READ_VALUE, 'w:pgMar', 'w:left'),
+            'marginBottom'  => array(self::READ_VALUE, 'w:pgMar', 'w:bottom'),
+            'marginRight'   => array(self::READ_VALUE, 'w:pgMar', 'w:right'),
             'headerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:header'),
             'footerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:footer'),
             'gutter'        => array(self::READ_VALUE, 'w:pgMar', 'w:gutter'),

From 488b10b73b5ccd9bb8fe8a7b2195cd444edf4093 Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Wed, 8 Mar 2017 13:08:33 +0100
Subject: [PATCH 041/370] allow setValue() for SDTs

---
 samples/Sample_34_SDT.php                   | 8 +++++++-
 src/PhpWord/Writer/Word2007/Element/SDT.php | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_34_SDT.php b/samples/Sample_34_SDT.php
index a5042279..f9077a1a 100644
--- a/samples/Sample_34_SDT.php
+++ b/samples/Sample_34_SDT.php
@@ -15,10 +15,16 @@ $textrun->addSDT('comboBox')->setListItems(array('1' => 'Choice 1', '2' => 'Choi
 $textrun = $section->addTextRun();
 $textrun->addText('Date: ');
 $textrun->addSDT('date');
+$textrun->addTextBreak(1);
+$textrun->addText('Date with pre set value: ');
+$textrun->addSDT('date')->setValue('03/30/2017');
+$textrun->addTextBreak(1);
+$textrun->addText('Date with pre set value: ');
+$textrun->addSDT('date')->setValue('30.03.2017');
 
 $textrun = $section->addTextRun();
 $textrun->addText('Drop down list: ');
-$textrun->addSDT('dropDownList')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'));
+$textrun->addSDT('dropDownList')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'))->setValue('Choice 1');
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 313bf7e0..e25e8989 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -43,6 +43,10 @@ class SDT extends Text
         }
         $type = $element->getType();
         $writeFormField = "write{$type}";
+        $value = $element->getValue();
+        if ($value === null) {
+            $value = 'Pick value';
+        }
 
         $this->startElementP();
 
@@ -58,7 +62,7 @@ class SDT extends Text
         // Content
         $xmlWriter->startElement('w:sdtContent');
         $xmlWriter->startElement('w:r');
-        $xmlWriter->writeElement('w:t', 'Pick value');
+        $xmlWriter->writeElement('w:t', $value);
         $xmlWriter->endElement(); // w:r
         $xmlWriter->endElement(); // w:sdtContent
 

From 05387fac0903969fb88c832042991bd34f0154b0 Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Fri, 10 Mar 2017 13:28:32 +0100
Subject: [PATCH 042/370] enable password setting in word

---
 src/PhpWord/Metadata/Protection.php           | 224 +++++++++++++++++-
 src/PhpWord/Writer/Word2007/Part/Settings.php |  28 ++-
 2 files changed, 244 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 0e2ee7c1..bcc0d652 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -22,18 +22,77 @@ namespace PhpOffice\PhpWord\Metadata;
  *
  * @since 0.12.0
  * @link http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
- * @todo Password!
  */
 class Protection
 {
+    static $algorithmMapping = [
+        1 => 'md2',
+        2 => 'md4',
+        3 => 'md5',
+        4 => 'sha1',
+        5 => '', // 'mac' -> not possible with hash()
+        6 => 'ripemd',
+        7 => 'ripemd160',
+        8 => '',
+        9 => '', //'hmac' -> not possible with hash()
+        10 => '',
+        11 => '',
+        12 => 'sha256',
+        13 => 'sha384',
+        14 => 'sha512',
+    ];
+    static $initialCodeArray = [
+        0xE1F0,
+        0x1D0F,
+        0xCC9C,
+        0x84C0,
+        0x110C,
+        0x0E10,
+        0xF1CE,
+        0x313E,
+        0x1872,
+        0xE139,
+        0xD40F,
+        0x84F9,
+        0x280C,
+        0xA96A,
+        0x4EC3
+    ];
+    static $encryptionMatrix =
+        [
+            [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09],
+            [0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF],
+            [0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0],
+            [0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40],
+            [0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5],
+            [0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A],
+            [0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9],
+            [0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0],
+            [0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC],
+            [0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10],
+            [0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168],
+            [0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C],
+            [0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD],
+            [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
+            [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]
+        ];
+
     /**
-     * Editing restriction readOnly|comments|trackedChanges|forms
+     * Editing restriction none|readOnly|comments|trackedChanges|forms
      *
      * @var string
      * @link http://www.datypic.com/sc/ooxml/a-w_edit-1.html
      */
     private $editing;
 
+    private $password;
+
+    private $spinCount = 100000;
+
+    private $algorithmSid = 4;
+
+    private $salt;
+
     /**
      * Create a new instance
      *
@@ -66,4 +125,165 @@ class Protection
 
         return $this;
     }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    public function setPassword($password)
+    {
+        $this->password = $this->getPasswordHash($password);
+
+        return $this;
+    }
+
+    public function getSpinCount()
+    {
+        return $this->spinCount;
+    }
+
+    public function setSpinCount($spinCount)
+    {
+        $this->spinCount = $spinCount;
+
+        return $this;
+    }
+
+    public function getAlgorithmSid()
+    {
+        return $this->algorithmSid;
+    }
+
+    public function setAlgorithmSid($algorithmSid)
+    {
+        $this->algorithmSid = $algorithmSid;
+
+        return $this;
+    }
+
+    public function setSalt($salt)
+    {
+        $this->salt = $salt;
+    }
+
+    public function getSalt()
+    {
+        return $this->salt;
+    }
+
+    private function getAlgorithm()
+    {
+        $algorithm = self::$algorithmMapping[$this->algorithmSid];
+        if ($algorithm == '') {
+            $algorithm = 'sha1';
+        }
+
+        return $algorithm;
+    }
+
+    private function getPasswordHash($password)
+    {
+        if (empty($password)) {
+            return '';
+        }
+        $passwordMaxLength = 15;
+
+        // Truncate the password to $passwordMaxLength characters
+        $password  = mb_substr($password, 0, min($passwordMaxLength, mb_strlen($password)));
+
+        $byteChars = [];
+
+        echo "password: '{$password}'(".mb_strlen($password).")";
+
+        $pass_utf8  = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
+        for ($i = 0; $i < mb_strlen($password); $i++) {
+            $byteChars[$i] = ord(substr($pass_utf8, $i*2, 1));
+            if ($byteChars[$i] == 0) {
+                echo "hi!$i";
+                $byteChars[$i] = ord(substr($pass_utf8, $i*2+1, 1));
+            }
+        }
+
+        // Compute the high-order word
+        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
+        for ($i = 0; $i < sizeof($byteChars); $i++) {
+            $tmp       = $passwordMaxLength - sizeof($byteChars) + $i;
+            $matrixRow = self::$encryptionMatrix[$tmp];
+
+            for ($intBit = 0; $intBit < 7; $intBit++) {
+                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
+                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
+                }
+            }
+        }
+
+        // Compute low-order word
+        $lowOrderWord = 0;
+        for ($i = sizeof($byteChars) - 1; $i >= 0; $i--) {
+            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
+        }
+        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ sizeof($byteChars) ^ 0xCE4B);
+
+        $combinedKey = $this->int32(($highOrderWord << 16) + $lowOrderWord);
+        $generatedKey = [
+            0 => (($combinedKey & 0x000000FF) >> 0),
+            1 => (($combinedKey & 0x0000FF00) >> 8),
+            2 => (($combinedKey & 0x00FF0000) >> 16),
+            3 => (($combinedKey & 0xFF000000) >> 24),
+        ];
+
+        $tmpStr = '';
+        for ($i = 0; $i < 4; $i++) {
+            $tmpStr .= strtoupper(dechex($generatedKey[$i]));
+        }
+        $generatedKey = [];
+        $tmpStr = mb_convert_encoding($tmpStr, 'UCS-2LE', 'UTF-8');
+        for ($i = 0; $i < strlen($tmpStr); $i++) {
+            $generatedKey[] = ord(substr($tmpStr, $i, 1));
+        }
+
+        $salt      = unpack('C*', base64_decode($this->getSalt()));
+        $algorithm = $this->getAlgorithm();
+
+        $tmpArray1    = $generatedKey;
+        $tmpArray2    = $salt;
+        $generatedKey = array_merge($tmpArray2, $tmpArray1);
+
+        $generatedKey = $this->hashByteArray($algorithm, $generatedKey);
+
+        for ($i = 0; $i < $this->getSpinCount(); $i++) {
+            $iterator = [
+                0 => (($i & 0x000000FF) >> 0),
+                1 => (($i & 0x0000FF00) >> 8),
+                2 => (($i & 0x00FF0000) >> 16),
+                3 => (($i & 0xFF000000) >> 24),
+            ];
+            $generatedKey = array_merge($generatedKey, $iterator);
+            $generatedKey = $this->hashByteArray($algorithm, $generatedKey);
+        }
+
+        $hash = implode(array_map("chr", $generatedKey));
+
+        return base64_encode($hash);
+    }
+
+    private function int32($value)
+    {
+        $value = ($value & 0xFFFFFFFF);
+
+        if ($value & 0x80000000) {
+            $value = -((~$value & 0xFFFFFFFF) + 1);
+        }
+
+        return $value;
+    }
+
+    private function hashByteArray($algorithm, $array)
+    {
+        $string = implode(array_map("chr", $array));
+        $string = hash($algorithm, $string, true);
+
+        return unpack('C*', $string);
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index d881e13a..11549e08 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -152,12 +152,28 @@ class Settings extends AbstractPart
     {
         $protection = $this->getParentWriter()->getPhpWord()->getProtection();
         if ($protection->getEditing() !== null) {
-            $this->settings['w:documentProtection'] = array(
-                '@attributes' => array(
-                    'w:enforcement' => 1,
-                    'w:edit' => $protection->getEditing(),
-                )
-            );
+            if (empty($protection->getPassword())) {
+                $this->settings['w:documentProtection'] = array(
+                    '@attributes' => array(
+                        'w:enforcement' => 1,
+                        'w:edit' => $protection->getEditing(),
+                    )
+                );
+            } else {
+                $this->settings['w:documentProtection'] = array(
+                    '@attributes' => array(
+                        'w:enforcement' => 1,
+                        'w:edit' => $protection->getEditing(),
+                        'w:cryptProviderType' => 'rsaFull',
+                        'w:cryptAlgorithmClass' => 'hash',
+                        'w:cryptAlgorithmType' => 'typeAny',
+                        'w:cryptAlgorithmSid' => $protection->getAlgorithmSid(),
+                        'w:cryptSpinCount' => $protection->getSpinCount(),
+                        'w:hash' => $protection->getPassword(),
+                        'w:salt' => $protection->getSalt(),
+                    )
+                );
+            }
         }
     }
 

From 483a167500a008d4895a79f594658dc3b5fc2769 Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Fri, 10 Mar 2017 15:44:13 +0100
Subject: [PATCH 043/370] refactoring of hash function

---
 src/PhpWord/Metadata/Protection.php | 214 +++++++++++++++++++---------
 1 file changed, 145 insertions(+), 69 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index bcc0d652..5427f570 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -76,6 +76,7 @@ class Protection
             [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
             [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]
         ];
+    static $passwordMaxLength = 15;
 
     /**
      * Editing restriction none|readOnly|comments|trackedChanges|forms
@@ -85,12 +86,32 @@ class Protection
      */
     private $editing;
 
+    /**
+     * Hashed password
+     *
+     * @var string
+     */
     private $password;
 
+    /**
+     * Number of hashing iterations
+     *
+     * @var int
+     */
     private $spinCount = 100000;
 
+    /**
+     * Algorithm-SID according to self::$algorithmMapping
+     *
+     * @var int
+     */
     private $algorithmSid = 4;
 
+    /**
+     * Hashed salt
+     *
+     * @var string
+     */
     private $salt;
 
     /**
@@ -126,11 +147,22 @@ class Protection
         return $this;
     }
 
+    /**
+     * Get password hash
+     *
+     * @return string
+     */
     public function getPassword()
     {
         return $this->password;
     }
 
+    /**
+     * Set password
+     *
+     * @param $password
+     * @return self
+     */
     public function setPassword($password)
     {
         $this->password = $this->getPasswordHash($password);
@@ -138,11 +170,22 @@ class Protection
         return $this;
     }
 
+    /**
+     * Get count for hash iterations
+     *
+     * @return int
+     */
     public function getSpinCount()
     {
         return $this->spinCount;
     }
 
+    /**
+     * Set count for hash iterations
+     *
+     * @param $spinCount
+     * @return self
+     */
     public function setSpinCount($spinCount)
     {
         $this->spinCount = $spinCount;
@@ -150,11 +193,22 @@ class Protection
         return $this;
     }
 
+    /**
+     * Get algorithm-sid
+     *
+     * @return int
+     */
     public function getAlgorithmSid()
     {
         return $this->algorithmSid;
     }
 
+    /**
+     * Set algorithm-sid (see self::$algorithmMapping)
+     *
+     * @param $algorithmSid
+     * @return self
+     */
     public function setAlgorithmSid($algorithmSid)
     {
         $this->algorithmSid = $algorithmSid;
@@ -162,16 +216,34 @@ class Protection
         return $this;
     }
 
-    public function setSalt($salt)
-    {
-        $this->salt = $salt;
-    }
-
+    /**
+     * Get salt hash
+     *
+     * @return string
+     */
     public function getSalt()
     {
         return $this->salt;
     }
 
+    /**
+     * Set salt hash
+     *
+     * @param $salt
+     * @return self
+     */
+    public function setSalt($salt)
+    {
+        $this->salt = $salt;
+
+        return $this;
+    }
+
+    /**
+     * Get algorithm from self::$algorithmMapping
+     *
+     * @return string
+     */
     private function getAlgorithm()
     {
         $algorithm = self::$algorithmMapping[$this->algorithmSid];
@@ -182,35 +254,76 @@ class Protection
         return $algorithm;
     }
 
+    /**
+     * Create a hashed password that MS Word will be able to work with
+     *
+     * @param string $password
+     * @return string
+     */
     private function getPasswordHash($password)
     {
+        $orig_encoding = mb_internal_encoding();
+        mb_internal_encoding("UTF-8");
+
         if (empty($password)) {
             return '';
         }
-        $passwordMaxLength = 15;
 
-        // Truncate the password to $passwordMaxLength characters
-        $password  = mb_substr($password, 0, min($passwordMaxLength, mb_strlen($password)));
+        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
 
+        // Construct a new NULL-terminated string consisting of single-byte characters:
+        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
+        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
+        $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
         $byteChars = [];
-
-        echo "password: '{$password}'(".mb_strlen($password).")";
-
-        $pass_utf8  = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
         for ($i = 0; $i < mb_strlen($password); $i++) {
-            $byteChars[$i] = ord(substr($pass_utf8, $i*2, 1));
+            $byteChars[$i] = ord(substr($pass_utf8, $i * 2, 1));
             if ($byteChars[$i] == 0) {
-                echo "hi!$i";
-                $byteChars[$i] = ord(substr($pass_utf8, $i*2+1, 1));
+                $byteChars[$i] = ord(substr($pass_utf8, $i * 2 + 1, 1));
             }
         }
 
-        // Compute the high-order word
-        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
-        for ($i = 0; $i < sizeof($byteChars); $i++) {
-            $tmp       = $passwordMaxLength - sizeof($byteChars) + $i;
-            $matrixRow = self::$encryptionMatrix[$tmp];
+        // build low-order word and hig-order word and combine them
+        $combinedKey = $this->buildCombinedKey($byteChars);
+        // build reversed hexadecimal string
+        $hex = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
+        $reversedHex = $hex[6].$hex[7].$hex[4].$hex[5].$hex[2].$hex[3].$hex[0].$hex[1];
 
+        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
+
+        // Implementation Notes List:
+        //   Word requires that the initial hash of the password with the salt not be considered in the count.
+        //   The initial hash of salt + key is not included in the iteration count.
+        $generatedKey = hash($this->getAlgorithm(), base64_decode($this->getSalt()) . $generatedKey, true);
+        for ($i = 0; $i < $this->getSpinCount(); $i++) {
+            $generatedKey = hash($this->getAlgorithm(), $generatedKey . pack("CCCC", $i, $i>>8, $i>>16, $i>>24), true);
+        }
+        $generatedKey = base64_encode($generatedKey);
+
+        mb_internal_encoding($orig_encoding);
+
+        return $generatedKey;
+    }
+
+    /**
+     * Build combined key from low-order word and high-order word
+     *
+     * @param array $byteChars -> byte array representation of password
+     * @return int
+     */
+    private function buildCombinedKey($byteChars)
+    {
+        // Compute the high-order word
+        // Initialize from the initial code array (see above), depending on the passwords length.
+        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
+
+        // For each character in the password:
+        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
+        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
+        //   the Encryption Matrix
+        for ($i = 0; $i < sizeof($byteChars); $i++) {
+            $tmp       = self::$passwordMaxLength - sizeof($byteChars) + $i;
+            $matrixRow = self::$encryptionMatrix[$tmp];
             for ($intBit = 0; $intBit < 7; $intBit++) {
                 if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
                     $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
@@ -219,55 +332,26 @@ class Protection
         }
 
         // Compute low-order word
+        // Initialize with 0
         $lowOrderWord = 0;
+        // For each character in the password, going backwards
         for ($i = sizeof($byteChars) - 1; $i >= 0; $i--) {
+            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
             $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
         }
+        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
         $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ sizeof($byteChars) ^ 0xCE4B);
 
-        $combinedKey = $this->int32(($highOrderWord << 16) + $lowOrderWord);
-        $generatedKey = [
-            0 => (($combinedKey & 0x000000FF) >> 0),
-            1 => (($combinedKey & 0x0000FF00) >> 8),
-            2 => (($combinedKey & 0x00FF0000) >> 16),
-            3 => (($combinedKey & 0xFF000000) >> 24),
-        ];
-
-        $tmpStr = '';
-        for ($i = 0; $i < 4; $i++) {
-            $tmpStr .= strtoupper(dechex($generatedKey[$i]));
-        }
-        $generatedKey = [];
-        $tmpStr = mb_convert_encoding($tmpStr, 'UCS-2LE', 'UTF-8');
-        for ($i = 0; $i < strlen($tmpStr); $i++) {
-            $generatedKey[] = ord(substr($tmpStr, $i, 1));
-        }
-
-        $salt      = unpack('C*', base64_decode($this->getSalt()));
-        $algorithm = $this->getAlgorithm();
-
-        $tmpArray1    = $generatedKey;
-        $tmpArray2    = $salt;
-        $generatedKey = array_merge($tmpArray2, $tmpArray1);
-
-        $generatedKey = $this->hashByteArray($algorithm, $generatedKey);
-
-        for ($i = 0; $i < $this->getSpinCount(); $i++) {
-            $iterator = [
-                0 => (($i & 0x000000FF) >> 0),
-                1 => (($i & 0x0000FF00) >> 8),
-                2 => (($i & 0x00FF0000) >> 16),
-                3 => (($i & 0xFF000000) >> 24),
-            ];
-            $generatedKey = array_merge($generatedKey, $iterator);
-            $generatedKey = $this->hashByteArray($algorithm, $generatedKey);
-        }
-
-        $hash = implode(array_map("chr", $generatedKey));
-
-        return base64_encode($hash);
+        // Combine the Low and High Order Word
+        return $this->int32(($highOrderWord << 16) + $lowOrderWord);
     }
 
+    /**
+     * simulate behaviour of int32
+     *
+     * @param int $value
+     * @return int
+     */
     private function int32($value)
     {
         $value = ($value & 0xFFFFFFFF);
@@ -278,12 +362,4 @@ class Protection
 
         return $value;
     }
-
-    private function hashByteArray($algorithm, $array)
-    {
-        $string = implode(array_map("chr", $array));
-        $string = hash($algorithm, $string, true);
-
-        return unpack('C*', $string);
-    }
 }

From 703e34137b4fa9147d864fbef09442aa4370509c Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Fri, 10 Mar 2017 16:24:52 +0100
Subject: [PATCH 044/370] refactored hash function to word settings

---
 src/PhpWord/Metadata/Protection.php           | 191 +----------------
 src/PhpWord/Writer/Word2007/Part/Settings.php | 199 +++++++++++++++++-
 2 files changed, 204 insertions(+), 186 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 5427f570..511503e4 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -25,59 +25,6 @@ namespace PhpOffice\PhpWord\Metadata;
  */
 class Protection
 {
-    static $algorithmMapping = [
-        1 => 'md2',
-        2 => 'md4',
-        3 => 'md5',
-        4 => 'sha1',
-        5 => '', // 'mac' -> not possible with hash()
-        6 => 'ripemd',
-        7 => 'ripemd160',
-        8 => '',
-        9 => '', //'hmac' -> not possible with hash()
-        10 => '',
-        11 => '',
-        12 => 'sha256',
-        13 => 'sha384',
-        14 => 'sha512',
-    ];
-    static $initialCodeArray = [
-        0xE1F0,
-        0x1D0F,
-        0xCC9C,
-        0x84C0,
-        0x110C,
-        0x0E10,
-        0xF1CE,
-        0x313E,
-        0x1872,
-        0xE139,
-        0xD40F,
-        0x84F9,
-        0x280C,
-        0xA96A,
-        0x4EC3
-    ];
-    static $encryptionMatrix =
-        [
-            [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09],
-            [0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF],
-            [0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0],
-            [0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40],
-            [0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5],
-            [0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A],
-            [0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9],
-            [0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0],
-            [0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC],
-            [0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10],
-            [0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168],
-            [0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C],
-            [0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD],
-            [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
-            [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]
-        ];
-    static $passwordMaxLength = 15;
-
     /**
      * Editing restriction none|readOnly|comments|trackedChanges|forms
      *
@@ -91,28 +38,28 @@ class Protection
      *
      * @var string
      */
-    private $password;
+    private $password = '';
 
     /**
      * Number of hashing iterations
      *
      * @var int
      */
-    private $spinCount = 100000;
+    private $spinCount = 0;
 
     /**
-     * Algorithm-SID according to self::$algorithmMapping
+     * Algorithm-SID (see to \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
      *
      * @var int
      */
-    private $algorithmSid = 4;
+    private $algorithmSid = 0;
 
     /**
      * Hashed salt
      *
      * @var string
      */
-    private $salt;
+    private $salt = '';
 
     /**
      * Create a new instance
@@ -165,7 +112,7 @@ class Protection
      */
     public function setPassword($password)
     {
-        $this->password = $this->getPasswordHash($password);
+        $this->password = $password;
 
         return $this;
     }
@@ -204,7 +151,7 @@ class Protection
     }
 
     /**
-     * Set algorithm-sid (see self::$algorithmMapping)
+     * Set algorithm-sid (see \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
      *
      * @param $algorithmSid
      * @return self
@@ -238,128 +185,4 @@ class Protection
 
         return $this;
     }
-
-    /**
-     * Get algorithm from self::$algorithmMapping
-     *
-     * @return string
-     */
-    private function getAlgorithm()
-    {
-        $algorithm = self::$algorithmMapping[$this->algorithmSid];
-        if ($algorithm == '') {
-            $algorithm = 'sha1';
-        }
-
-        return $algorithm;
-    }
-
-    /**
-     * Create a hashed password that MS Word will be able to work with
-     *
-     * @param string $password
-     * @return string
-     */
-    private function getPasswordHash($password)
-    {
-        $orig_encoding = mb_internal_encoding();
-        mb_internal_encoding("UTF-8");
-
-        if (empty($password)) {
-            return '';
-        }
-
-        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
-
-        // Construct a new NULL-terminated string consisting of single-byte characters:
-        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
-        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
-        $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
-        $byteChars = [];
-        for ($i = 0; $i < mb_strlen($password); $i++) {
-            $byteChars[$i] = ord(substr($pass_utf8, $i * 2, 1));
-            if ($byteChars[$i] == 0) {
-                $byteChars[$i] = ord(substr($pass_utf8, $i * 2 + 1, 1));
-            }
-        }
-
-        // build low-order word and hig-order word and combine them
-        $combinedKey = $this->buildCombinedKey($byteChars);
-        // build reversed hexadecimal string
-        $hex = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
-        $reversedHex = $hex[6].$hex[7].$hex[4].$hex[5].$hex[2].$hex[3].$hex[0].$hex[1];
-
-        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
-
-        // Implementation Notes List:
-        //   Word requires that the initial hash of the password with the salt not be considered in the count.
-        //   The initial hash of salt + key is not included in the iteration count.
-        $generatedKey = hash($this->getAlgorithm(), base64_decode($this->getSalt()) . $generatedKey, true);
-        for ($i = 0; $i < $this->getSpinCount(); $i++) {
-            $generatedKey = hash($this->getAlgorithm(), $generatedKey . pack("CCCC", $i, $i>>8, $i>>16, $i>>24), true);
-        }
-        $generatedKey = base64_encode($generatedKey);
-
-        mb_internal_encoding($orig_encoding);
-
-        return $generatedKey;
-    }
-
-    /**
-     * Build combined key from low-order word and high-order word
-     *
-     * @param array $byteChars -> byte array representation of password
-     * @return int
-     */
-    private function buildCombinedKey($byteChars)
-    {
-        // Compute the high-order word
-        // Initialize from the initial code array (see above), depending on the passwords length.
-        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
-
-        // For each character in the password:
-        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
-        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
-        //   the Encryption Matrix
-        for ($i = 0; $i < sizeof($byteChars); $i++) {
-            $tmp       = self::$passwordMaxLength - sizeof($byteChars) + $i;
-            $matrixRow = self::$encryptionMatrix[$tmp];
-            for ($intBit = 0; $intBit < 7; $intBit++) {
-                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
-                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
-                }
-            }
-        }
-
-        // Compute low-order word
-        // Initialize with 0
-        $lowOrderWord = 0;
-        // For each character in the password, going backwards
-        for ($i = sizeof($byteChars) - 1; $i >= 0; $i--) {
-            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
-            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
-        }
-        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
-        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ sizeof($byteChars) ^ 0xCE4B);
-
-        // Combine the Low and High Order Word
-        return $this->int32(($highOrderWord << 16) + $lowOrderWord);
-    }
-
-    /**
-     * simulate behaviour of int32
-     *
-     * @param int $value
-     * @return int
-     */
-    private function int32($value)
-    {
-        $value = ($value & 0xFFFFFFFF);
-
-        if ($value & 0x80000000) {
-            $value = -((~$value & 0xFFFFFFFF) + 1);
-        }
-
-        return $value;
-    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 11549e08..ed9c07d3 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -24,6 +24,59 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
  */
 class Settings extends AbstractPart
 {
+    static $algorithmMapping = [
+        1 => 'md2',
+        2 => 'md4',
+        3 => 'md5',
+        4 => 'sha1',
+        5 => '', // 'mac' -> not possible with hash()
+        6 => 'ripemd',
+        7 => 'ripemd160',
+        8 => '',
+        9 => '', //'hmac' -> not possible with hash()
+        10 => '',
+        11 => '',
+        12 => 'sha256',
+        13 => 'sha384',
+        14 => 'sha512',
+    ];
+    static $initialCodeArray = [
+        0xE1F0,
+        0x1D0F,
+        0xCC9C,
+        0x84C0,
+        0x110C,
+        0x0E10,
+        0xF1CE,
+        0x313E,
+        0x1872,
+        0xE139,
+        0xD40F,
+        0x84F9,
+        0x280C,
+        0xA96A,
+        0x4EC3
+    ];
+    static $encryptionMatrix =
+        [
+            [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09],
+            [0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF],
+            [0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0],
+            [0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40],
+            [0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5],
+            [0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A],
+            [0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9],
+            [0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0],
+            [0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC],
+            [0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10],
+            [0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168],
+            [0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C],
+            [0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD],
+            [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
+            [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]
+        ];
+    static $passwordMaxLength = 15;
+
     /**
      * Settings value
      *
@@ -169,8 +222,8 @@ class Settings extends AbstractPart
                         'w:cryptAlgorithmType' => 'typeAny',
                         'w:cryptAlgorithmSid' => $protection->getAlgorithmSid(),
                         'w:cryptSpinCount' => $protection->getSpinCount(),
-                        'w:hash' => $protection->getPassword(),
-                        'w:salt' => $protection->getSalt(),
+                        'w:hash' => $this->getPasswordHash($protection),
+                        'w:salt' => $this->getSaltHash($protection->getSalt()),
                     )
                 );
             }
@@ -193,4 +246,146 @@ class Settings extends AbstractPart
             ));
         }
     }
+
+
+    /**
+     * Create a hashed password that MS Word will be able to work with
+     *
+     * @param \PhpOffice\PhpWord\Metadata\Protection $protection
+     * @return string
+     */
+    private function getPasswordHash($protection)
+    {
+        $orig_encoding = mb_internal_encoding();
+        mb_internal_encoding("UTF-8");
+
+        $password = $protection->getPassword();
+        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
+
+        // Construct a new NULL-terminated string consisting of single-byte characters:
+        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
+        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
+        $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
+        $byteChars = [];
+        for ($i = 0; $i < mb_strlen($password); $i++) {
+            $byteChars[$i] = ord(substr($pass_utf8, $i * 2, 1));
+            if ($byteChars[$i] == 0) {
+                $byteChars[$i] = ord(substr($pass_utf8, $i * 2 + 1, 1));
+            }
+        }
+
+        // build low-order word and hig-order word and combine them
+        $combinedKey = $this->buildCombinedKey($byteChars);
+        // build reversed hexadecimal string
+        $hex = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
+        $reversedHex = $hex[6].$hex[7].$hex[4].$hex[5].$hex[2].$hex[3].$hex[0].$hex[1];
+
+        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
+
+        // Implementation Notes List:
+        //   Word requires that the initial hash of the password with the salt not be considered in the count.
+        //   The initial hash of salt + key is not included in the iteration count.
+        $algorithm = $this->getAlgorithm($protection->getAlgorithmSid());
+        $generatedKey = hash($algorithm, base64_decode($this->getSaltHash($protection->getSalt())) . $generatedKey, true);
+
+        $spinCount = (!empty($protection->getSpinCount())) ? $protection->getSpinCount() : 100000;
+
+        for ($i = 0; $i < $spinCount; $i++) {
+            $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i>>8, $i>>16, $i>>24), true);
+        }
+        $generatedKey = base64_encode($generatedKey);
+
+        mb_internal_encoding($orig_encoding);
+
+        return $generatedKey;
+    }
+
+    /**
+     * Get algorithm from self::$algorithmMapping
+     *
+     * @param int $sid
+     * @return string
+     */
+    private function getAlgorithm($sid)
+    {
+        if (empty($sid)) {
+            $sid = 4;
+        }
+
+        $algorithm = self::$algorithmMapping[$sid];
+        if ($algorithm == '') {
+            $algorithm = 'sha1';
+        }
+
+        return $algorithm;
+    }
+
+    /**
+     * Get salt hash
+     *
+     * @param string $salt
+     * @return string
+     */
+    private function getSaltHash($salt)
+    {
+        return $salt;
+    }
+
+    /**
+     * Build combined key from low-order word and high-order word
+     *
+     * @param array $byteChars -> byte array representation of password
+     * @return int
+     */
+    private function buildCombinedKey($byteChars)
+    {
+        // Compute the high-order word
+        // Initialize from the initial code array (see above), depending on the passwords length.
+        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
+
+        // For each character in the password:
+        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
+        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
+        //   the Encryption Matrix
+        for ($i = 0; $i < sizeof($byteChars); $i++) {
+            $tmp       = self::$passwordMaxLength - sizeof($byteChars) + $i;
+            $matrixRow = self::$encryptionMatrix[$tmp];
+            for ($intBit = 0; $intBit < 7; $intBit++) {
+                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
+                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
+                }
+            }
+        }
+
+        // Compute low-order word
+        // Initialize with 0
+        $lowOrderWord = 0;
+        // For each character in the password, going backwards
+        for ($i = sizeof($byteChars) - 1; $i >= 0; $i--) {
+            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
+            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
+        }
+        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
+        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ sizeof($byteChars) ^ 0xCE4B);
+
+        // Combine the Low and High Order Word
+        return $this->int32(($highOrderWord << 16) + $lowOrderWord);
+    }
+
+    /**
+     * Simulate behaviour of int32
+     *
+     * @param int $value
+     * @return int
+     */
+    private function int32($value)
+    {
+        $value = ($value & 0xFFFFFFFF);
+
+        if ($value & 0x80000000) {
+            $value = -((~$value & 0xFFFFFFFF) + 1);
+        }
+
+        return $value;
+    }
 }

From 0221414ee0855612b6a5f09412790fb2bf2dfd1e Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Fri, 10 Mar 2017 16:57:42 +0100
Subject: [PATCH 045/370] randomly genereate salt for word password protection

---
 src/PhpWord/Metadata/Protection.php           | 14 ++++----
 src/PhpWord/Writer/Word2007/Part/Settings.php | 35 +++++++++----------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 511503e4..a25a8f31 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -45,14 +45,14 @@ class Protection
      *
      * @var int
      */
-    private $spinCount = 0;
+    private $spinCount = 100000;
 
     /**
      * Algorithm-SID (see to \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
      *
      * @var int
      */
-    private $algorithmSid = 0;
+    private $mswordAlgorithmSid = 4;
 
     /**
      * Hashed salt
@@ -145,20 +145,20 @@ class Protection
      *
      * @return int
      */
-    public function getAlgorithmSid()
+    public function getMswordAlgorithmSid()
     {
-        return $this->algorithmSid;
+        return $this->mswordAlgorithmSid;
     }
 
     /**
      * Set algorithm-sid (see \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
      *
-     * @param $algorithmSid
+     * @param $mswordAlgorithmSid
      * @return self
      */
-    public function setAlgorithmSid($algorithmSid)
+    public function setMswordAlgorithmSid($mswordAlgorithmSid)
     {
-        $this->algorithmSid = $algorithmSid;
+        $this->mswordAlgorithmSid = $mswordAlgorithmSid;
 
         return $this;
     }
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index ed9c07d3..c709ee62 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -213,6 +213,9 @@ class Settings extends AbstractPart
                     )
                 );
             } else {
+                if ($protection->getSalt() == null) {
+                    $protection->setSalt(openssl_random_pseudo_bytes(16));
+                }
                 $this->settings['w:documentProtection'] = array(
                     '@attributes' => array(
                         'w:enforcement' => 1,
@@ -220,7 +223,7 @@ class Settings extends AbstractPart
                         'w:cryptProviderType' => 'rsaFull',
                         'w:cryptAlgorithmClass' => 'hash',
                         'w:cryptAlgorithmType' => 'typeAny',
-                        'w:cryptAlgorithmSid' => $protection->getAlgorithmSid(),
+                        'w:cryptAlgorithmSid' => $protection->getMswordAlgorithmSid(),
                         'w:cryptSpinCount' => $protection->getSpinCount(),
                         'w:hash' => $this->getPasswordHash($protection),
                         'w:salt' => $this->getSaltHash($protection->getSalt()),
@@ -239,11 +242,13 @@ class Settings extends AbstractPart
     {
         $compatibility = $this->getParentWriter()->getPhpWord()->getCompatibility();
         if ($compatibility->getOoxmlVersion() !== null) {
-            $this->settings['w:compat']['w:compatSetting'] = array('@attributes' => array(
-                'w:name'    => 'compatibilityMode',
-                'w:uri'     => 'http://schemas.microsoft.com/office/word',
-                'w:val'     => $compatibility->getOoxmlVersion(),
-            ));
+            $this->settings['w:compat']['w:compatSetting'] = array(
+                '@attributes' => array(
+                    'w:name' => 'compatibilityMode',
+                    'w:uri' => 'http://schemas.microsoft.com/office/word',
+                    'w:val' => $compatibility->getOoxmlVersion(),
+                )
+            );
         }
     }
 
@@ -277,21 +282,19 @@ class Settings extends AbstractPart
         // build low-order word and hig-order word and combine them
         $combinedKey = $this->buildCombinedKey($byteChars);
         // build reversed hexadecimal string
-        $hex = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
-        $reversedHex = $hex[6].$hex[7].$hex[4].$hex[5].$hex[2].$hex[3].$hex[0].$hex[1];
+        $hex         = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
+        $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
 
         $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
 
         // Implementation Notes List:
         //   Word requires that the initial hash of the password with the salt not be considered in the count.
         //   The initial hash of salt + key is not included in the iteration count.
-        $algorithm = $this->getAlgorithm($protection->getAlgorithmSid());
+        $algorithm    = $this->getAlgorithm($protection->getMswordAlgorithmSid());
         $generatedKey = hash($algorithm, base64_decode($this->getSaltHash($protection->getSalt())) . $generatedKey, true);
 
-        $spinCount = (!empty($protection->getSpinCount())) ? $protection->getSpinCount() : 100000;
-
-        for ($i = 0; $i < $spinCount; $i++) {
-            $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i>>8, $i>>16, $i>>24), true);
+        for ($i = 0; $i < $protection->getSpinCount(); $i++) {
+            $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i >> 8, $i >> 16, $i >> 24), true);
         }
         $generatedKey = base64_encode($generatedKey);
 
@@ -308,10 +311,6 @@ class Settings extends AbstractPart
      */
     private function getAlgorithm($sid)
     {
-        if (empty($sid)) {
-            $sid = 4;
-        }
-
         $algorithm = self::$algorithmMapping[$sid];
         if ($algorithm == '') {
             $algorithm = 'sha1';
@@ -328,7 +327,7 @@ class Settings extends AbstractPart
      */
     private function getSaltHash($salt)
     {
-        return $salt;
+        return base64_encode(str_pad(substr($salt, 0, 16), 16, '1'));
     }
 
     /**

From 76246630ce4eac8ba9aac13f8b19cb4b657ca947 Mon Sep 17 00:00:00 2001
From: Maria Haubner <maria.haubner@mayflower.de>
Date: Fri, 10 Mar 2017 17:30:51 +0100
Subject: [PATCH 046/370] add test

---
 src/PhpWord/Writer/Word2007/Part/Settings.php |  2 +-
 .../Writer/Word2007/Part/SettingsTest.php     | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index c709ee62..07d7a90c 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -282,7 +282,7 @@ class Settings extends AbstractPart
         // build low-order word and hig-order word and combine them
         $combinedKey = $this->buildCombinedKey($byteChars);
         // build reversed hexadecimal string
-        $hex         = strtoupper(dechex($combinedKey & 0xFFFFFFFF));
+        $hex         = str_pad(strtoupper(dechex($combinedKey & 0xFFFFFFFF)), 8, '0', \STR_PAD_LEFT);
         $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
 
         $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 6ed23e44..110d2aff 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -50,6 +50,27 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($doc->elementExists($path, $file));
     }
 
+    /**
+     * Test document protection with password
+     *
+     * Note: to get comparison values, a docx was generated in Word2010 and the values taken from the settings.xml
+     */
+    public function testDocumentProtectionWithPassword()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getProtection()->setEditing('readOnly');
+        $phpWord->getProtection()->setPassword('testÄö@€!$&');
+        $phpWord->getProtection()->setSalt(base64_decode("uq81pJRRGFIY5U+E9gt8tA=="));
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:documentProtection';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $this->assertEquals($doc->getElement($path, $file)->getAttribute('w:hash'), "RA9jfY/u3DX114PMcl+uSekxsYk=");
+    }
+
     /**
      * Test compatibility
      */

From 71574d1fe2a3638e4bb3f4a888c9a8d4cd815821 Mon Sep 17 00:00:00 2001
From: Lenz Weber <lenz.weber@mayflower.de>
Date: Mon, 13 Mar 2017 16:22:04 +0100
Subject: [PATCH 047/370] Code Review; minor changes to salt handling,
 corrected some comments

---
 src/PhpWord/Metadata/Protection.php           | 15 ++++++++----
 src/PhpWord/Writer/Word2007/Part/Settings.php | 23 +++++--------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index a25a8f31..88cfa99e 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -34,7 +34,7 @@ class Protection
     private $editing;
 
     /**
-     * Hashed password
+     * password
      *
      * @var string
      */
@@ -55,7 +55,7 @@ class Protection
     private $mswordAlgorithmSid = 4;
 
     /**
-     * Hashed salt
+     * salt
      *
      * @var string
      */
@@ -95,7 +95,7 @@ class Protection
     }
 
     /**
-     * Get password hash
+     * Get password
      *
      * @return string
      */
@@ -164,7 +164,7 @@ class Protection
     }
 
     /**
-     * Get salt hash
+     * Get salt
      *
      * @return string
      */
@@ -174,13 +174,18 @@ class Protection
     }
 
     /**
-     * Set salt hash
+     * Set salt. Salt HAS to be 16 characters, or an exception will be thrown.
      *
      * @param $salt
      * @return self
+     * @throws \InvalidArgumentException
      */
     public function setSalt($salt)
     {
+        if ($salt !== null && strlen($salt) !== 16){
+            throw new \InvalidArgumentException('salt has to be of exactly 16 bytes length');
+        }
+
         $this->salt = $salt;
 
         return $this;
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 07d7a90c..82f8192a 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -225,8 +225,8 @@ class Settings extends AbstractPart
                         'w:cryptAlgorithmType' => 'typeAny',
                         'w:cryptAlgorithmSid' => $protection->getMswordAlgorithmSid(),
                         'w:cryptSpinCount' => $protection->getSpinCount(),
-                        'w:hash' => $this->getPasswordHash($protection),
-                        'w:salt' => $this->getSaltHash($protection->getSalt()),
+                        'w:hash' => $this->getEncodedPasswordHash($protection),
+                        'w:salt' => base64_encode($protection->getSalt()),
                     )
                 );
             }
@@ -255,11 +255,12 @@ class Settings extends AbstractPart
 
     /**
      * Create a hashed password that MS Word will be able to work with
+     * @link https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
      *
      * @param \PhpOffice\PhpWord\Metadata\Protection $protection
      * @return string
      */
-    private function getPasswordHash($protection)
+    private function getEncodedPasswordHash($protection)
     {
         $orig_encoding = mb_internal_encoding();
         mb_internal_encoding("UTF-8");
@@ -267,7 +268,6 @@ class Settings extends AbstractPart
         $password = $protection->getPassword();
         $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
 
-        // Construct a new NULL-terminated string consisting of single-byte characters:
         //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
         //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
         $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
@@ -291,7 +291,7 @@ class Settings extends AbstractPart
         //   Word requires that the initial hash of the password with the salt not be considered in the count.
         //   The initial hash of salt + key is not included in the iteration count.
         $algorithm    = $this->getAlgorithm($protection->getMswordAlgorithmSid());
-        $generatedKey = hash($algorithm, base64_decode($this->getSaltHash($protection->getSalt())) . $generatedKey, true);
+        $generatedKey = hash($algorithm, $protection->getSalt() . $generatedKey, true);
 
         for ($i = 0; $i < $protection->getSpinCount(); $i++) {
             $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i >> 8, $i >> 16, $i >> 24), true);
@@ -319,17 +319,6 @@ class Settings extends AbstractPart
         return $algorithm;
     }
 
-    /**
-     * Get salt hash
-     *
-     * @param string $salt
-     * @return string
-     */
-    private function getSaltHash($salt)
-    {
-        return base64_encode(str_pad(substr($salt, 0, 16), 16, '1'));
-    }
-
     /**
      * Build combined key from low-order word and high-order word
      *
@@ -372,7 +361,7 @@ class Settings extends AbstractPart
     }
 
     /**
-     * Simulate behaviour of int32
+     * Simulate behaviour of (signed) int32
      *
      * @param int $value
      * @return int

From 759794d746a9cc0ee0e9f3275795feac56c9a55d Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 12 May 2017 00:45:21 +0200
Subject: [PATCH 048/370] fix twig dependency so build can succeed

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index c49eb9cd..faa17c1b 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpdocumentor/phpdocumentor":"2.*",
+        "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "1.*",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",

From 0e0817c9727160f8243ff04cc742e8200ffaddf8 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 12 May 2017 00:45:31 +0200
Subject: [PATCH 049/370] ignore the build directory

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e5deb643..90940594 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Thumbs.db
 Desktop.ini
 .idea
 _build
+/build
 phpunit.xml
 composer.lock
 composer.phar
@@ -16,4 +17,4 @@ vendor
 /.settings
 phpword.ini
 /.buildpath
-/.project
\ No newline at end of file
+/.project

From 1cfb62de0db71f7c6805c43f7d3ed93688a69f5f Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Mon, 15 May 2017 22:49:02 +0200
Subject: [PATCH 050/370] Add support for comments

---
 docs/elements.rst                             |  25 +++-
 docs/intro.rst                                |   5 +
 samples/Sample_37_Comments.php                |  63 +++++++++
 src/PhpWord/Collection/Comments.php           |  27 ++++
 src/PhpWord/Element/AbstractContainer.php     |   9 +-
 src/PhpWord/Element/AbstractElement.php       |  65 +++++++++-
 src/PhpWord/Element/Comment.php               | 122 ++++++++++++++++++
 src/PhpWord/Element/TrackChange.php           |  77 +++++++++++
 src/PhpWord/PhpWord.php                       |   6 +-
 src/PhpWord/Writer/Word2007.php               |  26 ++++
 .../Word2007/Element/AbstractElement.php      |  53 ++++++++
 src/PhpWord/Writer/Word2007/Element/Chart.php |   1 +
 src/PhpWord/Writer/Word2007/Element/Image.php |   1 +
 src/PhpWord/Writer/Word2007/Element/Line.php  |   1 +
 .../Writer/Word2007/Element/Object.php        |   1 +
 src/PhpWord/Writer/Word2007/Element/Shape.php |   1 +
 .../Writer/Word2007/Element/TextBox.php       |   1 +
 src/PhpWord/Writer/Word2007/Part/Comments.php | 103 +++++++++++++++
 .../Writer/Word2007/Part/ContentTypes.php     |   1 +
 tests/PhpWord/Element/CommentTest.php         |  83 ++++++++++++
 .../Writer/Word2007/Part/CommentsTest.php     |  61 +++++++++
 21 files changed, 724 insertions(+), 8 deletions(-)
 create mode 100644 samples/Sample_37_Comments.php
 create mode 100644 src/PhpWord/Collection/Comments.php
 create mode 100644 src/PhpWord/Element/Comment.php
 create mode 100644 src/PhpWord/Element/TrackChange.php
 create mode 100644 src/PhpWord/Writer/Word2007/Part/Comments.php
 create mode 100644 tests/PhpWord/Element/CommentTest.php
 create mode 100644 tests/PhpWord/Writer/Word2007/Part/CommentsTest.php

diff --git a/docs/elements.rst b/docs/elements.rst
index d68ee035..3d7667b2 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -379,4 +379,27 @@ Available line style attributes:
 - ``endArrow``. End type of arrow: block, open, classic, diamond, oval.
 - ``width``. Line-object width in pt.
 - ``height``. Line-object height in pt.
-- ``flip``. Flip the line element: true, false.
\ No newline at end of file
+- ``flip``. Flip the line element: true, false.
+
+Comments
+---------
+
+Comments can be added to a document by using ``addComment``.
+The comment can contain formatted text. Once the comment has been added, it can be linked to any to any element.
+
+.. code-block:: php
+
+    // first create a comment
+    $comment= new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+    $comment->addText('Test', array('bold' => true));
+
+    // add it to the document
+    $phpWord->addComment($comment);
+
+    $textrun = $section->addTextRun();
+    $textrun->addText('This ');
+    $text = $textrun->addText('is');
+    // link the comment to the text you just created
+    $text->setCommentStart($comment);
+
+If no end is set for a comment using the ``setCommentEnd``, the comment will be ended automatically at the end of the element it is started on.
\ No newline at end of file
diff --git a/docs/intro.rst b/docs/intro.rst
index d1c791cf..d88cd626 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -49,6 +49,7 @@ Features
 - Insert drawing shapes (arc, curve, line, polyline, rect, oval)
 - Insert charts (pie, doughnut, bar, line, area, scatter, radar)
 - Insert form fields (textinput, checkbox, and dropdown)
+- Insert comments
 - Create document from templates
 - Use XSL 1.0 style sheets to transform headers, main document part, and footers of an OOXML template
 - ... and many more features on progress
@@ -102,6 +103,8 @@ Writers
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
 |                           | Endnote              | ✓      |       |       | ✓      |       |
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
+|                           | Comments             | ✓      |       |       |        |       |
++---------------------------+----------------------+--------+-------+-------+--------+-------+
 | **Graphs**                | 2D basic graphs      | ✓      |       |       |        |       |
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
 |                           | 2D advanced graphs   |        |       |       |        |       |
@@ -161,6 +164,8 @@ Readers
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
 |                           | Endnote              | ✓      |       |       |       |       |
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
+|                           | Comments             |        |       |       |       |       |
++---------------------------+----------------------+--------+-------+-------+-------+-------+
 | **Graphs**                | 2D basic graphs      |        |       |       |       |       |
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
 |                           | 2D advanced graphs   |        |       |       |       |       |
diff --git a/samples/Sample_37_Comments.php b/samples/Sample_37_Comments.php
new file mode 100644
index 00000000..91d353a9
--- /dev/null
+++ b/samples/Sample_37_Comments.php
@@ -0,0 +1,63 @@
+<?php
+include_once 'Sample_Header.php';
+
+// New Word Document
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+// A comment
+$comment = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+$comment->addText('Test', array('bold' => true));
+$phpWord->addComment($comment);
+
+$section = $phpWord->addSection();
+
+$textrun = $section->addTextRun();
+$textrun->addText('This ');
+$text = $textrun->addText('is');
+$text->setCommentStart($comment);
+$textrun->addText(' a test');
+
+$section->addTextBreak(2);
+
+// Let's create a comment that we will link to a start element and an end element
+$commentWithStartAndEnd = new \PhpOffice\PhpWord\Element\Comment('Foo Bar', new \DateTime(), '');
+$commentWithStartAndEnd->addText('A comment with a start and an end');
+$phpWord->addComment($commentWithStartAndEnd);
+
+$textrunWithEnd = $section->addTextRun();
+$textrunWithEnd->addText('This ');
+$textToStartOn = $textrunWithEnd->addText('is', array('bold' => true));
+$textToStartOn->setCommentStart($commentWithStartAndEnd);
+$textrunWithEnd->addText(' another', array('italic' => true));
+$textToEndOn = $textrunWithEnd->addText(' test');
+$textToEndOn->setCommentEnd($commentWithStartAndEnd);
+
+$section->addTextBreak(2);
+
+// Let's add a comment on an image
+$commentOnImage = new \PhpOffice\PhpWord\Element\Comment('Mr Smart', new \DateTime(), '');
+$imageComment = $commentOnImage->addTextRun();
+$imageComment->addText('Hey, Mars does look ');
+$imageComment->addText('red', array('color' => 'FF0000'));
+$phpWord->addComment($commentOnImage);
+$image = $section->addImage('resources/_mars.jpg');
+$image->setCommentStart($commentOnImage);
+
+$section->addTextBreak(2);
+
+// We can also do things the other way round, link the comment to the element
+$anotherText = $section->addText("another text");
+
+$comment1 = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+$comment1->addText('Test', array('bold' => true));
+$comment1->setStartElement($anotherText);
+$comment1->setEndElement($anotherText);
+$phpWord->addComment($comment1);
+
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
new file mode 100644
index 00000000..e0383814
--- /dev/null
+++ b/src/PhpWord/Collection/Comments.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Collection;
+
+/**
+ * Comments collection
+ *
+ * @since 0.12.0
+ */
+class Comments extends AbstractCollection
+{
+}
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index a3872e0b..602bd84a 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -58,7 +58,7 @@ abstract class AbstractContainer extends AbstractElement
     protected $elements = array();
 
     /**
-     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun
+     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun|TrackChange
      *
      * @var string
      */
@@ -83,7 +83,7 @@ abstract class AbstractContainer extends AbstractElement
             'ListItem', 'ListItemRun', 'Table', 'Image', 'Object',
             'Footnote', 'Endnote', 'CheckBox', 'TextBox', 'Field',
             'Line', 'Shape', 'Title', 'TOC', 'PageBreak',
-            'Chart', 'FormField', 'SDT'
+            'Chart', 'FormField', 'SDT', 'Comment'
         );
         $functions = array();
         foreach ($elements as $element) {
@@ -188,7 +188,7 @@ abstract class AbstractContainer extends AbstractElement
     private function checkValidity($method)
     {
         $generalContainers = array(
-            'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun',
+            'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun', 'TrackChange',
         );
 
         $validContainers = array(
@@ -203,7 +203,8 @@ abstract class AbstractContainer extends AbstractElement
             'Shape'         => $generalContainers,
             'FormField'     => $generalContainers,
             'SDT'           => $generalContainers,
-            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
+            'TrackChange'   => $generalContainers,
+            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange'),
             'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index b0ed8ae2..b84211b9 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -108,12 +108,26 @@ abstract class AbstractElement
     protected $mediaRelation = false;
 
     /**
-     * Is part of collection; true for Title, Footnote, Endnote, and Chart
+     * Is part of collection; true for Title, Footnote, Endnote, Chart, and Comment
      *
      * @var bool
      */
     protected $collectionRelation = false;
 
+    /**
+     * The start position for the linked comment
+     * 
+     * @var Comment
+     */
+    protected $commentStart;
+
+    /**
+     * The end position for the linked comment
+     * 
+     * @var Comment
+     */
+    protected $commentEnd;
+
     /**
      * Get PhpWord
      *
@@ -265,6 +279,55 @@ abstract class AbstractElement
         return $this->nestedLevel;
     }
 
+    /**
+     * Get comment start
+     *
+     * @return Comment
+     */
+    public function getCommentStart()
+    {
+        return $this->commentStart;
+    }
+
+    /**
+     * Set comment start
+     * 
+     * @param Comment $value
+     */
+    public function setCommentStart(Comment $value)
+    {
+        if ($this instanceof Comment) {
+            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+        }
+        $this->commentStart = $value;
+        $this->commentStart->setStartElement($this);
+    }
+
+    /**
+     * Get comment end
+     *
+     * @return Comment
+     */
+    public function getCommentEnd()
+    {
+        return $this->commentEnd;
+    }
+
+    /**
+     * Set comment end
+     *
+     * @param Comment $value
+     * @return void
+     */
+    public function setCommentEnd(Comment $value)
+    {
+        if ($this instanceof Comment) {
+            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+        }
+        $this->commentEnd = $value;
+        $this->commentEnd->setEndElement($this);
+    }
+
     /**
      * Set parent container
      *
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
new file mode 100644
index 00000000..df2e4d4d
--- /dev/null
+++ b/src/PhpWord/Element/Comment.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Comment element
+ */
+class Comment extends TrackChange
+{
+    /**
+     * Initials
+     *
+     * @var string
+     */
+    private $initials;
+
+    /**
+     * The Element where this comment starts
+     * 
+     * @var AbstractElement
+     */
+    private $startElement;
+
+    /**
+     * The Element where this comment ends
+     * 
+     * @var AbstractElement
+     */
+    private $endElement;
+
+    /**
+     * Is part of collection
+     *
+     * @var bool
+     */
+    protected $collectionRelation = true;
+
+    /**
+     * Create a new Comment Element
+     *
+     * @param string $author
+     * @param \DateTime $date
+     * @param string $initials
+     */
+    public function __construct($author, $date, $initials)
+    {
+        parent::__construct($author, $date);
+        $this->initials = $initials;
+        return $this;
+    }
+
+    /**
+     * Get Initials
+     *
+     * @return string
+     */
+    public function getInitials()
+    {
+        return $this->initials;
+    }
+
+    /**
+     * Sets the element where this comment starts
+     * 
+     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     */
+    public function setStartElement(AbstractElement $value)
+    {
+        $this->startElement = $value;
+        if ($value->getCommentStart() == null) {
+            $value->setCommentStart($this);
+        }
+    }
+
+    /**
+     * Get the element where this comment starts
+     * 
+     * @return \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    public function getStartElement()
+    {
+        return $this->startElement;
+    }
+
+    /**
+     * Sets the element where this comment ends
+     * 
+     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     */
+    public function setEndElement(AbstractElement $value)
+    {
+        $this->endElement = $value;
+        if ($value->getCommentEnd() == null) {
+            $value->setCommentEnd($this);
+        }
+    }
+
+    /**
+     * Get the element where this comment ends
+     * 
+     * @return \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    public function getEndElement()
+    {
+        return $this->endElement;
+    }
+}
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
new file mode 100644
index 00000000..782e6f35
--- /dev/null
+++ b/src/PhpWord/Element/TrackChange.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * TrackChange element
+ */
+class TrackChange extends AbstractContainer
+{
+    /**
+     * @var string Container type
+     */
+    protected $container = 'TrackChange';
+
+    /**
+     * Author
+     *
+     * @var string
+     */
+    private $author;
+
+    /**
+     * Date
+     *
+     * @var DateTime
+     */
+    private $date;
+
+    /**
+     * Create a new TrackChange Element
+     *
+     * @param string $author
+     * @param DateTime $date
+     */
+    public function __construct($author, \DateTime $date)
+    {
+
+        $this->author = $author;
+        $this->date = $date;
+        return $this;
+    }
+
+    /**
+     * Get TrackChange Author
+     *
+     * @return string
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Get TrackChange Date
+     *
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+}
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 0fa76b2f..38895e4f 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -27,11 +27,13 @@ use PhpOffice\PhpWord\Exception\Exception;
  * @method Collection\Footnotes getFootnotes()
  * @method Collection\Endnotes getEndnotes()
  * @method Collection\Charts getCharts()
+ * @method Collection\Comments getComments()
  * @method int addBookmark(Element\Bookmark $bookmark)
  * @method int addTitle(Element\Title $title)
  * @method int addFootnote(Element\Footnote $footnote)
  * @method int addEndnote(Element\Endnote $endnote)
  * @method int addChart(Element\Chart $chart)
+ * @method int addComment(Element\Comment $comment)
  *
  * @method Style\Paragraph addParagraphStyle(string $styleName, array $styles)
  * @method Style\Font addFontStyle(string $styleName, mixed $fontStyle, mixed $paragraphStyle = null)
@@ -84,7 +86,7 @@ class PhpWord
     public function __construct()
     {
         // Collection
-        $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts');
+        $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts', 'Comments');
         foreach ($collections as $collection) {
             $class = 'PhpOffice\\PhpWord\\Collection\\' . $collection;
             $this->collections[$collection] = new $class();
@@ -118,7 +120,7 @@ class PhpWord
         $addCollection = array();
         $addStyle = array();
 
-        $collections = array('Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart');
+        $collections = array('Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart', 'Comment');
         foreach ($collections as $collection) {
             $getCollection[] = strtolower("get{$collection}s");
             $addCollection[] = strtolower("add{$collection}");
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index 8e10f5f6..bb7b521f 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -60,6 +60,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
             'DocPropsCustom' => 'docProps/custom.xml',
             'RelsDocument'   => 'word/_rels/document.xml.rels',
             'Document'       => 'word/document.xml',
+            'Comments'       => 'word/comments.xml',
             'Styles'         => 'word/styles.xml',
             'Numbering'      => 'word/numbering.xml',
             'Settings'       => 'word/settings.xml',
@@ -129,6 +130,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
 
         $this->addNotes($zip, $rId, 'footnote');
         $this->addNotes($zip, $rId, 'endnote');
+        $this->addComments($zip, $rId);
         $this->addChart($zip, $rId);
 
         // Write parts
@@ -255,6 +257,30 @@ class Word2007 extends AbstractWriter implements WriterInterface
         }
     }
 
+    /**
+     * Add comments
+     *
+     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
+     * @param integer &$rId
+     * @return void
+     */
+    private function addComments(ZipArchive $zip, &$rId)
+    {
+        $phpWord = $this->getPhpWord();
+        $collection = $phpWord->getComments();
+        $partName = "comments";
+
+        // Add comment relations and contents
+        /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collection Type hint */
+        if ($collection->countItems() > 0) {
+            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId);
+
+            // Write content file, e.g. word/comments.xml
+            $writerPart = $this->getWriterPart($partName)->setElements($collection->getItems());
+            $zip->addFromString("word/{$partName}.xml", $writerPart->write());
+        }
+    }
+
     /**
      * Add chart.
      *
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index f5a454d2..474d40ce 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -103,6 +103,7 @@ abstract class AbstractElement
                 $this->writeParagraphStyle();
             }
         }
+        $this->writeCommentRangeStart();
     }
 
     /**
@@ -112,11 +113,63 @@ abstract class AbstractElement
      */
     protected function endElementP()
     {
+        $this->writeCommentRangeEnd();
         if (!$this->withoutP) {
             $this->xmlWriter->endElement(); // w:p
         }
     }
 
+    /**
+     * Writes the w:commentRangeStart DOM element
+     *
+     * @return void
+     */
+    protected function writeCommentRangeStart()
+    {
+        if ($this->element->getCommentStart() != null) {
+            $comment = $this->element->getCommentStart();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeStart', array('w:id' => $comment->getElementId()));
+
+        }
+    }
+
+    /**
+     * Writes the w:commentRangeEnd DOM element
+     *
+     * @return void
+     */
+    protected function writeCommentRangeEnd()
+    {
+        if ($this->element->getCommentEnd() != null) {
+            $comment = $this->element->getCommentEnd();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->startElement('w:r');
+            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->endElement();
+        } elseif ($this->element->getCommentStart() != null && $this->element->getCommentStart()->getEndElement() == null) {
+            $comment = $this->element->getCommentStart();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->startElement('w:r');
+            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->endElement();
+        }
+    }
+
     /**
      * Write ending.
      *
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index 12602532..ecdde362 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -45,6 +45,7 @@ class Chart extends AbstractElement
         if (!$this->withoutP) {
             $xmlWriter->startElement('w:p');
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:drawing');
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 914c78ea..edf32739 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -63,6 +63,7 @@ class Image extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index ade91fb8..ebc5d395 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -48,6 +48,7 @@ class Line extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/Object.php
index 4fdf6fed..fc0532cd 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/Object.php
@@ -51,6 +51,7 @@ class Object extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:object');
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index f282c4a5..a589af6c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -55,6 +55,7 @@ class Shape extends AbstractElement
         if (!$this->withoutP) {
             $xmlWriter->startElement('w:p');
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 3c4f48c2..e83fe0c9 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -45,6 +45,7 @@ class TextBox extends Image
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
new file mode 100644
index 00000000..73314785
--- /dev/null
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Part;
+
+use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Comment;
+use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
+
+/**
+ * Word2007 comments part writer: word/comments.xml
+ */
+class Comments extends AbstractPart
+{
+    /**
+     * Comments collection to be written
+     *
+     * @var \PhpOffice\PhpWord\Collection\Comments
+     */
+    protected $elements;
+
+    /**
+     * Write part
+     *
+     * @return string
+     */
+    public function write()
+    {
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->startDocument('1.0', 'UTF-8', 'yes');
+        $xmlWriter->startElement('w:comments');
+        $xmlWriter->writeAttribute('xmlns:ve', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+        $xmlWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
+        $xmlWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $xmlWriter->writeAttribute('xmlns:m', 'http://schemas.openxmlformats.org/officeDocument/2006/math');
+        $xmlWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
+        $xmlWriter->writeAttribute('xmlns:wp', 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing');
+        $xmlWriter->writeAttribute('xmlns:w10', 'urn:schemas-microsoft-com:office:word');
+        $xmlWriter->writeAttribute('xmlns:w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+        $xmlWriter->writeAttribute('xmlns:wne', 'http://schemas.microsoft.com/office/word/2006/wordml');
+
+        if ($this->elements !== null) {
+            foreach ($this->elements as $element) {
+                if ($element instanceof Comment) {
+                    $this->writeComment($xmlWriter, $element);
+                }
+            }
+        }
+
+        $xmlWriter->endElement(); // w:comments
+
+        return $xmlWriter->getData();
+    }
+
+    /**
+     * Write comment item.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Comment $comment
+     * @return void
+     */
+    protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
+    {
+        $xmlWriter->startElement('w:comment');
+        $xmlWriter->writeAttribute('w:id', $comment->getElementId());
+        $xmlWriter->writeAttribute('w:author', $comment->getAuthor());
+        $xmlWriter->writeAttribute('w:date', $comment->getDate()->format($this->dateFormat));
+        $xmlWriter->writeAttribute('w:initials', $comment->getInitials());
+
+        $containerWriter = new Container($xmlWriter, $comment);
+        $containerWriter->write();
+
+        $xmlWriter->endElement(); // w:comment
+    }
+
+    /**
+     * Set element
+     *
+     * @param \PhpOffice\PhpWord\Collection\Comments $elements
+     * @return self
+     */
+    public function setElements($elements)
+    {
+        $this->elements = $elements;
+
+        return $this;
+    }
+}
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 1c81f343..7a03243e 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -49,6 +49,7 @@ class ContentTypes extends AbstractPart
             '/word/theme/theme1.xml' => $openXMLPrefix . 'officedocument.theme+xml',
             '/word/webSettings.xml'  => $wordMLPrefix  . 'webSettings+xml',
             '/word/fontTable.xml'    => $wordMLPrefix  . 'fontTable+xml',
+            '/word/comments.xml'     => $wordMLPrefix  . 'comments+xml',
         );
 
         $defaults = $contentTypes['default'];
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
new file mode 100644
index 00000000..db9ec902
--- /dev/null
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Test class for PhpOffice\PhpWord\Element\Header
+ *
+ * @runTestsInSeparateProcesses
+ */
+class CommentTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * New instance
+     */
+    public function testConstructDefault()
+    {
+        $author = 'Test User';
+        $date = new \DateTime('2000-01-01');
+        $initials = 'default_user';
+        $oComment = new Comment($author, $date, $initials);
+
+        $oText = new Text('dummy text');
+        $oComment->setStartElement($oText);
+        $oComment->setEndElement($oText);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Comment', $oComment);
+        $this->assertEquals($author, $oComment->getAuthor());
+        $this->assertEquals($date, $oComment->getDate());
+        $this->assertEquals($initials, $oComment->getInitials());
+        $this->assertEquals($oText, $oComment->getStartElement());
+        $this->assertEquals($oText, $oComment->getEndElement());
+    }
+
+    /**
+     * Add text
+     */
+    public function testAddText()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $element = $oComment->addText('text');
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Text', $element);
+        $this->assertCount(1, $oComment->getElements());
+        $this->assertEquals('text', $element->getText());
+    }
+
+    /**
+     * Get elements
+     */
+    public function testGetElements()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+
+        $this->assertInternalType('array', $oComment->getElements());
+    }
+
+    /**
+     * Set/get relation Id
+     */
+    public function testRelationId()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+
+        $iVal = rand(1, 1000);
+        $oComment->setRelationId($iVal);
+        $this->assertEquals($iVal, $oComment->getRelationId());
+    }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
new file mode 100644
index 00000000..aac4b15b
--- /dev/null
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Writer\Word2007\Part;
+
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Comment
+ *
+ * @runTestsInSeparateProcesses
+ */
+class CommentsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Executed before each method of the class
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Write comments
+     */
+    public function testWriteComments()
+    {
+
+        $comment = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+        $comment->addText('Test');
+
+        $phpWord = new PhpWord();
+        $phpWord->addComment($comment);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $path = '/w:comments/w:comment';
+        $file = 'word/comments.xml';
+
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotNull($element->getAttribute('w:id'));
+        $this->assertEquals("Authors name", $element->getAttribute('w:author'));
+        $this->assertEquals("my_initials", $element->getAttribute('w:initials'));
+    }
+}

From 09e669f9e9de9bcc7b60b8c3224b6c058a69166b Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Tue, 16 May 2017 02:38:15 +0200
Subject: [PATCH 051/370] basedOn not correctly set if FontStyle is based on
 other FontStyle

---
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  6 +++-
 .../Writer/Word2007/Part/StylesTest.php       | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 637c60ff..01b84c08 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -182,7 +182,11 @@ class Styles extends AbstractPart
 
         // Parent style
         if (!is_null($paragraphStyle)) {
-             $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+            if ($paragraphStyle->getStyleName() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+            } elseif ($paragraphStyle->getBasedOn() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getBasedOn());
+            }
         }
 
         // w:pPr
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index df20ab3b..9153fe65 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -114,4 +114,32 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertNull($element);
     }
+
+    function testFontStyleBasedOnOtherFontStyle() {
+        $phpWord = new PhpWord();
+
+        $styleGenerationP = new Paragraph();
+        $styleGenerationP->setAlignment(Jc::BOTH);
+
+        $styleGeneration = new Font();
+        $styleGeneration->setParagraph($styleGenerationP);
+        $styleGeneration->setSize(9.5);
+        $phpWord->addFontStyle('Generation', $styleGeneration);
+
+        $styleGenerationEteinteP = new Paragraph();
+        $styleGenerationEteinteP->setBasedOn('Generation');
+
+        $styleGenerationEteinte = new Font();
+        $styleGenerationEteinte->setParagraph($styleGenerationEteinteP);
+        $styleGenerationEteinte->setSize(8.5);
+        $phpWord->addFontStyle('GeneratEteinte', $styleGenerationEteinte);
+        
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        $path = '/w:styles/w:style[@w:styleId="GeneratEteinte"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('Generation', $element->getAttribute('w:val'));
+    }
 }

From a55405e6551daa5482ce82f8d40df9d75de9ce7e Mon Sep 17 00:00:00 2001
From: Mord1n <h.othelius@gmail.com>
Date: Thu, 18 May 2017 16:25:05 +0200
Subject: [PATCH 052/370] Update Styles.php

automatic-styles should be closed before opening master-styles.

This will prevent issue that styles wont work in future if you implement styling for ODT writer....
---
 src/PhpWord/Writer/ODText/Part/Styles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index b50be0e8..9236a16b 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -52,8 +52,8 @@ class Styles extends AbstractPart
         // Automatic styles
         $xmlWriter->startElement('office:automatic-styles');
         $this->writePageLayout($xmlWriter);
-        $this->writeMaster($xmlWriter);
         $xmlWriter->endElement();
+        $this->writeMaster($xmlWriter);
 
         $xmlWriter->endElement(); // office:document-styles
 

From 68dd3fd576de0d7eafb50176d2db4d199fa03628 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Wed, 24 May 2017 00:18:17 +0200
Subject: [PATCH 053/370] rename attribute to match generated XML node name

---
 src/PhpWord/Element/AbstractElement.php       | 24 +++++++++----------
 src/PhpWord/Element/Comment.php               |  8 +++----
 .../Word2007/Element/AbstractElement.php      | 12 +++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index b84211b9..8ff64194 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -119,14 +119,14 @@ abstract class AbstractElement
      * 
      * @var Comment
      */
-    protected $commentStart;
+    protected $commentRangeStart;
 
     /**
      * The end position for the linked comment
      * 
      * @var Comment
      */
-    protected $commentEnd;
+    protected $commentRangeEnd;
 
     /**
      * Get PhpWord
@@ -284,9 +284,9 @@ abstract class AbstractElement
      *
      * @return Comment
      */
-    public function getCommentStart()
+    public function getCommentRangeStart()
     {
-        return $this->commentStart;
+        return $this->commentRangeStart;
     }
 
     /**
@@ -294,13 +294,13 @@ abstract class AbstractElement
      * 
      * @param Comment $value
      */
-    public function setCommentStart(Comment $value)
+    public function setCommentRangeStart(Comment $value)
     {
         if ($this instanceof Comment) {
             throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
         }
-        $this->commentStart = $value;
-        $this->commentStart->setStartElement($this);
+        $this->commentRangeStart= $value;
+        $this->commentRangeStart->setStartElement($this);
     }
 
     /**
@@ -308,9 +308,9 @@ abstract class AbstractElement
      *
      * @return Comment
      */
-    public function getCommentEnd()
+    public function getCommentRangeEnd()
     {
-        return $this->commentEnd;
+        return $this->commentRangeEnd;
     }
 
     /**
@@ -319,13 +319,13 @@ abstract class AbstractElement
      * @param Comment $value
      * @return void
      */
-    public function setCommentEnd(Comment $value)
+    public function setCommentRangeEnd(Comment $value)
     {
         if ($this instanceof Comment) {
             throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
         }
-        $this->commentEnd = $value;
-        $this->commentEnd->setEndElement($this);
+        $this->commentRangeEnd= $value;
+        $this->commentRangeEnd->setEndElement($this);
     }
 
     /**
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index df2e4d4d..def9d5a8 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -82,8 +82,8 @@ class Comment extends TrackChange
     public function setStartElement(AbstractElement $value)
     {
         $this->startElement = $value;
-        if ($value->getCommentStart() == null) {
-            $value->setCommentStart($this);
+        if ($value->getCommentRangeStart() == null) {
+            $value->setCommentRangeStart($this);
         }
     }
 
@@ -105,8 +105,8 @@ class Comment extends TrackChange
     public function setEndElement(AbstractElement $value)
     {
         $this->endElement = $value;
-        if ($value->getCommentEnd() == null) {
-            $value->setCommentEnd($this);
+        if ($value->getCommentRangeEnd() == null) {
+            $value->setCommentRangeEnd($this);
         }
     }
 
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 474d40ce..79877b10 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -126,8 +126,8 @@ abstract class AbstractElement
      */
     protected function writeCommentRangeStart()
     {
-        if ($this->element->getCommentStart() != null) {
-            $comment = $this->element->getCommentStart();
+        if ($this->element->getCommentRangeStart() != null) {
+            $comment = $this->element->getCommentRangeStart();
             //only set the ID if it is not yet set, otherwise it will overwrite it
             if ($comment->getElementId() == null) {
                 $comment->setElementId();
@@ -145,8 +145,8 @@ abstract class AbstractElement
      */
     protected function writeCommentRangeEnd()
     {
-        if ($this->element->getCommentEnd() != null) {
-            $comment = $this->element->getCommentEnd();
+        if ($this->element->getCommentRangeEnd() != null) {
+            $comment = $this->element->getCommentRangeEnd();
             //only set the ID if it is not yet set, otherwise it will overwrite it
             if ($comment->getElementId() == null) {
                 $comment->setElementId();
@@ -156,8 +156,8 @@ abstract class AbstractElement
             $this->xmlWriter->startElement('w:r');
             $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
             $this->xmlWriter->endElement();
-        } elseif ($this->element->getCommentStart() != null && $this->element->getCommentStart()->getEndElement() == null) {
-            $comment = $this->element->getCommentStart();
+        } elseif ($this->element->getCommentRangeStart() != null && $this->element->getCommentRangeStart()->getEndElement() == null) {
+            $comment = $this->element->getCommentRangeStart();
             //only set the ID if it is not yet set, otherwise it will overwrite it
             if ($comment->getElementId() == null) {
                 $comment->setElementId();

From f21f79761aaa991a28fb700caddabb80649c4627 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Thu, 25 May 2017 22:04:23 +0200
Subject: [PATCH 054/370] fix sample

---
 samples/Sample_37_Comments.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Sample_37_Comments.php b/samples/Sample_37_Comments.php
index 91d353a9..670e914b 100644
--- a/samples/Sample_37_Comments.php
+++ b/samples/Sample_37_Comments.php
@@ -15,7 +15,7 @@ $section = $phpWord->addSection();
 $textrun = $section->addTextRun();
 $textrun->addText('This ');
 $text = $textrun->addText('is');
-$text->setCommentStart($comment);
+$text->setCommentRangeStart($comment);
 $textrun->addText(' a test');
 
 $section->addTextBreak(2);
@@ -28,10 +28,10 @@ $phpWord->addComment($commentWithStartAndEnd);
 $textrunWithEnd = $section->addTextRun();
 $textrunWithEnd->addText('This ');
 $textToStartOn = $textrunWithEnd->addText('is', array('bold' => true));
-$textToStartOn->setCommentStart($commentWithStartAndEnd);
+$textToStartOn->setCommentRangeStart($commentWithStartAndEnd);
 $textrunWithEnd->addText(' another', array('italic' => true));
 $textToEndOn = $textrunWithEnd->addText(' test');
-$textToEndOn->setCommentEnd($commentWithStartAndEnd);
+$textToEndOn->setCommentRangeEnd($commentWithStartAndEnd);
 
 $section->addTextBreak(2);
 
@@ -42,7 +42,7 @@ $imageComment->addText('Hey, Mars does look ');
 $imageComment->addText('red', array('color' => 'FF0000'));
 $phpWord->addComment($commentOnImage);
 $image = $section->addImage('resources/_mars.jpg');
-$image->setCommentStart($commentOnImage);
+$image->setCommentRangeStart($commentOnImage);
 
 $section->addTextBreak(2);
 

From ac89cc39eaf97f0cb91b9df9b88d161a0fce24b1 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Tue, 30 May 2017 00:31:32 +0200
Subject: [PATCH 055/370] Add possibility to control the footnote number

---
 docs/elements.rst                             |  23 ++-
 samples/Sample_06_Footnote.php                |   8 +-
 src/PhpWord/Element/Section.php               |  28 ++++
 src/PhpWord/SimpleType/FootnoteProperties.php | 152 ++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Document.php |  27 ++++
 .../SimpleType/FootnotePropertiesTest.php     |  79 +++++++++
 .../Writer/Word2007/Part/DocumentTest.php     |  31 ++++
 7 files changed, 344 insertions(+), 4 deletions(-)
 create mode 100644 src/PhpWord/SimpleType/FootnoteProperties.php
 create mode 100644 tests/PhpWord/SimpleType/FootnotePropertiesTest.php

diff --git a/docs/elements.rst b/docs/elements.rst
index 27fd76b8..5b671936 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -333,11 +333,28 @@ On text:
     $footnote = $section->addFootnote();
     $footnote->addText('Footnote text.');
 
-The footnote reference number will be displayed with decimal number
-starting from 1. This number use ``FooterReference`` style which you can
-redefine by ``addFontStyle`` method. Default value for this style is
+By default the footnote reference number will be displayed with decimal number
+starting from 1. This number uses the ``FooterReference`` style which you can
+redefine with the ``addFontStyle`` method. Default value for this style is
 ``array('superScript' => true)``;
 
+The footnote numbering can be controlled by setting the FootnoteProperties on the Section.
+
+.. code-block:: php
+
+    $fp = new PhpWord\SimpleType\FootnoteProperties();
+    //sets the position of the footnote (pageBottom (default), beneathText, sectEnd, docEnd) 
+    $fp->setPos(FootnoteProperties::POSITION_DOC_END);
+    //set the number format to use (decimal (default), upperRoman, upperLetter, ...)
+    $fp->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+    //force starting at other than 1
+    $fp->setNumStart(2);
+    //when to restart counting (continuous (default), eachSect, eachPage)
+    $fp->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
+    
+    //And finaly, set it on the Section
+    $section->setFootnoteProperties($properties);
+
 Checkboxes
 ----------
 
diff --git a/samples/Sample_06_Footnote.php b/samples/Sample_06_Footnote.php
index 30afcf81..f9c6b5f7 100644
--- a/samples/Sample_06_Footnote.php
+++ b/samples/Sample_06_Footnote.php
@@ -1,4 +1,6 @@
 <?php
+use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
+
 include_once 'Sample_Header.php';
 
 // New Word Document
@@ -42,11 +44,15 @@ $footnote->addText('But you can only put footnote in section, not in header or f
 
 $section->addText(
     'You can also create the footnote directly from the section making it wrap in a paragraph '
-        . 'like the footnote below this paragraph. But is is best used from within a textrun.'
+        . 'like the footnote below this paragraph. But is best used from within a textrun.'
 );
 $footnote = $section->addFootnote();
 $footnote->addText('The reference for this is wrapped in its own line');
 
+$footnoteProperties = new FootnoteProperties();
+$footnoteProperties->setNumFmt(FootnoteProperties::NUMBER_FORMAT_UPPER_ROMAN);
+$section->setFootnoteProperties($footnoteProperties);
+
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 1e926d2f..c0bfc3cf 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
+use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 
 class Section extends AbstractContainer
 {
@@ -47,6 +48,13 @@ class Section extends AbstractContainer
      */
     private $footers = array();
 
+    /**
+     * The properties for the footnote of this section
+     * 
+     * @var FootnoteProperties
+     */
+    private $footnoteProperties;
+
     /**
      * Create new instance
      *
@@ -138,6 +146,26 @@ class Section extends AbstractContainer
         return $this->footers;
     }
 
+    /**
+     * Get the footnote properties
+     * 
+     * @return \PhpOffice\PhpWord\Element\FooterProperties
+     */
+    public function getFootnotePropoperties()
+    {
+        return $this->footnoteProperties;
+    }
+
+    /**
+     * Set the footnote properties
+     * 
+     * @param FootnoteProperties $footnoteProperties
+     */
+    public function setFootnoteProperties(FootnoteProperties $footnoteProperties = null)
+    {
+        $this->footnoteProperties = $footnoteProperties;
+    }
+
     /**
      * Is there a header for this section that is for the first page only?
      *
diff --git a/src/PhpWord/SimpleType/FootnoteProperties.php b/src/PhpWord/SimpleType/FootnoteProperties.php
new file mode 100644
index 00000000..812c055f
--- /dev/null
+++ b/src/PhpWord/SimpleType/FootnoteProperties.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\SimpleType;
+
+/**
+ * Footnote properties
+ *
+ * @see http://www.datypic.com/sc/ooxml/e-w_footnotePr-1.html
+ */
+final class FootnoteProperties
+{
+
+    const RESTART_NUMBER_CONTINUOUS = 'continuous';
+    const RESTART_NUMBER_EACH_SECTION = 'eachSect';
+    const RESTART_NUMBER_EACH_PAGE = 'eachPage';
+
+    const RESTART_NUMBER = array(
+        self::RESTART_NUMBER_CONTINUOUS,
+        self::RESTART_NUMBER_EACH_SECTION,
+        self::RESTART_NUMBER_EACH_PAGE
+    );
+
+    const NUMBER_FORMAT_DECIMAL = 'decimal';
+    const NUMBER_FORMAT_UPPER_ROMAN = 'upperRoman';
+    const NUMBER_FORMAT_LOWER_ROMAN = 'lowerRoman';
+    const NUMBER_FORMAT_UPPER_LETTER = 'upperLetter';
+    const NUMBER_FORMAT_LOWER_LETTER = 'lowerLetter';
+    const NUMBER_FORMAT_ORDINAL = 'ordinal';
+    const NUMBER_FORMAT_CARDINAL_TEXT = 'cardinalText';
+    const NUMBER_FORMAT_ORDINAL_TEXT = 'ordinalText';
+    const NUMBER_FORMAT_NONE = 'none';
+    const NUMBER_FORMAT_BULLET = 'bullet';
+
+    const NUMBER_FORMAT = array(
+        self::NUMBER_FORMAT_DECIMAL,
+        self::NUMBER_FORMAT_UPPER_ROMAN,
+        self::NUMBER_FORMAT_LOWER_ROMAN,
+        self::NUMBER_FORMAT_UPPER_LETTER,
+        self::NUMBER_FORMAT_LOWER_LETTER,
+        self::NUMBER_FORMAT_ORDINAL,
+        self::NUMBER_FORMAT_CARDINAL_TEXT,
+        self::NUMBER_FORMAT_ORDINAL_TEXT,
+        self::NUMBER_FORMAT_NONE,
+        self::NUMBER_FORMAT_BULLET
+    );
+
+    const POSITION_PAGE_BOTTOM = 'pageBottom';
+    const POSITION_BENEATH_TEXT = 'beneathText';
+    const POSITION_SECTION_END = 'sectEnd';
+    const POSITION_DOC_END = 'docEnd';
+
+    const POSITION = array(
+        self::POSITION_PAGE_BOTTOM,
+        self::POSITION_BENEATH_TEXT,
+        self::POSITION_SECTION_END,
+        self::POSITION_DOC_END
+    );
+
+    /**
+     * Footnote Positioning Location
+     *
+     * @var string
+     */
+    private $pos;
+
+    /**
+     * Footnote Numbering Format
+     *
+     * @var string
+     */
+    private $numFmt;
+
+    /**
+     * Footnote and Endnote Numbering Starting Value
+     *
+     * @var decimal
+     */
+    private $numStart;
+
+    /**
+     * Footnote and Endnote Numbering Restart Location
+     *
+     * @var string
+     */
+    private $numRestart;
+
+    public function getPos()
+    {
+        return $this->pos;
+    }
+
+    public function setPos($pos)
+    {
+        if (in_array($pos, self::POSITION)) {
+            $this->pos = $pos;
+        } else {
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::POSITION) . " possible");
+        }
+    }
+
+    public function getNumFmt()
+    {
+        return $this->numFmt;
+    }
+
+    public function setNumFmt($numFmt)
+    {
+        if (in_array($numFmt, self::NUMBER_FORMAT)) {
+            $this->numFmt = $numFmt;
+        } else {
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::NUMBER_FORMAT) . " possible");
+        }
+    }
+
+    public function getNumStart()
+    {
+        return $this->numStart;
+    }
+
+    public function setNumStart($numStart)
+    {
+        $this->numStart = $numStart;
+    }
+
+    public function getNumRestart()
+    {
+        return $this->numRestart;
+    }
+
+    public function setNumRestart($numRestart)
+    {
+        if (in_array($numRestart, self::RESTART_NUMBER)) {
+            $this->numRestart= $numRestart;
+        } else {
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::RESTART_NUMBER) . " possible");
+        }
+    }
+}
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index 411946f5..a2dc999b 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -21,6 +21,7 @@ use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Section as SectionStyleWriter;
+use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 
 /**
  * Word2007 document part writer: word/document.xml
@@ -129,6 +130,32 @@ class Document extends AbstractPart
             $xmlWriter->endElement();
         }
 
+        //footnote properties
+        if ($section->getFootnotePropoperties() !== null) {
+            $xmlWriter->startElement('w:footnotePr');
+            if ($section->getFootnotePropoperties()->getPos() != null) {
+                $xmlWriter->startElement('w:pos');
+                $xmlWriter->writeAttribute('w:val', $section->getFootnotePropoperties()->getPos());
+                $xmlWriter->endElement();
+            }
+            if ($section->getFootnotePropoperties()->getNumFmt() != null) {
+                $xmlWriter->startElement('w:numFmt');
+                $xmlWriter->writeAttribute('w:val', $section->getFootnotePropoperties()->getNumFmt());
+                $xmlWriter->endElement();
+            }
+            if ($section->getFootnotePropoperties()->getNumStart() != null) {
+                $xmlWriter->startElement('w:numStart');
+                $xmlWriter->writeAttribute('w:val', $section->getFootnotePropoperties()->getNumStart());
+                $xmlWriter->endElement();
+            }
+            if ($section->getFootnotePropoperties()->getNumRestart() != null) {
+                $xmlWriter->startElement('w:numRestart');
+                $xmlWriter->writeAttribute('w:val', $section->getFootnotePropoperties()->getNumRestart());
+                $xmlWriter->endElement();
+            }
+            $xmlWriter->endElement();
+        }
+
         // Section settings
         $styleWriter = new SectionStyleWriter($xmlWriter, $section->getStyle());
         $styleWriter->write();
diff --git a/tests/PhpWord/SimpleType/FootnotePropertiesTest.php b/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
new file mode 100644
index 00000000..193ad363
--- /dev/null
+++ b/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
+
+/**
+ * Test class for PhpOffice\PhpWord\SimpleType\FootnoteProperties
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\SimpleType\FootnoteProperties
+ * @runTestsInSeparateProcesses
+ */
+class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test setting style with normal value
+     */
+    public function testSetGetNormal()
+    {
+        $footnoteProp = new FootnoteProperties();
+        $footnoteProp->setPos(FootnoteProperties::POSITION_DOC_END);
+        $footnoteProp->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $footnoteProp->setNumStart(2);
+        $footnoteProp->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
+
+        $this->assertEquals(FootnoteProperties::POSITION_DOC_END, $footnoteProp->getPos());
+        $this->assertEquals(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN, $footnoteProp->getNumFmt());
+        $this->assertEquals(2, $footnoteProp->getNumStart());
+        $this->assertEquals(FootnoteProperties::RESTART_NUMBER_EACH_PAGE, $footnoteProp->getNumRestart());
+    }
+
+    /**
+     * Test throws exception if wrong position given
+     * 
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongPos()
+    {
+        $footnoteProp= new FootnoteProperties();
+        $footnoteProp->setPos(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+    }
+
+    /**
+     * Test throws exception if wrong number format given
+     * 
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongNumFmt()
+    {
+        $footnoteProp= new FootnoteProperties();
+        $footnoteProp->setNumFmt(FootnoteProperties::POSITION_DOC_END);
+    }
+
+    /**
+     * Test throws exception if wrong number restart given
+     * 
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongNumRestart()
+    {
+        $footnoteProp= new FootnoteProperties();
+        $footnoteProp->setNumRestart(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+    }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index a9e6d861..0f64d7a7 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -20,6 +20,7 @@ use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Document
@@ -57,6 +58,36 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(2, $element->getAttribute('w:start'));
     }
 
+    /**
+     * Write section footnote properties
+     */
+    public function testSectionFootnoteProperties()
+    {
+        $properties = new FootnoteProperties();
+        $properties->setPos(FootnoteProperties::POSITION_DOC_END);
+        $properties->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $properties->setNumStart(1);
+        $properties->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
+
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $section->setFootnoteProperties($properties);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:pos');
+        $this->assertEquals(FootnoteProperties::POSITION_DOC_END, $element->getAttribute('w:val'));
+
+        $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:numFmt');
+        $this->assertEquals(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN, $element->getAttribute('w:val'));
+
+        $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:numStart');
+        $this->assertEquals(1, $element->getAttribute('w:val'));
+
+        $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:numRestart');
+        $this->assertEquals(FootnoteProperties::RESTART_NUMBER_EACH_PAGE, $element->getAttribute('w:val'));
+    }
+
     /**
      * Write elements
      */

From 6a84b8ed267eb210a97d3efa92a752b73c7b0fb8 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Wed, 7 Jun 2017 02:26:59 +0200
Subject: [PATCH 056/370] Add possiblity to add not defined options

---
 src/PhpWord/Element/Field.php                 | 10 +++++-----
 src/PhpWord/Writer/Word2007/Element/Field.php |  4 +++-
 tests/PhpWord/Element/FieldTest.php           | 14 ++++++++++++--
 tests/PhpWord/Writer/Word2007/ElementTest.php | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index b5dec19a..bdfdcb40 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -60,7 +60,7 @@ class Field extends AbstractElement
         ),
         'INDEX'=>array(
             'properties' => array(),
-            'options'=>array('PreserveFormat')
+            'options' => array('PreserveFormat')
         )
     );
 
@@ -122,7 +122,7 @@ class Field extends AbstractElement
             if (isset($this->fieldsArray[$type])) {
                 $this->type = $type;
             } else {
-                throw new \InvalidArgumentException("Invalid type");
+                throw new \InvalidArgumentException("Invalid type '$type'");
             }
         }
         return $this->type;
@@ -152,7 +152,7 @@ class Field extends AbstractElement
         if (is_array($properties)) {
             foreach (array_keys($properties) as $propkey) {
                 if (!(isset($this->fieldsArray[$this->type]['properties'][$propkey]))) {
-                    throw new \InvalidArgumentException("Invalid property");
+                    throw new \InvalidArgumentException("Invalid property '$propkey'");
                 }
             }
             $this->properties = array_merge($this->properties, $properties);
@@ -183,8 +183,8 @@ class Field extends AbstractElement
     {
         if (is_array($options)) {
             foreach (array_keys($options) as $optionkey) {
-                if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey]))) {
-                    throw new \InvalidArgumentException("Invalid option");
+                if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey])) && substr($optionkey, 0, 1) !== '\\') {
+                    throw new \InvalidArgumentException("Invalid option '$optionkey', possible values are " . implode(', ', $this->fieldsArray[$this->type]['options']));
                 }
             }
             $this->options = array_merge($this->options, $options);
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index ad8032c7..802803db 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -77,6 +77,8 @@ class Field extends Text
                 case 'Italic':
                     $instruction .= '\i ';
                     break;
+                default:
+                    $instruction .= $option .' ';
             }
         }
 
@@ -106,7 +108,7 @@ class Field extends Text
         $xmlWriter->startElement('w:noProof');
         $xmlWriter->endElement(); // w:noProof
         $xmlWriter->endElement(); // w:rPr
-        $xmlWriter->writeElement('w:t', '1');
+        $xmlWriter->writeElement('w:t', $element->getText() == null ? '1' : $element->getText());
         $xmlWriter->endElement(); // w:r
         
         $xmlWriter->startElement('w:r');
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index d4e47e62..415aaa0b 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -75,15 +75,25 @@ class FieldTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstructWithTypePropertiesOptionsText()
     {
-        $oField = new Field('XE', array(), array('Bold'), 'FieldValue');
+        $oField = new Field('XE', array(), array('Bold', 'Italic'), 'FieldValue');
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
         $this->assertEquals('XE', $oField->getType());
         $this->assertEquals(array(), $oField->getProperties());
-        $this->assertEquals(array('Bold'), $oField->getOptions());
+        $this->assertEquals(array('Bold', 'Italic'), $oField->getOptions());
         $this->assertEquals('FieldValue', $oField->getText());
     }
 
+    public function testConstructWithOptionValue()
+    {
+        $oField = new Field('INDEX', array(), array('\\c "3" \\h "A"'));
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('INDEX', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('\\c "3" \\h "A"'), $oField->getOptions());
+    }
+
     /**
      * Test setType exception
      *
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 027ba86a..7208449d 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -192,6 +192,24 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testFieldElement()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $section->addField('INDEX', [], ['\\c "3"']);
+        $section->addField('XE', [], ['Bold', 'Italic'], 'Index Entry');
+        $section->addField('DATE', ['dateformat' => 'd-M-yyyy'], ['PreserveFormat', 'LastUsedFormat']);
+        $section->addField('DATE', [], ['LunarCalendar']);
+        $section->addField('DATE', [], ['SakaEraCalendar']);
+        $section->addField('NUMPAGES', ['format' => 'roman', 'numformat' => '0,00'], ['SakaEraCalendar']);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p/w:r/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' INDEX \\c "3" ', $doc->getElement($element)->textContent);
+    }
+
     /**
      * Test form fields
      */

From 8aabf812f8bd27ba49e251d904f4953b6b91cca5 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sun, 11 Jun 2017 12:56:59 +0200
Subject: [PATCH 057/370] update XE field to support formatted text + add
 documentation

---
 docs/elements.rst                             |  30 +++-
 samples/Sample_27_Field.php                   |  16 ++-
 src/PhpWord/Element/AbstractContainer.php     |   2 +-
 src/PhpWord/Element/Field.php                 |  11 +-
 src/PhpWord/Writer/Word2007/Element/Field.php | 129 +++++++++++-------
 tests/PhpWord/Element/FieldTest.php           |  17 +++
 tests/PhpWord/Writer/Word2007/ElementTest.php |  28 ++++
 7 files changed, 177 insertions(+), 56 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index d68ee035..b753ddf7 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -358,7 +358,35 @@ To be completed
 Fields
 ------
 
-To be completed
+Currently the following fields are supported: 
+
+- PAGE
+- NUMPAGES
+- DATE
+- XE
+- INDEX
+
+.. code-block:: php
+
+    $section->addField($fieldType, [$properties], [$options], [$fieldText])
+
+See ``\PhpOffice\PhpWord\Element\Field`` for list of properties and options available for each field type.
+Options which are not specifically defined can be added. Those must start with a ``\``.
+
+For instance for the INDEX field, you can do the following (See `Index Field for list of available options <https://support.office.com/en-us/article/Field-codes-Index-field-adafcf4a-cb30-43f6-85c7-743da1635d9e?ui=en-US&rs=en-US&ad=US>`_ ):
+
+.. code-block:: php
+
+    //the $fieldText can be either a simple string
+    $fieldText = 'The index value';
+
+    //or a 'TextRun', to be able to format the text you want in the index
+    $fieldText = new TextRun();
+    $fieldText->addText('My ');
+    $fieldText->addText('bold index', ['bold' => true]);
+    $fieldText->addText(' entry');
+
+    $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), $fieldText);
 
 Line
 ------
diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index 7e2b968e..b5be12ca 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -1,4 +1,6 @@
 <?php
+use PhpOffice\PhpWord\Element\TextRun;
+
 include_once 'Sample_Header.php';
 
 // New Word document
@@ -21,11 +23,21 @@ $section->addField('NUMPAGES', array('numformat' => '0,00', 'format' => 'Arabic'
 
 $textrun = $section->addTextRun();
 $textrun->addText('An index field is ');
-$textrun->addField('XE', array(), array('Bold'), 'FieldValue');
+$textrun->addField('XE', array(), array('Italic'), 'My first index');
+$textrun->addText('here:');
+
+$indexEntryText = new TextRun();
+$indexEntryText->addText('My ');
+$indexEntryText->addText('bold index', ['bold' => true]);
+$indexEntryText->addText(' entry');
+
+$textrun = $section->addTextRun();
+$textrun->addText('A complex index field is ');
+$textrun->addField('XE', array(), array('Bold'), $indexEntryText);
 $textrun->addText('here:');
 
 $section->addText('The actual index:');
-$section->addField('INDEX', array(), array('PreserveFormat'));
+$section->addField('INDEX', array(), array('\\e "	"'), 'right click to update the index');
 
 $textrun = $section->addTextRun(array('alignment' => \PhpOffice\PhpWord\SimpleType\Jc::CENTER));
 $textrun->addText('This is the date of lunar calendar ');
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index a3872e0b..0107006f 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -39,7 +39,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
  * @method Object addObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
- * @method Field addField(string $type = null, array $properties = array(), array $options = array())
+ * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
  * @method Line addLine(mixed $lineStyle = null)
  * @method Shape addShape(string $type, mixed $style = null)
  * @method Chart addChart(string $type, array $categories, array $values, array $style = null)
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index bdfdcb40..380d7a92 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -74,7 +74,7 @@ class Field extends AbstractElement
     /**
      * Field text
      *
-     * @var string
+     * @var TextRun | string
      */
     protected $text;
 
@@ -98,6 +98,7 @@ class Field extends AbstractElement
      * @param string $type
      * @param array $properties
      * @param array $options
+     * @param TextRun | string $text
      */
     public function __construct($type = null, $properties = array(), $options = array(), $text = null)
     {
@@ -205,16 +206,16 @@ class Field extends AbstractElement
     /**
      * Set Field text
      *
-     * @param string $text
+     * @param string | TextRun $text
      *
-     * @return string
+     * @return string | TextRun
      * 
      * @throws \InvalidArgumentException
      */
     public function setText($text)
     {
         if (isset($text)) {
-            if (is_string($text)) {
+            if (is_string($text) || $text instanceof TextRun) {
                 $this->text = $text;
             } else {
                 throw new \InvalidArgumentException("Invalid text");
@@ -226,7 +227,7 @@ class Field extends AbstractElement
     /**
      * Get Field text
      *
-     * @return string
+     * @return string | TextRun
      */
     public function getText()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 802803db..a79683e2 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
+use PhpOffice\PhpWord\Element\TextRun;
+
 /**
  * Field element writer
  *
@@ -37,51 +39,6 @@ class Field extends Text
             return;
         }
 
-        $instruction = ' ' . $element->getType() . ' ';
-        if ($element->getText() != null) {
-            $instruction .= '"' . $element->getText() . '" ';
-        }
-        $properties  = $element->getProperties();
-        foreach ($properties as $propkey => $propval) {
-            switch ($propkey) {
-                case 'format':
-                    $instruction .= '\* ' . $propval . ' ';
-                    break;
-                case 'numformat':
-                    $instruction .= '\# ' . $propval . ' ';
-                    break;
-                case 'dateformat':
-                    $instruction .= '\@ "' . $propval . '" ';
-                    break;
-            }
-        }
-
-        $options = $element->getOptions();
-        foreach ($options as $option) {
-            switch ($option) {
-                case 'PreserveFormat':
-                    $instruction .= '\* MERGEFORMAT ';
-                    break;
-                case 'LunarCalendar':
-                    $instruction .= '\h ';
-                    break;
-                case 'SakaEraCalendar':
-                    $instruction .= '\s ';
-                    break;
-                case 'LastUsedFormat':
-                    $instruction .= '\l ';
-                    break;
-                case 'Bold':
-                    $instruction .= '\b ';
-                    break;
-                case 'Italic':
-                    $instruction .= '\i ';
-                    break;
-                default:
-                    $instruction .= $option .' ';
-            }
-        }
-
         $this->startElementP();
 
         $xmlWriter->startElement('w:r');
@@ -90,6 +47,17 @@ class Field extends Text
         $xmlWriter->endElement(); // w:fldChar
         $xmlWriter->endElement(); // w:r
 
+        $instruction = ' ' . $element->getType() . ' ';
+        if ($element->getText() != null) {
+            if (is_string($element->getText())) {
+                $instruction .= '"' . $element->getText() . '" ';
+                $instruction .= $this->buildPropertiesAndOptions($element);
+            } else {
+                $instruction .= '"';
+            }
+        } else {
+            $instruction .= $this->buildPropertiesAndOptions($element);
+        }
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
@@ -97,6 +65,27 @@ class Field extends Text
         $xmlWriter->endElement(); // w:instrText
         $xmlWriter->endElement(); // w:r
 
+        if ($element->getText() != null) {
+            if ($element->getText() instanceof TextRun) {
+
+                $containerWriter = new Container($xmlWriter, $element->getText(), true);
+                $containerWriter->write();
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->text('"' . $this->buildPropertiesAndOptions($element));
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->writeAttribute('xml:space', 'preserve');
+                $xmlWriter->text(' ');
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+            }
+        }
+
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:fldChar');
         $xmlWriter->writeAttribute('w:fldCharType', 'separate');
@@ -108,9 +97,9 @@ class Field extends Text
         $xmlWriter->startElement('w:noProof');
         $xmlWriter->endElement(); // w:noProof
         $xmlWriter->endElement(); // w:rPr
-        $xmlWriter->writeElement('w:t', $element->getText() == null ? '1' : $element->getText());
+        $xmlWriter->writeElement('w:t', $element->getText() != null && is_string($element->getText()) ? $element->getText() : '1');
         $xmlWriter->endElement(); // w:r
-        
+
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:fldChar');
         $xmlWriter->writeAttribute('w:fldCharType', 'end');
@@ -119,4 +108,50 @@ class Field extends Text
 
         $this->endElementP(); // w:p
     }
+
+    private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
+    {
+        $propertiesAndOptions = '';
+        $properties  = $element->getProperties();
+        foreach ($properties as $propkey => $propval) {
+            switch ($propkey) {
+                case 'format':
+                    $propertiesAndOptions.= '\* ' . $propval . ' ';
+                    break;
+                case 'numformat':
+                    $propertiesAndOptions.= '\# ' . $propval . ' ';
+                    break;
+                case 'dateformat':
+                    $propertiesAndOptions.= '\@ "' . $propval . '" ';
+                    break;
+            }
+        }
+
+        $options = $element->getOptions();
+        foreach ($options as $option) {
+            switch ($option) {
+                case 'PreserveFormat':
+                    $propertiesAndOptions.= '\* MERGEFORMAT ';
+                    break;
+                case 'LunarCalendar':
+                    $propertiesAndOptions.= '\h ';
+                    break;
+                case 'SakaEraCalendar':
+                    $propertiesAndOptions.= '\s ';
+                    break;
+                case 'LastUsedFormat':
+                    $propertiesAndOptions.= '\l ';
+                    break;
+                case 'Bold':
+                    $propertiesAndOptions.= '\b ';
+                    break;
+                case 'Italic':
+                    $propertiesAndOptions.= '\i ';
+                    break;
+                default:
+                    $propertiesAndOptions.= $option .' ';
+            }
+        }
+        return $propertiesAndOptions;
+    }
 }
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index 415aaa0b..6f5ebbbf 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -84,6 +84,23 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('FieldValue', $oField->getText());
     }
 
+    /**
+     * New instance with type and properties and options and text as TextRun
+     */
+    public function testConstructWithTypePropertiesOptionsTextAsTextRun()
+    {
+        $textRun = new TextRun();
+        $textRun->addText('test string');
+
+        $oField = new Field('XE', array(), array('Bold', 'Italic'), $textRun);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('XE', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('Bold', 'Italic'), $oField->getOptions());
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oField->getText());
+    }
+
     public function testConstructWithOptionValue()
     {
         $oField = new Field('INDEX', array(), array('\\c "3" \\h "A"'));
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 7208449d..5a04c25b 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007;
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Element\TextRun;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Element subnamespace
@@ -210,6 +211,33 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(' INDEX \\c "3" ', $doc->getElement($element)->textContent);
     }
 
+    public function testFieldElementWithComplexText()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $text = new TextRun();
+        $text->addText('test string', array('bold' => true));
+
+        $section->addField('XE', [], ['Bold', 'Italic'], $text);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p/w:r[2]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' XE "', $doc->getElement($element)->textContent);
+
+        $element = '/w:document/w:body/w:p/w:r[3]/w:rPr/w:b';
+        $this->assertTrue($doc->elementExists($element));
+
+        $element = '/w:document/w:body/w:p/w:r[3]/w:t';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('test string', $doc->getElement($element)->textContent);
+
+        $element = '/w:document/w:body/w:p/w:r[4]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('"\\b \\i ', $doc->getElement($element)->textContent);
+    }
+
     /**
      * Test form fields
      */

From 64f06e111492c4dfe764df9d289b8b91435cf1a6 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 16 Jun 2017 17:55:24 +0200
Subject: [PATCH 058/370] use fully qualified name

---
 src/PhpWord/Writer/Word2007/Element/Field.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index a79683e2..5f5ae094 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Element\TextRun;
-
 /**
  * Field element writer
  *
@@ -66,7 +64,7 @@ class Field extends Text
         $xmlWriter->endElement(); // w:r
 
         if ($element->getText() != null) {
-            if ($element->getText() instanceof TextRun) {
+            if ($element->getText() instanceof PhpOffice\PhpWord\Element\TextRun) {
 
                 $containerWriter = new Container($xmlWriter, $element->getText(), true);
                 $containerWriter->write();

From 11d816f94ddff1799e2275185f45d1c3bce06b93 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Fri, 16 Jun 2017 22:39:20 +0200
Subject: [PATCH 059/370] php 5.3 compatibility

---
 tests/PhpWord/Writer/Word2007/ElementTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 5a04c25b..b3c7b197 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -198,12 +198,12 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
 
-        $section->addField('INDEX', [], ['\\c "3"']);
-        $section->addField('XE', [], ['Bold', 'Italic'], 'Index Entry');
-        $section->addField('DATE', ['dateformat' => 'd-M-yyyy'], ['PreserveFormat', 'LastUsedFormat']);
-        $section->addField('DATE', [], ['LunarCalendar']);
-        $section->addField('DATE', [], ['SakaEraCalendar']);
-        $section->addField('NUMPAGES', ['format' => 'roman', 'numformat' => '0,00'], ['SakaEraCalendar']);
+        $section->addField('INDEX', array(), array('\\c "3"'));
+        $section->addField('XE', array(), array('Bold', 'Italic'), 'Index Entry');
+        $section->addField('DATE', array('dateformat' => 'd-M-yyyy'), array('PreserveFormat', 'LastUsedFormat'));
+        $section->addField('DATE', array(), array('LunarCalendar'));
+        $section->addField('DATE', array(), array('SakaEraCalendar'));
+        $section->addField('NUMPAGES', array('format' => 'roman', 'numformat' => '0,00'), array('SakaEraCalendar'));
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         $element = '/w:document/w:body/w:p/w:r/w:instrText';
@@ -219,7 +219,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $text = new TextRun();
         $text->addText('test string', array('bold' => true));
 
-        $section->addField('XE', [], ['Bold', 'Italic'], $text);
+        $section->addField('XE', array(), array('Bold', 'Italic'), $text);
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         $element = '/w:document/w:body/w:p/w:r[2]/w:instrText';

From 2b4b200e42d324e1b839c073632c2d458543a541 Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sat, 17 Jun 2017 00:34:02 +0200
Subject: [PATCH 060/370] fix namespace

---
 src/PhpWord/Writer/Word2007/Element/Field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 5f5ae094..9fc45b21 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -64,7 +64,7 @@ class Field extends Text
         $xmlWriter->endElement(); // w:r
 
         if ($element->getText() != null) {
-            if ($element->getText() instanceof PhpOffice\PhpWord\Element\TextRun) {
+            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
 
                 $containerWriter = new Container($xmlWriter, $element->getText(), true);
                 $containerWriter->write();

From eff532e64fe4223dd8dbcb1d4bf2a70031749f4d Mon Sep 17 00:00:00 2001
From: antoine <antoine.de.troostembergh@gmail.com>
Date: Sat, 17 Jun 2017 01:01:54 +0200
Subject: [PATCH 061/370] make code php 5.3 -> 5.5 compatible

---
 src/PhpWord/SimpleType/FootnoteProperties.php | 64 +++++++++----------
 .../SimpleType/FootnotePropertiesTest.php     |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/PhpWord/SimpleType/FootnoteProperties.php b/src/PhpWord/SimpleType/FootnoteProperties.php
index 812c055f..f98f0a94 100644
--- a/src/PhpWord/SimpleType/FootnoteProperties.php
+++ b/src/PhpWord/SimpleType/FootnoteProperties.php
@@ -28,12 +28,6 @@ final class FootnoteProperties
     const RESTART_NUMBER_EACH_SECTION = 'eachSect';
     const RESTART_NUMBER_EACH_PAGE = 'eachPage';
 
-    const RESTART_NUMBER = array(
-        self::RESTART_NUMBER_CONTINUOUS,
-        self::RESTART_NUMBER_EACH_SECTION,
-        self::RESTART_NUMBER_EACH_PAGE
-    );
-
     const NUMBER_FORMAT_DECIMAL = 'decimal';
     const NUMBER_FORMAT_UPPER_ROMAN = 'upperRoman';
     const NUMBER_FORMAT_LOWER_ROMAN = 'lowerRoman';
@@ -45,31 +39,11 @@ final class FootnoteProperties
     const NUMBER_FORMAT_NONE = 'none';
     const NUMBER_FORMAT_BULLET = 'bullet';
 
-    const NUMBER_FORMAT = array(
-        self::NUMBER_FORMAT_DECIMAL,
-        self::NUMBER_FORMAT_UPPER_ROMAN,
-        self::NUMBER_FORMAT_LOWER_ROMAN,
-        self::NUMBER_FORMAT_UPPER_LETTER,
-        self::NUMBER_FORMAT_LOWER_LETTER,
-        self::NUMBER_FORMAT_ORDINAL,
-        self::NUMBER_FORMAT_CARDINAL_TEXT,
-        self::NUMBER_FORMAT_ORDINAL_TEXT,
-        self::NUMBER_FORMAT_NONE,
-        self::NUMBER_FORMAT_BULLET
-    );
-
     const POSITION_PAGE_BOTTOM = 'pageBottom';
     const POSITION_BENEATH_TEXT = 'beneathText';
     const POSITION_SECTION_END = 'sectEnd';
     const POSITION_DOC_END = 'docEnd';
 
-    const POSITION = array(
-        self::POSITION_PAGE_BOTTOM,
-        self::POSITION_BENEATH_TEXT,
-        self::POSITION_SECTION_END,
-        self::POSITION_DOC_END
-    );
-
     /**
      * Footnote Positioning Location
      *
@@ -105,10 +79,17 @@ final class FootnoteProperties
 
     public function setPos($pos)
     {
-        if (in_array($pos, self::POSITION)) {
+        $position = array(
+            self::POSITION_PAGE_BOTTOM,
+            self::POSITION_BENEATH_TEXT,
+            self::POSITION_SECTION_END,
+            self::POSITION_DOC_END
+        );
+
+        if (in_array($pos, $position)) {
             $this->pos = $pos;
         } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::POSITION) . " possible");
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $position) . " possible");
         }
     }
 
@@ -119,10 +100,23 @@ final class FootnoteProperties
 
     public function setNumFmt($numFmt)
     {
-        if (in_array($numFmt, self::NUMBER_FORMAT)) {
+        $numberFormat = array(
+            self::NUMBER_FORMAT_DECIMAL,
+            self::NUMBER_FORMAT_UPPER_ROMAN,
+            self::NUMBER_FORMAT_LOWER_ROMAN,
+            self::NUMBER_FORMAT_UPPER_LETTER,
+            self::NUMBER_FORMAT_LOWER_LETTER,
+            self::NUMBER_FORMAT_ORDINAL,
+            self::NUMBER_FORMAT_CARDINAL_TEXT,
+            self::NUMBER_FORMAT_ORDINAL_TEXT,
+            self::NUMBER_FORMAT_NONE,
+            self::NUMBER_FORMAT_BULLET
+        );
+
+        if (in_array($numFmt, $numberFormat)) {
             $this->numFmt = $numFmt;
         } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::NUMBER_FORMAT) . " possible");
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $numberFormat) . " possible");
         }
     }
 
@@ -143,10 +137,16 @@ final class FootnoteProperties
 
     public function setNumRestart($numRestart)
     {
-        if (in_array($numRestart, self::RESTART_NUMBER)) {
+        $restartNumbers = array(
+            self::RESTART_NUMBER_CONTINUOUS,
+            self::RESTART_NUMBER_EACH_SECTION,
+            self::RESTART_NUMBER_EACH_PAGE
+        );
+
+        if (in_array($numRestart, $restartNumbers)) {
             $this->numRestart= $numRestart;
         } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', self::RESTART_NUMBER) . " possible");
+            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $restartNumbers) . " possible");
         }
     }
 }
diff --git a/tests/PhpWord/SimpleType/FootnotePropertiesTest.php b/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
index 193ad363..f977b32a 100644
--- a/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
@@ -15,7 +15,7 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\Style;
+namespace PhpOffice\PhpWord\SimpleType;
 
 use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 

From e22ece8c003b428a0c08339dd9ac668d7d3c2c37 Mon Sep 17 00:00:00 2001
From: Hubert Miazek <hubert.miazek@makolab.net>
Date: Mon, 19 Jun 2017 11:05:59 +0200
Subject: [PATCH 062/370] #431

---
 src/PhpWord/Writer/HTML/Element/Image.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index 9c69d41f..646cb9a9 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -41,17 +41,15 @@ class Image extends Text
         $parentWriter = $this->parentWriter;
 
         $content = '';
-        if (!$parentWriter->isPdf()) {
-            $imageData = $this->element->getImageStringData(true);
-            if ($imageData !== null) {
-                $styleWriter = new ImageStyleWriter($this->element->getStyle());
-                $style = $styleWriter->write();
-                $imageData = 'data:' . $this->element->getImageType() . ';base64,' . $imageData;
+        $imageData = $this->element->getImageStringData(true);
+        if ($imageData !== null) {
+            $styleWriter = new ImageStyleWriter($this->element->getStyle());
+            $style = $styleWriter->write();
+            $imageData = 'data:' . $this->element->getImageType() . ';base64,' . $imageData;
 
-                $content .= $this->writeOpening();
-                $content .= "<img border=\"0\" style=\"{$style}\" src=\"{$imageData}\"/>";
-                $content .= $this->writeClosing();
-            }
+            $content .= $this->writeOpening();
+            $content .= "<img border=\"0\" style=\"{$style}\" src=\"{$imageData}\"/>";
+            $content .= $this->writeClosing();
         }
 
         return $content;

From aae9ad424947ef58a2f31542324c775a33e5f304 Mon Sep 17 00:00:00 2001
From: Andrey Tyshev <slowprog@gmail.com>
Date: Mon, 19 Jun 2017 13:47:47 +0300
Subject: [PATCH 063/370] Fix names of styles

---
 src/PhpWord/Reader/Word2007/Document.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index b89a99ad..e5063fd9 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -113,10 +113,10 @@ class Document extends AbstractPart
             'orientation'   => array(self::READ_VALUE, 'w:pgSz', 'w:orient'),
             'colsNum'       => array(self::READ_VALUE, 'w:cols', 'w:num'),
             'colsSpace'     => array(self::READ_VALUE, 'w:cols', 'w:space'),
-            'topMargin'     => array(self::READ_VALUE, 'w:pgMar', 'w:top'),
-            'leftMargin'    => array(self::READ_VALUE, 'w:pgMar', 'w:left'),
-            'bottomMargin'  => array(self::READ_VALUE, 'w:pgMar', 'w:bottom'),
-            'rightMargin'   => array(self::READ_VALUE, 'w:pgMar', 'w:right'),
+            'marginTop'     => array(self::READ_VALUE, 'w:pgMar', 'w:top'),
+            'marginLeft'    => array(self::READ_VALUE, 'w:pgMar', 'w:left'),
+            'marginBottom'  => array(self::READ_VALUE, 'w:pgMar', 'w:bottom'),
+            'marginRight'   => array(self::READ_VALUE, 'w:pgMar', 'w:right'),
             'headerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:header'),
             'footerHeight'  => array(self::READ_VALUE, 'w:pgMar', 'w:footer'),
             'gutter'        => array(self::READ_VALUE, 'w:pgMar', 'w:gutter'),

From 2074d35ab035323c27f6642aaa2d6d0ac79d253e Mon Sep 17 00:00:00 2001
From: Andrey Tyshev <slowprog@gmail.com>
Date: Mon, 19 Jun 2017 13:51:41 +0300
Subject: [PATCH 064/370] Fix PreserveText in Section #452

---
 src/PhpWord/Element/AbstractContainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index a3872e0b..9d1267db 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -211,7 +211,7 @@ abstract class AbstractContainer extends AbstractElement
             'TextBox'       => array('Section', 'Header', 'Footer', 'Cell'),
             'Footnote'      => array('Section', 'TextRun', 'Cell'),
             'Endnote'       => array('Section', 'TextRun', 'Cell'),
-            'PreserveText'  => array('Header', 'Footer', 'Cell'),
+            'PreserveText'  => array('Section', 'Header', 'Footer', 'Cell'),
             'Title'         => array('Section'),
             'TOC'           => array('Section'),
             'PageBreak'     => array('Section'),

From 8c3efa4a514759ac958213d7779c788a8ee4a49f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 1 Jul 2017 16:56:33 +0200
Subject: [PATCH 065/370] remove unused variable

---
 src/PhpWord/Writer/HTML/Element/Image.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index 646cb9a9..24e35957 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -37,9 +37,6 @@ class Image extends Text
         if (!$this->element instanceof ImageElement) {
             return '';
         }
-        /** @var \PhpOffice\PhpWord\Writer\HTML $parentWriter Type hint */
-        $parentWriter = $this->parentWriter;
-
         $content = '';
         $imageData = $this->element->getImageStringData(true);
         if ($imageData !== null) {

From fd418e074621d035fe7b32664c6590b6156af949 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 1 Jul 2017 17:15:50 +0200
Subject: [PATCH 066/370] Make sample php 5.3 compliant

---
 samples/Sample_09_Tables.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index 53d32e08..e3edc605 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -107,22 +107,22 @@ $table->addCell(null, $cellRowContinue);
 $section->addPageBreak();
 $section->addText('Table with colspan and rowspan', $header);
 
-$styleTable = ['borderSize' => 6, 'borderColor' => '999999'];
+$styleTable = array('borderSize' => 6, 'borderColor' => '999999');
 $phpWord->addTableStyle('Colspan Rowspan', $styleTable);
 $table = $section->addTable('Colspan Rowspan');
 
 $row = $table->addRow();
 
-$row->addCell(null, ['vMerge' => 'restart'])->addText('A');
-$row->addCell(null, ['gridSpan' => 2, 'vMerge' => 'restart',])->addText('B');
+$row->addCell(null, array('vMerge' => 'restart'))->addText('A');
+$row->addCell(null, array('gridSpan' => 2, 'vMerge' => 'restart',))->addText('B');
 $row->addCell()->addText('1');
 
 $row = $table->addRow();
-$row->addCell(null, ['vMerge' => 'continue']);
-$row->addCell(null, ['vMerge' => 'continue','gridSpan' => 2,]);
+$row->addCell(null, array('vMerge' => 'continue'));
+$row->addCell(null, array('vMerge' => 'continue','gridSpan' => 2,));
 $row->addCell()->addText('2');
 $row = $table->addRow();
-$row->addCell(null, ['vMerge' => 'continue']);
+$row->addCell(null, array('vMerge' => 'continue'));
 $row->addCell()->addText('C');
 $row->addCell()->addText('D');
 $row->addCell()->addText('3');

From d5dbfb98b031b2ddaabaedad2dca97634483a28f Mon Sep 17 00:00:00 2001
From: Maxim Barulin <mbarulin@gmail.com>
Date: Tue, 4 Apr 2017 11:35:48 +0300
Subject: [PATCH 067/370] add support for contextualSpacing attribute issue
 #1037

---
 src/PhpWord/Style/Paragraph.php               | 26 +++++++++++++++++++
 .../Writer/Word2007/Style/Paragraph.php       |  3 +++
 2 files changed, 29 insertions(+)

diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index c6e60efb..ec23dce3 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -157,6 +157,13 @@ class Paragraph extends Border
      * @var \PhpOffice\PhpWord\Style\Shading
      */
     private $shading;
+    
+    /**
+     * Do not add an interval between paragraphs of the same style
+     *
+     * @var bool
+     */
+    private $contextualSpacing = true;
 
     /**
      * Set Style value
@@ -208,6 +215,7 @@ class Paragraph extends Border
             ),
             'tabs'              => $this->getTabs(),
             'shading'           => $this->getShading(),
+            'contextualSpacing' => $this->getContextualSpacing(),
         );
 
         return $styles;
@@ -731,4 +739,22 @@ class Paragraph extends Border
 
         return $this;
     }
+    
+    /**
+     * @return bool
+     */
+    public function getContextualSpacing()
+    {
+        return $this->contextualSpacing;
+    }
+
+    /**
+     * @param bool $contextualSpacing
+     */
+    public function setContextualSpacing($contextualSpacing)
+    {
+        $this->contextualSpacing = $contextualSpacing;
+        
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 2cb08bee..787f2a5f 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -106,6 +106,9 @@ class Paragraph extends AbstractStyle
             }
             $xmlWriter->endElement();
         }
+        
+        //Paragraph contextualSpacing
+        $xmlWriter->writeElementIf($styles['contextualSpacing'] === true, 'w:contextualSpacing');
 
         // Child style: alignment, indentation, spacing, and shading
         $this->writeChildStyle($xmlWriter, 'Indentation', $styles['indentation']);

From 0f649f3f376cbeff390e21945d6b03cfb0aca7e6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 1 Jul 2017 22:51:53 +0200
Subject: [PATCH 068/370] Add test & update documentation

---
 docs/styles.rst                       |  1 +
 src/PhpWord/Style/Paragraph.php       | 13 +++++--
 tests/PhpWord/Style/ParagraphTest.php | 54 +++++++++++++++++----------
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/docs/styles.rst b/docs/styles.rst
index b71059a6..4f8a53fe 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -77,6 +77,7 @@ See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
 - ``spaceAfter``. Space after paragraph.
 - ``tabs``. Set of custom tab stops.
 - ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
+- ``contextualSpacing``. Ignore Spacing Above and Below When Using Identical Styles, *true* or *false*.
 
 .. _table-style:
 
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index ec23dce3..a9b53b2b 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -159,11 +159,11 @@ class Paragraph extends Border
     private $shading;
     
     /**
-     * Do not add an interval between paragraphs of the same style
+     * Ignore Spacing Above and Below When Using Identical Styles
      *
      * @var bool
      */
-    private $contextualSpacing = true;
+    private $contextualSpacing = false;
 
     /**
      * Set Style value
@@ -215,7 +215,7 @@ class Paragraph extends Border
             ),
             'tabs'              => $this->getTabs(),
             'shading'           => $this->getShading(),
-            'contextualSpacing' => $this->getContextualSpacing(),
+            'contextualSpacing' => $this->hasContextualSpacing(),
         );
 
         return $styles;
@@ -741,15 +741,20 @@ class Paragraph extends Border
     }
     
     /**
+     * Get contextualSpacing
+     * 
      * @return bool
      */
-    public function getContextualSpacing()
+    public function hasContextualSpacing()
     {
         return $this->contextualSpacing;
     }
 
     /**
+     * Set contextualSpacing
+     * 
      * @param bool $contextualSpacing
+     * @return self
      */
     public function setContextualSpacing($contextualSpacing)
     {
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index c0096b0b..86d6e896 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -43,13 +43,14 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
         $object = new Paragraph();
 
         $attributes = array(
-            'widowControl'    => true,
-            'keepNext'        => false,
-            'keepLines'       => false,
-            'pageBreakBefore' => false,
+            'widowControl'      => true,
+            'keepNext'          => false,
+            'keepLines'         => false,
+            'pageBreakBefore'   => false,
+            'contextualSpacing' => false,
         );
         foreach ($attributes as $key => $default) {
-            $get = "get{$key}";
+            $get = $this->findGetter($key, $default, $object);
             $object->setStyleValue($key, null);
             $this->assertEquals($default, $object->$get());
             $object->setStyleValue($key, '');
@@ -65,22 +66,23 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
         $object = new Paragraph();
 
         $attributes = array(
-            'spaceAfter'      => 240,
-            'spaceBefore'     => 240,
-            'indent'          => 1,
-            'hanging'         => 1,
-            'spacing'         => 120,
-            'basedOn'         => 'Normal',
-            'next'            => 'Normal',
-            'numStyle'        => 'numStyle',
-            'numLevel'        => 1,
-            'widowControl'    => false,
-            'keepNext'        => true,
-            'keepLines'       => true,
-            'pageBreakBefore' => true,
+            'spaceAfter'        => 240,
+            'spaceBefore'       => 240,
+            'indent'            => 1,
+            'hanging'           => 1,
+            'spacing'           => 120,
+            'basedOn'           => 'Normal',
+            'next'              => 'Normal',
+            'numStyle'          => 'numStyle',
+            'numLevel'          => 1,
+            'widowControl'      => false,
+            'keepNext'          => true,
+            'keepLines'         => true,
+            'pageBreakBefore'   => true,
+            'contextualSpacing' => true,
         );
         foreach ($attributes as $key => $value) {
-            $get = "get{$key}";
+            $get = $this->findGetter($key, $value, $object);
             $object->setStyleValue("$key", $value);
             if ('indent' == $key || 'hanging' == $key) {
                 $value = $value * 720;
@@ -91,6 +93,18 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    private function findGetter($key, $value, $object)
+    {
+        if (is_bool($value)) {
+            if (method_exists($object, "is{$key}")) {
+                return "is{$key}";
+            } else if (method_exists($object, "has{$key}")) {
+                return "has{$key}";
+            }
+        }
+        return "get{$key}";
+    }
+
     /**
      * Test get null style value
      */
@@ -100,7 +114,7 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
 
         $attributes = array('spacing', 'indent', 'hanging', 'spaceBefore', 'spaceAfter');
         foreach ($attributes as $key) {
-            $get = "get{$key}";
+            $get = $this->findGetter($key, null, $object);
             $this->assertNull($object->$get());
         }
     }

From e7c551a0bfe2b92befebf40a86f4645e540e108e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 2 Jul 2017 00:37:29 +0200
Subject: [PATCH 069/370] Add possibility to show/hide spelling and grammatical
 errors (#985)

* Add possibility to show/hide spelling and grammatical errors
---
 .gitignore                                    |  3 +-
 docs/general.rst                              | 28 +++++++++-
 src/PhpWord/Settings.php                      | 52 +++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  2 +
 tests/PhpWord/SettingsTest.php                | 14 +++++
 .../Writer/Word2007/Part/SettingsTest.php     | 45 ++++++++++++++--
 6 files changed, 137 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5deb643..98f65dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,10 @@ composer.lock
 composer.phar
 vendor
 /report
+/build
 /samples/resources
 /samples/results
 /.settings
 phpword.ini
 /.buildpath
-/.project
\ No newline at end of file
+/.project
diff --git a/docs/general.rst b/docs/general.rst
index 27d0448a..95340125 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -109,8 +109,8 @@ Zip class
 By default, PHPWord uses `Zip extension <http://php.net/manual/en/book.zip.php>`__
 to deal with ZIP compressed archives and files inside them. If you can't have
 Zip extension installed on your server, you can use pure PHP library
-alternative, `PclZip <http://www.phpconcept.net/pclzip/>`__, which
-included with PHPWord.
+alternative, `PclZip <http://www.phpconcept.net/pclzip/>`__, which is
+included in PHPWord.
 
 .. code-block:: php
 
@@ -130,6 +130,17 @@ To turn it on set ``outputEscapingEnabled`` option to ``true`` in your PHPWord c
 
     \PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(true);
 
+Spelling and grammatical checks
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default spelling and grammatical errors are shown as soon as you open a word document.
+For big documents this can slow down the opening of the document. You can hide the spelling and/or grammatical errors with:
+
+.. code-block:: php
+
+    \PhpOffice\PhpWord\Settings::setSpellingErrorsHidden(true);
+    \PhpOffice\PhpWord\Settings::setGrammaticalErrorsHidden(true);
+
 Default font
 ~~~~~~~~~~~~
 
@@ -183,3 +194,16 @@ points to twips.
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Converter::inchToTwip(.5));
     // 2 cm right margin
     $sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(2));
+
+Language
+--------
+
+You can hide spelling errors:
+
+.. code-block:: php
+    \PhpOffice\PhpWord\Settings::setSpellingErrorsHidden(true);
+
+And hide grammatical errors:
+
+.. code-block:: php
+    \PhpOffice\PhpWord\Settings::setGrammaticalErrorsHidden(true);
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 3fbbb0a6..3da32cbb 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -119,6 +119,18 @@ class Settings
      */
     private static $defaultFontSize = self::DEFAULT_FONT_SIZE;
 
+    /**
+     * Hide spelling errors
+     * @var boolean
+     */
+    private static $spellingErrorsHidden = false;
+
+    /**
+     * Hide grammatical errors
+     * @var boolean
+     */
+    private static $grammaticalErrorsHidden = false;
+
     /**
      * The user defined temporary directory.
      *
@@ -416,6 +428,46 @@ class Settings
         return false;
     }
 
+    /**
+     * Are spelling errors hidden
+     *
+     * @return boolean
+     */
+    public static function isSpellingErrorsHidden()
+    {
+        return self::$spellingErrorsHidden;
+    }
+    
+    /**
+     * Hide spelling errors
+     *
+     * @param boolean $spellingErrorsHidden
+     */
+    public static function setSpellingErrorsHidden($spellingErrorsHidden)
+    {
+        self::$spellingErrorsHidden = $spellingErrorsHidden;
+    }
+
+    /**
+     * Are grammatical errors hidden
+     *
+     * @return boolean
+     */
+    public static function isGrammaticalErrorsHidden()
+    {
+        return self::$grammaticalErrorsHidden;
+    }
+
+    /**
+     * Hide grammatical errors
+     *
+     * @param boolean $grammaticalErrorsHidden
+     */
+    public static function setGrammaticalErrorsHidden($grammaticalErrorsHidden)
+    {
+        self::$grammaticalErrorsHidden = $grammaticalErrorsHidden;
+    }
+
     /**
      * Load setting from phpword.yml or phpword.yml.dist
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 82669f91..72406462 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -107,6 +107,8 @@ class Settings extends AbstractPart
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
             'w:evenAndOddHeaders' => array('@attributes' => array('w:val' => DocumentSettings::isEvenAndOddHeaders() ? 'true': 'false')),
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
+            'w:hideSpellingErrors' => array('@attributes' => array('w:val' => DocumentSettings::isSpellingErrorsHidden() ? 'true' : 'false')),
+            'w:hideGrammaticalErrors' => array('@attributes' => array('w:val' => DocumentSettings::isGrammaticalErrorsHidden() ? 'true' : 'false')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
             'w:compat' => array(),
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index 764fccd4..6347f424 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -114,6 +114,20 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse(Settings::setDefaultFontSize(null));
     }
 
+    /**
+     * Test set/get spelling and grammar
+     */
+    public function testSetGetSpellingGrammar()
+    {
+        $this->assertFalse(Settings::isSpellingErrorsHidden());
+        Settings::setSpellingErrorsHidden(true);
+        $this->assertTrue(Settings::isSpellingErrorsHidden());
+
+        $this->assertFalse(Settings::isGrammaticalErrorsHidden());
+        Settings::setGrammaticalErrorsHidden(true);
+        $this->assertTrue(Settings::isGrammaticalErrorsHidden());
+    }
+
     /**
      * Test set/get even and odd headers
      */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index be018f8c..13210fb7 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -68,6 +68,43 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($phpWord->getCompatibility()->getOoxmlVersion(), 15);
     }
 
+    /**
+     * Test language
+     */
+    public function testLanguage()
+    {
+        $phpWord = new PhpWord();
+        
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        
+        $file = 'word/settings.xml';
+        
+        $path = '/w:settings/w:themeFontLang';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+        
+        $this->assertEquals('en-US', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test spelling
+     */
+    public function testSpelling()
+    {
+        $phpWord = new PhpWord();
+        Settings::setSpellingErrorsHidden(true);
+        
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        
+        $file = 'word/settings.xml';
+        
+        $path = '/w:settings/w:hideSpellingErrors';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+        
+        $this->assertEquals('true', $element->getAttribute('w:val'));
+    }
+
     /**
      * Test even and odd headers
      */
@@ -75,14 +112,14 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $phpWord = new PhpWord();
         Settings::setEvenAndOddHeaders(true);
-
+        
         $doc = TestHelperDOCX::getDocument($phpWord);
-
+        
         $file = 'word/settings.xml';
-
+        
         $path = '/w:settings/w:evenAndOddHeaders';
         $this->assertTrue($doc->elementExists($path, $file));
-
+        
         $element = $doc->getElement($path, $file);
         $this->assertEquals('true', $element->getAttribute('w:val'));
     }

From ef956112036456a7f3fb22e0a0aba56985706e47 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 3 Jul 2017 12:54:18 +0200
Subject: [PATCH 070/370] Fix multiple paragraphs being created

---
 src/PhpWord/Reader/Word2007/AbstractPart.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index f429ff75..51970a06 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -167,14 +167,11 @@ abstract class AbstractPart
                 $parent->addTextBreak(null, $paragraphStyle);
             } else {
                 $nodes = $xmlReader->getElements('*', $domNode);
+                if ($runLinkCount > 1) {
+                    $parent = $parent->addTextRun($paragraphStyle);
+                }
                 foreach ($nodes as $node) {
-                    $this->readRun(
-                        $xmlReader,
-                        $node,
-                        ($runLinkCount > 1) ? $parent->addTextRun($paragraphStyle) : $parent,
-                        $docPart,
-                        $paragraphStyle
-                    );
+                    $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
                 }
             }
         }

From 8a5433e5df1f76d2bfa554b99e08e2bd79e05779 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 4 Jul 2017 15:04:30 +0200
Subject: [PATCH 071/370] add new NumberFormat values and refactor other uses

---
 samples/Sample_06_Footnote.php                |   5 +-
 .../FootnoteProperties.php                    |  89 ++++++----
 src/PhpWord/Element/Section.php               |   2 +-
 src/PhpWord/Shared/AbstractEnum.php           |  35 ++++
 src/PhpWord/SimpleType/NumberFormat.php       | 153 ++++++++++++++++++
 src/PhpWord/Style/NumberingLevel.php          |  16 +-
 src/PhpWord/Writer/Word2007/Part/Document.php |   1 -
 .../FootnotePropertiesTest.php                |  13 +-
 .../Writer/Word2007/Part/DocumentTest.php     |   7 +-
 .../Writer/Word2007/Part/NumberingTest.php    |   3 +-
 10 files changed, 271 insertions(+), 53 deletions(-)
 rename src/PhpWord/{SimpleType => ComplexType}/FootnoteProperties.php (67%)
 create mode 100644 src/PhpWord/Shared/AbstractEnum.php
 create mode 100644 src/PhpWord/SimpleType/NumberFormat.php
 rename tests/PhpWord/{SimpleType => ComplexType}/FootnotePropertiesTest.php (83%)

diff --git a/samples/Sample_06_Footnote.php b/samples/Sample_06_Footnote.php
index f9c6b5f7..19d6a524 100644
--- a/samples/Sample_06_Footnote.php
+++ b/samples/Sample_06_Footnote.php
@@ -1,5 +1,6 @@
 <?php
-use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
+use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 include_once 'Sample_Header.php';
 
@@ -50,7 +51,7 @@ $footnote = $section->addFootnote();
 $footnote->addText('The reference for this is wrapped in its own line');
 
 $footnoteProperties = new FootnoteProperties();
-$footnoteProperties->setNumFmt(FootnoteProperties::NUMBER_FORMAT_UPPER_ROMAN);
+$footnoteProperties->setNumFmt(NumberFormat::DECIMAL_ENCLOSED_CIRCLE);
 $section->setFootnoteProperties($footnoteProperties);
 
 // Save file
diff --git a/src/PhpWord/SimpleType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
similarity index 67%
rename from src/PhpWord/SimpleType/FootnoteProperties.php
rename to src/PhpWord/ComplexType/FootnoteProperties.php
index f98f0a94..882834d5 100644
--- a/src/PhpWord/SimpleType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -14,7 +14,9 @@
  * @copyright   2010-2016 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
-namespace PhpOffice\PhpWord\SimpleType;
+namespace PhpOffice\PhpWord\ComplexType;
+
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Footnote properties
@@ -28,17 +30,6 @@ final class FootnoteProperties
     const RESTART_NUMBER_EACH_SECTION = 'eachSect';
     const RESTART_NUMBER_EACH_PAGE = 'eachPage';
 
-    const NUMBER_FORMAT_DECIMAL = 'decimal';
-    const NUMBER_FORMAT_UPPER_ROMAN = 'upperRoman';
-    const NUMBER_FORMAT_LOWER_ROMAN = 'lowerRoman';
-    const NUMBER_FORMAT_UPPER_LETTER = 'upperLetter';
-    const NUMBER_FORMAT_LOWER_LETTER = 'lowerLetter';
-    const NUMBER_FORMAT_ORDINAL = 'ordinal';
-    const NUMBER_FORMAT_CARDINAL_TEXT = 'cardinalText';
-    const NUMBER_FORMAT_ORDINAL_TEXT = 'ordinalText';
-    const NUMBER_FORMAT_NONE = 'none';
-    const NUMBER_FORMAT_BULLET = 'bullet';
-
     const POSITION_PAGE_BOTTOM = 'pageBottom';
     const POSITION_BENEATH_TEXT = 'beneathText';
     const POSITION_SECTION_END = 'sectEnd';
@@ -52,7 +43,7 @@ final class FootnoteProperties
     private $pos;
 
     /**
-     * Footnote Numbering Format
+     * Footnote Numbering Format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
      *
      * @var string
      */
@@ -61,7 +52,7 @@ final class FootnoteProperties
     /**
      * Footnote and Endnote Numbering Starting Value
      *
-     * @var decimal
+     * @var double
      */
     private $numStart;
 
@@ -72,11 +63,23 @@ final class FootnoteProperties
      */
     private $numRestart;
 
+    /**
+     * Get the Footnote Positioning Location
+     * 
+     * @return string
+     */
     public function getPos()
     {
         return $this->pos;
     }
 
+    /**
+     * Set the Footnote Positioning Location (pageBottom, beneathText, sectEnd, docEnd)
+     * 
+     * @param string $pos
+     * @throws \InvalidArgumentException
+     * @return self
+     */
     public function setPos($pos)
     {
         $position = array(
@@ -91,50 +94,71 @@ final class FootnoteProperties
         } else {
             throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $position) . " possible");
         }
+        return $this;
     }
 
+    /**
+     * Get the Footnote Numbering Format
+     * 
+     * @return string
+     */
     public function getNumFmt()
     {
         return $this->numFmt;
     }
 
+    /**
+     * Set the Footnote Numbering Format
+     * 
+     * @param string $numFmt One of NumberFormat
+     * @return self
+     */
     public function setNumFmt($numFmt)
     {
-        $numberFormat = array(
-            self::NUMBER_FORMAT_DECIMAL,
-            self::NUMBER_FORMAT_UPPER_ROMAN,
-            self::NUMBER_FORMAT_LOWER_ROMAN,
-            self::NUMBER_FORMAT_UPPER_LETTER,
-            self::NUMBER_FORMAT_LOWER_LETTER,
-            self::NUMBER_FORMAT_ORDINAL,
-            self::NUMBER_FORMAT_CARDINAL_TEXT,
-            self::NUMBER_FORMAT_ORDINAL_TEXT,
-            self::NUMBER_FORMAT_NONE,
-            self::NUMBER_FORMAT_BULLET
-        );
-
-        if (in_array($numFmt, $numberFormat)) {
-            $this->numFmt = $numFmt;
-        } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $numberFormat) . " possible");
-        }
+        NumberFormat::validate($numFmt);
+        $this->numFmt = $numFmt;
+        return $this;
     }
 
+    /**
+     * Get the Footnote Numbering Format
+     * 
+     * @return double
+     */
     public function getNumStart()
     {
         return $this->numStart;
     }
 
+    /**
+     * Set the Footnote Numbering Format
+     * 
+     * @param double $numStart
+     * @return self
+     */
     public function setNumStart($numStart)
     {
         $this->numStart = $numStart;
+        return $this;
     }
 
+    /**
+     * Get the Footnote and Endnote Numbering Starting Value
+     * 
+     * @return string
+     */
     public function getNumRestart()
     {
         return $this->numRestart;
     }
 
+    /**
+     * Set the Footnote and Endnote Numbering Starting Value (continuous, eachSect, eachPage)
+     * 
+     * @param  string $numRestart
+     * @throws \InvalidArgumentException
+     * @return self
+     */
     public function setNumRestart($numRestart)
     {
         $restartNumbers = array(
@@ -148,5 +172,6 @@ final class FootnoteProperties
         } else {
             throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $restartNumbers) . " possible");
         }
+        return $this;
     }
 }
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index c0bfc3cf..6e199bb9 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -17,8 +17,8 @@
 
 namespace PhpOffice\PhpWord\Element;
 
+use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
-use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 
 class Section extends AbstractContainer
 {
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
new file mode 100644
index 00000000..4584c2f9
--- /dev/null
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -0,0 +1,35 @@
+<?php
+namespace PhpOffice\PhpWord\Shared;
+
+abstract class AbstractEnum
+{
+
+    private static $constCacheArray = null;
+
+    private static function getConstants()
+    {
+        if (self::$constCacheArray == null) {
+            self::$constCacheArray = array();
+        }
+        $calledClass = get_called_class();
+        if (! array_key_exists($calledClass, self::$constCacheArray)) {
+            $reflect = new \ReflectionClass($calledClass);
+            self::$constCacheArray[$calledClass] = $reflect->getConstants();
+        }
+        return self::$constCacheArray[$calledClass];
+    }
+
+    public static function values()
+    {
+        return array_values(self::getConstants());
+    }
+
+    public static function validate($value)
+    {
+        $values = array_values(self::getConstants());
+        if (!in_array($value, $values, true)) {
+            $calledClass = get_called_class();
+            throw new \InvalidArgumentException("$value is not a valid value for $calledClass, possible values are " . implode(', ', $values));
+        }
+    }
+}
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
new file mode 100644
index 00000000..4c98dbef
--- /dev/null
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Numbering Format.
+ *
+ * @since 0.14.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_NumberFormat.html.
+ *
+ * @codeCoverageIgnore
+ */
+final class NumberFormat extends AbstractEnum
+{
+    //Decimal Numbers
+    const DECIMAL = 'decimal';
+    //Uppercase Roman Numerals
+    const UPPER_ROMAN = 'upperRoman';
+    //Lowercase Roman Numerals
+    const LOWER_ROMAN = 'lowerRoman';
+    //Uppercase Latin Alphabet
+    const UPPER_LETTER = 'upperLetter';
+    //Lowercase Latin Alphabet
+    const LOWER_LETTER = 'lowerLetter';
+    //Ordinal
+    const ORDINAL = 'ordinal';
+    //Cardinal Text
+    const CARDINAL_TEXT = 'cardinalText';
+    //Ordinal Text
+    const ORDINAL_TEXT = 'ordinalText';
+    //Hexadecimal Numbering
+    const HEX = 'hex';
+    //Chicago Manual of Style
+    const CHICAGO = 'chicago';
+    //Ideographs
+    const IDEOGRAPH_DIGITAL = 'ideographDigital';
+    //Japanese Counting System
+    const JAPANESE_COUNTING = 'japaneseCounting';
+    //AIUEO Order Hiragana
+    const AIUEO = 'aiueo';
+    //Iroha Ordered Katakana
+    const IROHA = 'iroha';
+    //Double Byte Arabic Numerals
+    const DECIMAL_FULL_WIDTH = 'decimalFullWidth';
+    //Single Byte Arabic Numerals
+    const DECIMAL_HALF_WIDTH = 'decimalHalfWidth';
+    //Japanese Legal Numbering
+    const JAPANESE_LEGAL = 'japaneseLegal';
+    //Japanese Digital Ten Thousand Counting System
+    const JAPANESE_DIGITAL_TEN_THOUSAND = 'japaneseDigitalTenThousand';
+    //Decimal Numbers Enclosed in a Circle
+    const DECIMAL_ENCLOSED_CIRCLE = 'decimalEnclosedCircle';
+    //Double Byte Arabic Numerals Alternate
+    const DECIMAL_FULL_WIDTH2 = 'decimalFullWidth2';
+    //Full-Width AIUEO Order Hiragana
+    const AIUEO_FULL_WIDTH = 'aiueoFullWidth';
+    //Full-Width Iroha Ordered Katakana
+    const IROHA_FULL_WIDTH = 'irohaFullWidth';
+    //Initial Zero Arabic Numerals
+    const DECIMAL_ZERO = 'decimalZero';
+    //Bullet
+    const BULLET = 'bullet';
+    //Korean Ganada Numbering
+    const GANADA = 'ganada';
+    //Korean Chosung Numbering
+    const CHOSUNG = 'chosung';
+    //Decimal Numbers Followed by a Period
+    const DECIMAL_ENCLOSED_FULL_STOP = 'decimalEnclosedFullstop';
+    //Decimal Numbers Enclosed in Parenthesis
+    const DECIMAL_ENCLOSED_PAREN = 'decimalEnclosedParen';
+    //Decimal Numbers Enclosed in a Circle
+    const DECIMAL_ENCLOSED_CIRCLE_CHINESE = 'decimalEnclosedCircleChinese';
+    //Ideographs Enclosed in a Circle
+    const IDEOGRAPHENCLOSEDCIRCLE = 'ideographEnclosedCircle';
+    //Traditional Ideograph Format
+    const IDEOGRAPH_TRADITIONAL = 'ideographTraditional';
+    //Zodiac Ideograph Format
+    const IDEOGRAPH_ZODIAC = 'ideographZodiac';
+    //Traditional Zodiac Ideograph Format
+    const IDEOGRAPH_ZODIAC_TRADITIONAL = 'ideographZodiacTraditional';
+    //Taiwanese Counting System
+    const TAIWANESE_COUNTING = 'taiwaneseCounting';
+    //Traditional Legal Ideograph Format
+    const IDEOGRAPH_LEGAL_TRADITIONAL = 'ideographLegalTraditional';
+    //Taiwanese Counting Thousand System
+    const TAIWANESE_COUNTING_THOUSAND = 'taiwaneseCountingThousand';
+    //Taiwanese Digital Counting System
+    const TAIWANESE_DIGITAL = 'taiwaneseDigital';
+    //Chinese Counting System
+    const CHINESE_COUNTING = 'chineseCounting';
+    //Chinese Legal Simplified Format
+    const CHINESE_LEGAL_SIMPLIFIED = 'chineseLegalSimplified';
+    //Chinese Counting Thousand System
+    const CHINESE_COUNTING_THOUSAND = 'chineseCountingThousand';
+    //Korean Digital Counting System
+    const KOREAN_DIGITAL = 'koreanDigital';
+    //Korean Counting System
+    const KOREAN_COUNTING = 'koreanCounting';
+    //Korean Legal Numbering
+    const KOREAN_LEGAL = 'koreanLegal';
+    //Korean Digital Counting System Alternate
+    const KOREAN_DIGITAL2 = 'koreanDigital2';
+    //Vietnamese Numerals
+    const VIETNAMESE_COUNTING = 'vietnameseCounting';
+    //Lowercase Russian Alphabet
+    const RUSSIAN_LOWER = 'russianLower';
+    //Uppercase Russian Alphabet
+    const RUSSIAN_UPPER = 'russianUpper';
+    //No Numbering
+    const NONE = 'none';
+    //Number With Dashes
+    const NUMBER_IN_DASH = 'numberInDash';
+    //Hebrew Numerals
+    const HEBREW1 = 'hebrew1';
+    //Hebrew Alphabet
+    const HEBREW2 = 'hebrew2';
+    //Arabic Alphabet
+    const ARABIC_ALPHA = 'arabicAlpha';
+    //Arabic Abjad Numerals
+    const ARABIC_ABJAD = 'arabicAbjad';
+    //Hindi Vowels
+    const HINDI_VOWELS = 'hindiVowels';
+    //Hindi Consonants
+    const HINDI_CONSONANTS = 'hindiConsonants';
+    //Hindi Numbers
+    const HINDI_NUMBERS = 'hindiNumbers';
+    //Hindi Counting System
+    const HINDI_COUNTING = 'hindiCounting';
+    //Thai Letters
+    const THAI_LETTERS = 'thaiLetters';
+    //Thai Numerals
+    const THAI_NUMBERS = 'thaiNumbers';
+    //Thai Counting System
+    const THAI_COUNTING = 'thaiCounting';
+}
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 51ae6148..827d4354 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Numbering level definition
@@ -43,7 +44,7 @@ class NumberingLevel extends AbstractStyle
     private $start = 1;
 
     /**
-     * Numbering format bullet|decimal|upperRoman|lowerRoman|upperLetter|lowerLetter
+     * Numbering format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
      *
      * @var string
      * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
@@ -67,7 +68,7 @@ class NumberingLevel extends AbstractStyle
     private $pStyle;
 
     /**
-     * Content between numbering symbol and paragraph text
+     * Content between numbering symbol and paragraph text w:suff
      *
      * @var string tab|space|nothing
      * @link http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
@@ -83,7 +84,9 @@ class NumberingLevel extends AbstractStyle
     private $text;
 
     /**
-     * @var string
+     * Justification, w:lvlJc
+     * 
+     * @var string, one of PhpOffice\PhpWord\SimpleType\Jc
      */
     private $alignment = '';
 
@@ -185,13 +188,12 @@ class NumberingLevel extends AbstractStyle
      */
     public function setFormat($value)
     {
-        $enum = array('bullet', 'decimal', 'upperRoman', 'lowerRoman', 'upperLetter', 'lowerLetter');
-        $this->format = $this->setEnumVal($value, $enum, $this->format);
+        $this->format = $this->setEnumVal($value, NumberFormat::values(), $this->format);
         return $this;
     }
 
     /**
-     * Get start
+     * Get restart
      *
      * @return integer
      */
@@ -201,7 +203,7 @@ class NumberingLevel extends AbstractStyle
     }
 
     /**
-     * Set start
+     * Set restart
      *
      * @param integer $value
      * @return self
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index a2dc999b..11e3f510 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -21,7 +21,6 @@ use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Section as SectionStyleWriter;
-use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
 
 /**
  * Word2007 document part writer: word/document.xml
diff --git a/tests/PhpWord/SimpleType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
similarity index 83%
rename from tests/PhpWord/SimpleType/FootnotePropertiesTest.php
rename to tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index f977b32a..025e8c91 100644
--- a/tests/PhpWord/SimpleType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -15,9 +15,10 @@
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
-namespace PhpOffice\PhpWord\SimpleType;
+namespace PhpOffice\PhpWord\ComplexType;
 
-use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
+use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Test class for PhpOffice\PhpWord\SimpleType\FootnoteProperties
@@ -34,12 +35,12 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
     {
         $footnoteProp = new FootnoteProperties();
         $footnoteProp->setPos(FootnoteProperties::POSITION_DOC_END);
-        $footnoteProp->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $footnoteProp->setNumFmt(NumberFormat::LOWER_ROMAN);
         $footnoteProp->setNumStart(2);
         $footnoteProp->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
 
         $this->assertEquals(FootnoteProperties::POSITION_DOC_END, $footnoteProp->getPos());
-        $this->assertEquals(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN, $footnoteProp->getNumFmt());
+        $this->assertEquals(NumberFormat::LOWER_ROMAN, $footnoteProp->getNumFmt());
         $this->assertEquals(2, $footnoteProp->getNumStart());
         $this->assertEquals(FootnoteProperties::RESTART_NUMBER_EACH_PAGE, $footnoteProp->getNumRestart());
     }
@@ -52,7 +53,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
     public function testWrongPos()
     {
         $footnoteProp= new FootnoteProperties();
-        $footnoteProp->setPos(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $footnoteProp->setPos(NumberFormat::LOWER_ROMAN);
     }
 
     /**
@@ -74,6 +75,6 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
     public function testWrongNumRestart()
     {
         $footnoteProp= new FootnoteProperties();
-        $footnoteProp->setNumRestart(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $footnoteProp->setNumRestart(NumberFormat::LOWER_ROMAN);
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 0f64d7a7..d45cde6b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -16,11 +16,12 @@
  */
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\SimpleType\FootnoteProperties;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Document
@@ -65,7 +66,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
     {
         $properties = new FootnoteProperties();
         $properties->setPos(FootnoteProperties::POSITION_DOC_END);
-        $properties->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
+        $properties->setNumFmt(NumberFormat::LOWER_ROMAN);
         $properties->setNumStart(1);
         $properties->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
 
@@ -79,7 +80,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(FootnoteProperties::POSITION_DOC_END, $element->getAttribute('w:val'));
 
         $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:numFmt');
-        $this->assertEquals(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN, $element->getAttribute('w:val'));
+        $this->assertEquals(NumberFormat::LOWER_ROMAN, $element->getAttribute('w:val'));
 
         $element = $doc->getElement('/w:document/w:body/w:sectPr/w:footnotePr/w:numStart');
         $this->assertEquals(1, $element->getAttribute('w:val'));
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index 9d11e5cb..bca4b562 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Numbering
@@ -52,7 +53,7 @@ class NumberingTest extends \PHPUnit_Framework_TestCase
                 'levels' => array(
                     array(
                         'start'     => 1,
-                        'format'    => 'decimal',
+                        'format'    => NumberFormat::DECIMAL,
                         'restart'   => 1,
                         'suffix'    => 'space',
                         'text'      => '%1.',

From 21303ed4fb23b16fc8581aa4992ee6d668cbe478 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 5 Jul 2017 21:39:22 +0200
Subject: [PATCH 072/370] prepare release notes

---
 .travis.yml  |  2 ++
 CHANGELOG.md | 22 ++++++++++++++++++++++
 README.md    |  4 ++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0712f734..06d7ec00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,13 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
     - hhvm
 
 matrix:
     allow_failures:
         - php: 7.0
+        - php: 7.1
         - php: hhvm
 
 env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66f38dda..e1e0245f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,28 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+v0.14.0 (?? ???? 2017)
+----------------------
+This release fixes several bugs and adds some new features
+
+### Added
+- Possibility to control the footnote numbering - @troosan #1068
+- Image creation from string - @troosan #937
+- Introduced the `\PhpOffice\PhpWord\SimpleType\NumberFormat` simple type. - @troosan
+- Support for ContextualSpacing - @postHawk #1088
+- Possiblity to hide spelling and/or grammatical errors - @troosan #542
+
+### Fixed
+- Images are not being printed when generating PDF - @hubertinio #1074 #431
+- Fixed some PHP 7 warnings - @	likeuntomurphy #927
+- Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
+- Fixed image loading over https - @troosan #988
+- Impossibility to set different even and odd page headers - @troosan #981
+- Fixed Word2007 reader where unnecessary paragraphs were being created - @donghaobo #1043 #620
+- Fixed Word2007 reader where margins were not being read correctly - @slowprog #885 #1008
+- Impossible to add element PreserveText in Section - @rvanlaak #452
+- Missing options for numbering format - @troosan #1041
+
 v0.13.0 (31 July 2016)
 -------------------
 This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).
diff --git a/README.md b/README.md
index 18f4c55f..6b9f7dfa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
 
-## :mag_right: PHPWord is looking for a new maintainer :crown: :pencil: ([#948](https://github.com/PHPOffice/PHPWord/issues/948)) 
-
 [![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
 [![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
 [![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?s=b5997ce59ac2816b4514f3a38de9900f6d492c1d)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
@@ -14,6 +12,8 @@ PHPWord is a library written in pure PHP that provides a set of classes to write
 
 PHPWord is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPWord/docs/develop/).
 
+If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword)
+
 Read more about PHPWord:
 
 - [Features](#features)

From e9cc289243a8ebb1891779f7bd88a19affe0d125 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 5 Jul 2017 21:42:38 +0200
Subject: [PATCH 073/370] refactor Settings to not mix PHPWord settings and
 document settings

---
 docs/containers.rst                           |   6 +
 docs/general.rst                              |   4 +-
 src/PhpWord/Element/Footer.php                |   2 +-
 src/PhpWord/Metadata/Settings.php             | 131 ++++++++++++++++++
 src/PhpWord/PhpWord.php                       |  17 ++-
 src/PhpWord/Settings.php                      |  75 ----------
 src/PhpWord/SimpleType/NumberFormat.php       |   2 -
 src/PhpWord/Writer/Word2007/Part/Settings.php |  33 +++--
 tests/PhpWord/Metadata/SettingsTest.php       |  69 +++++++++
 tests/PhpWord/SettingsTest.php                |  24 ----
 .../Writer/Word2007/Part/SettingsTest.php     |   6 +-
 11 files changed, 252 insertions(+), 117 deletions(-)
 create mode 100644 src/PhpWord/Metadata/Settings.php
 create mode 100644 tests/PhpWord/Metadata/SettingsTest.php

diff --git a/docs/containers.rst b/docs/containers.rst
index f165a589..3569cc50 100644
--- a/docs/containers.rst
+++ b/docs/containers.rst
@@ -98,6 +98,12 @@ that are available for the footer. See "Footer" section for detail.
 Additionally, only inside of the header reference you can add watermarks
 or background pictures. See "Watermarks" section.
 
+You can pass an optional parameter to specify where the header/footer should be applied, it can be
+
+-  ``Footer::AUTO`` default, all pages except if overridden by first or even
+-  ``Footer::FIRST`` each first page of the section
+-  ``Footer::EVEN`` each even page of the section. Will only be applied if the evenAndOddHeaders is set to true in phpWord->settings
+
 Footers
 -------
 
diff --git a/docs/general.rst b/docs/general.rst
index 95340125..8e347089 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -138,8 +138,8 @@ For big documents this can slow down the opening of the document. You can hide t
 
 .. code-block:: php
 
-    \PhpOffice\PhpWord\Settings::setSpellingErrorsHidden(true);
-    \PhpOffice\PhpWord\Settings::setGrammaticalErrorsHidden(true);
+    $phpWord->getSettings()->setHideGrammaticalErrors(true);
+    $phpWord->getSettings()->setHideSpellingErrors(true);
 
 Default font
 ~~~~~~~~~~~~
diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php
index 01c6d25c..b3196f3f 100644
--- a/src/PhpWord/Element/Footer.php
+++ b/src/PhpWord/Element/Footer.php
@@ -26,7 +26,7 @@ class Footer extends AbstractContainer
      * Header/footer types constants
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-wtype-4.html Header or Footer Type
+     * @link http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
      */
     const AUTO  = 'default';  // default and odd pages
     const FIRST = 'first';
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
new file mode 100644
index 00000000..ba6931a0
--- /dev/null
+++ b/src/PhpWord/Metadata/Settings.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Metadata;
+
+/**
+ * Setting class
+ *
+ * @since 0.14.0
+ * @link http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
+ */
+class Settings
+{
+
+    /**
+     * Hide spelling errors
+     * 
+     * @var boolean
+     */
+    private $hideSpellingErrors = false;
+
+    /**
+     * Hide grammatical errors
+     * 
+     * @var boolean
+     */
+    private $hideGrammaticalErrors = false;
+
+    /**
+     * Document Editing Restrictions
+     * 
+     * @var PhpOffice\PhpWord\Metadata\Protection
+     */
+    private $documentProtection;
+
+    /**
+     * Enables different header for odd and even pages.
+     *
+     * @var bool
+     */
+    private $evenAndOddHeaders = false;
+
+    /**
+     * @return Protection
+     */
+    public function getDocumentProtection()
+    {
+        if ($this->documentProtection == null) {
+            $this->documentProtection = new Protection();
+        }
+        return $this->documentProtection;
+    }
+
+    /**
+     * @param Protection $documentProtection
+     */
+    public function setDocumentProtection($documentProtection)
+    {
+        $this->documentProtection = $documentProtection;
+    }
+
+    /**
+     * Are spelling errors hidden
+     *
+     * @return boolean
+     */
+    public function hasHideSpellingErrors()
+    {
+        return $this->hideSpellingErrors;
+    }
+
+    /**
+     * Hide spelling errors
+     *
+     * @param boolean $hideSpellingErrors
+     */
+    public function setHideSpellingErrors($hideSpellingErrors)
+    {
+        $this->hideSpellingErrors = $hideSpellingErrors;
+    }
+
+    /**
+     * Are grammatical errors hidden
+     *
+     * @return boolean
+     */
+    public function hasHideGrammaticalErrors()
+    {
+        return $this->hideGrammaticalErrors;
+    }
+
+    /**
+     * Hide grammatical errors
+     *
+     * @param boolean $hideGrammaticalErrors
+     */
+    public function setHideGrammaticalErrors($hideGrammaticalErrors)
+    {
+        $this->hideGrammaticalErrors = $hideGrammaticalErrors;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasEvenAndOddHeaders()
+    {
+        return $this->evenAndOddHeaders;
+    }
+
+    /**
+     * @param boolean $evenAndOddHeaders
+     */
+    public function setEvenAndOddHeaders($evenAndOddHeaders)
+    {
+        $this->evenAndOddHeaders = $evenAndOddHeaders;
+    }
+}
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 0fa76b2f..bb5b4956 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -91,7 +91,7 @@ class PhpWord
         }
 
         // Metadata
-        $metadata = array('DocInfo', 'Protection', 'Compatibility');
+        $metadata = array('DocInfo', 'Settings', 'Compatibility');
         foreach ($metadata as $meta) {
             $class = 'PhpOffice\\PhpWord\\Metadata\\' . $meta;
             $this->metadata[$meta] = new $class();
@@ -170,10 +170,12 @@ class PhpWord
      *
      * @return \PhpOffice\PhpWord\Metadata\Protection
      * @since 0.12.0
+     * @deprecated Get the Document protection from PhpWord->getSettings()->getDocumentProtection();
+     * @codeCoverageIgnore
      */
     public function getProtection()
     {
-        return $this->metadata['Protection'];
+        return $this->getSettings()->getDocumentProtection();
     }
 
     /**
@@ -187,6 +189,17 @@ class PhpWord
         return $this->metadata['Compatibility'];
     }
 
+    /**
+     * Get compatibility
+     *
+     * @return \PhpOffice\PhpWord\Metadata\Settings
+     * @since 0.14.0
+     */
+    public function getSettings()
+    {
+        return $this->metadata['Settings'];
+    }
+
     /**
      * Get all sections
      *
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 3da32cbb..70fad3e8 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -119,18 +119,6 @@ class Settings
      */
     private static $defaultFontSize = self::DEFAULT_FONT_SIZE;
 
-    /**
-     * Hide spelling errors
-     * @var boolean
-     */
-    private static $spellingErrorsHidden = false;
-
-    /**
-     * Hide grammatical errors
-     * @var boolean
-     */
-    private static $grammaticalErrorsHidden = false;
-
     /**
      * The user defined temporary directory.
      *
@@ -146,13 +134,6 @@ class Settings
      */
     private static $outputEscapingEnabled = false;
 
-    /**
-     * Enables different header for odd and even pages.
-     *
-     * @var bool
-     */
-    private static $evenAndOddHeaders = false;
-
     /**
      * Return the compatibility option used by the XMLWriter
      *
@@ -359,22 +340,6 @@ class Settings
         self::$outputEscapingEnabled = $outputEscapingEnabled;
     }
 
-    /**
-     * @return boolean
-     */
-    public static function isEvenAndOddHeaders()
-    {
-        return self::$evenAndOddHeaders;
-    }
-
-    /**
-     * @param boolean $evenAndOddHeaders
-     */
-    public static function setEvenAndOddHeaders($evenAndOddHeaders)
-    {
-        self::$evenAndOddHeaders = $evenAndOddHeaders;
-    }
-
     /**
      * Get default font name
      *
@@ -428,46 +393,6 @@ class Settings
         return false;
     }
 
-    /**
-     * Are spelling errors hidden
-     *
-     * @return boolean
-     */
-    public static function isSpellingErrorsHidden()
-    {
-        return self::$spellingErrorsHidden;
-    }
-    
-    /**
-     * Hide spelling errors
-     *
-     * @param boolean $spellingErrorsHidden
-     */
-    public static function setSpellingErrorsHidden($spellingErrorsHidden)
-    {
-        self::$spellingErrorsHidden = $spellingErrorsHidden;
-    }
-
-    /**
-     * Are grammatical errors hidden
-     *
-     * @return boolean
-     */
-    public static function isGrammaticalErrorsHidden()
-    {
-        return self::$grammaticalErrorsHidden;
-    }
-
-    /**
-     * Hide grammatical errors
-     *
-     * @param boolean $grammaticalErrorsHidden
-     */
-    public static function setGrammaticalErrorsHidden($grammaticalErrorsHidden)
-    {
-        self::$grammaticalErrorsHidden = $grammaticalErrorsHidden;
-    }
-
     /**
      * Load setting from phpword.yml or phpword.yml.dist
      *
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
index 4c98dbef..9d24a2b3 100644
--- a/src/PhpWord/SimpleType/NumberFormat.php
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -25,8 +25,6 @@ use PhpOffice\PhpWord\Shared\AbstractEnum;
  * @since 0.14.0
  *
  * @see http://www.datypic.com/sc/ooxml/t-w_ST_NumberFormat.html.
- *
- * @codeCoverageIgnore
  */
 final class NumberFormat extends AbstractEnum
 {
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 72406462..602205e9 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -105,10 +105,7 @@ class Settings extends AbstractPart
             'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
             'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
-            'w:evenAndOddHeaders' => array('@attributes' => array('w:val' => DocumentSettings::isEvenAndOddHeaders() ? 'true': 'false')),
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
-            'w:hideSpellingErrors' => array('@attributes' => array('w:val' => DocumentSettings::isSpellingErrorsHidden() ? 'true' : 'false')),
-            'w:hideGrammaticalErrors' => array('@attributes' => array('w:val' => DocumentSettings::isGrammaticalErrorsHidden() ? 'true' : 'false')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
             'w:compat' => array(),
@@ -143,24 +140,44 @@ class Settings extends AbstractPart
             ),
         );
 
+        /** @var \PhpOffice\PhpWord\Metadata\Settings $documentSettings */
+        $documentSettings = $this->getParentWriter()->getPhpWord()->getSettings();
+
+        $this->setOnOffValue('w:hideSpellingErrors', $documentSettings->hasHideSpellingErrors());
+        $this->setOnOffValue('w:hideGrammaticalErrors', $documentSettings->hasHideGrammaticalErrors());
+        $this->setOnOffValue('w:evenAndOddHeaders', $documentSettings->hasEvenAndOddHeaders());
+
         // Other settings
-        $this->getProtection();
+        $this->setDocumentProtection($documentSettings->getDocumentProtection());
         $this->getCompatibility();
     }
 
+    /**
+     * Adds a boolean attribute to the settings array
+     * 
+     * @param string $settingName
+     * @param boolean $booleanValue
+     */
+    private function setOnOffValue($settingName, $booleanValue)
+    {
+        if ($booleanValue !== null && is_bool($booleanValue)) {
+            $this->settings[$settingName] = array('@attributes' => array('w:val' => $booleanValue ? 'true': 'false'));
+        }
+    }
+
     /**
      * Get protection settings.
      *
+     * @param \PhpOffice\PhpWord\Metadata\Settings $documentProtection
      * @return void
      */
-    private function getProtection()
+    private function setDocumentProtection($documentProtection)
     {
-        $protection = $this->getParentWriter()->getPhpWord()->getProtection();
-        if ($protection->getEditing() !== null) {
+        if ($documentProtection != null && $documentProtection->getEditing() !== null) {
             $this->settings['w:documentProtection'] = array(
                 '@attributes' => array(
                     'w:enforcement' => 1,
-                    'w:edit' => $protection->getEditing(),
+                    'w:edit' => $documentProtection->getEditing(),
                 )
             );
         }
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
new file mode 100644
index 00000000..35c15edd
--- /dev/null
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Metadata;
+
+/**
+ * Test class for PhpOffice\PhpWord\Metadata\Settings
+ *
+ * @runTestsInSeparateProcesses
+ */
+class SettingsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * EvenAndOddHeaders
+     */
+    public function testSetEvenAndOddHeaders()
+    {
+        $oSettings = new Settings();
+        $oSettings->setEvenAndOddHeaders(true);
+        $this->assertEquals(true, $oSettings->hasEvenAndOddHeaders());
+    }
+
+    /**
+     * HideGrammaticalErrors
+     */
+    public function testHideGrammaticalErrors()
+    {
+        $oSettings = new Settings();
+        $oSettings->setHideGrammaticalErrors(true);
+        $this->assertEquals(true, $oSettings->hasHideGrammaticalErrors());
+    }
+
+    /**
+     * HideSpellingErrors
+     */
+    public function testHideSpellingErrors()
+    {
+        $oSettings = new Settings();
+        $oSettings->setHideSpellingErrors(true);
+        $this->assertEquals(true, $oSettings->hasHideSpellingErrors());
+    }
+
+    /**
+     * DocumentProtection
+     */
+    public function testDocumentProtection()
+    {
+        $oSettings = new Settings();
+        $oSettings->setDocumentProtection(new Protection());
+        $this->assertNotNull($oSettings->getDocumentProtection());
+
+        $oSettings->getDocumentProtection()->setEditing('trackedChanges');
+        $this->assertEquals('trackedChanges', $oSettings->getDocumentProtection()->getEditing());
+    }
+}
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index 6347f424..f5ac3ed6 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -114,30 +114,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse(Settings::setDefaultFontSize(null));
     }
 
-    /**
-     * Test set/get spelling and grammar
-     */
-    public function testSetGetSpellingGrammar()
-    {
-        $this->assertFalse(Settings::isSpellingErrorsHidden());
-        Settings::setSpellingErrorsHidden(true);
-        $this->assertTrue(Settings::isSpellingErrorsHidden());
-
-        $this->assertFalse(Settings::isGrammaticalErrorsHidden());
-        Settings::setGrammaticalErrorsHidden(true);
-        $this->assertTrue(Settings::isGrammaticalErrorsHidden());
-    }
-
-    /**
-     * Test set/get even and odd headers
-     */
-    public function testSetGetEvenAndOddHeaders()
-    {
-        $this->assertFalse(Settings::isEvenAndOddHeaders());
-        Settings::setEvenAndOddHeaders(true);
-        $this->assertTrue(Settings::isEvenAndOddHeaders());
-    }
-
     /**
      * Test load config
      */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 13210fb7..fe6ea61c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -41,7 +41,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     public function testDocumentProtection()
     {
         $phpWord = new PhpWord();
-        $phpWord->getProtection()->setEditing('forms');
+        $phpWord->getSettings()->getDocumentProtection()->setEditing('forms');
 
         $doc = TestHelperDOCX::getDocument($phpWord);
 
@@ -92,7 +92,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     public function testSpelling()
     {
         $phpWord = new PhpWord();
-        Settings::setSpellingErrorsHidden(true);
+        $phpWord->getSettings()->setHideSpellingErrors(true);
         
         $doc = TestHelperDOCX::getDocument($phpWord);
         
@@ -111,7 +111,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     public function testEvenAndOddHeaders()
     {
         $phpWord = new PhpWord();
-        Settings::setEvenAndOddHeaders(true);
+        $phpWord->getSettings()->setEvenAndOddHeaders(true);
         
         $doc = TestHelperDOCX::getDocument($phpWord);
         

From b919d58bac19be02cc7dc60bb6e1e51dcb667f8e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 6 Jul 2017 22:41:04 +0200
Subject: [PATCH 074/370] add reader for settings

---
 src/PhpWord/Metadata/Settings.php        |  6 +-
 src/PhpWord/Reader/Word2007.php          |  1 +
 src/PhpWord/Reader/Word2007/Settings.php | 76 ++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/PhpWord/Reader/Word2007/Settings.php

diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index ba6931a0..d1d1f0ce 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -90,7 +90,7 @@ class Settings
      */
     public function setHideSpellingErrors($hideSpellingErrors)
     {
-        $this->hideSpellingErrors = $hideSpellingErrors;
+        $this->hideSpellingErrors = $hideSpellingErrors === null ? true : $hideSpellingErrors;
     }
 
     /**
@@ -110,7 +110,7 @@ class Settings
      */
     public function setHideGrammaticalErrors($hideGrammaticalErrors)
     {
-        $this->hideGrammaticalErrors = $hideGrammaticalErrors;
+        $this->hideGrammaticalErrors = $hideGrammaticalErrors === null ? true : $hideGrammaticalErrors;
     }
 
     /**
@@ -126,6 +126,6 @@ class Settings
      */
     public function setEvenAndOddHeaders($evenAndOddHeaders)
     {
-        $this->evenAndOddHeaders = $evenAndOddHeaders;
+        $this->evenAndOddHeaders = $evenAndOddHeaders === null ? true : $evenAndOddHeaders;
     }
 }
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index da20eb87..875415a3 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -55,6 +55,7 @@ class Word2007 extends AbstractReader implements ReaderInterface
             array('stepPart' => 'document', 'stepItems' => array(
                 'endnotes'  => 'Endnotes',
                 'footnotes' => 'Footnotes',
+                'settings' => 'Settings',
             )),
         );
 
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
new file mode 100644
index 00000000..9ab8ee40
--- /dev/null
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Metadata\Protection;
+
+/**
+ * Settings reader
+ *
+ * @since 0.14.0
+ */
+class Settings extends AbstractPart
+{
+
+    private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'evenAndOddHeaders');
+    private static $decimalProperties = array('zoom');
+
+    /**
+     * Read settings.xml.
+     *
+     * @param \PhpOffice\PhpWord\PhpWord $phpWord
+     * @return void
+     */
+    public function read(PhpWord $phpWord)
+    {
+        $xmlReader = new XMLReader();
+        $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
+
+        $docSettings = $phpWord->getSettings();
+
+        $nodes = $xmlReader->getElements('*');
+        if ($nodes->length > 0) {
+            foreach ($nodes as $node) {
+                $name = str_replace('w:', '', $node->nodeName);
+                $value = $xmlReader->getAttribute('w:val', $node);
+                $method = 'set' . $name;
+
+                if (in_array($name, $this::$booleanProperties)) {
+                    if ($value == 'false') {
+                        $docSettings->$method(false);
+                    } else {
+                        $docSettings->$method(true);
+                    }
+                } else if (method_exists($this, $method)) {
+                    $this->$method($xmlReader, $phpWord, $node);
+                } else if (method_exists($this, $method)) {
+                    $docSettings->$method($value);
+                }
+            }
+        }
+    }
+
+    private function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node) {
+        $documentProtection = $phpWord->getSettings()->getDocumentProtection();
+
+        $edit = $xmlReader->getAttribute('w:edit', $node);
+        $documentProtection->setEditing($edit);
+    }
+}

From 24c440b0abd5a9729f4e6a20dc0ca78b75915c4e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 6 Jul 2017 22:54:28 +0200
Subject: [PATCH 075/370] disable 7.1 and hhvm build as they currently do not
 work

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06d7ec00..1a36b21b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,12 @@ php:
     - 5.5
     - 5.6
     - 7.0
-    - 7.1
-    - hhvm
+##    - hhvm
 
 matrix:
     allow_failures:
         - php: 7.0
-        - php: 7.1
-        - php: hhvm
+##        - php: hhvm
 
 env:
     global:

From 722c81d89defb9c8ac789daed511392538da31d2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 6 Jul 2017 23:03:07 +0200
Subject: [PATCH 076/370] fix md remarks

---
 src/PhpWord/Reader/Word2007/Settings.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 9ab8ee40..91153d70 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -19,7 +19,6 @@ namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Metadata\Protection;
 
 /**
  * Settings reader
@@ -30,7 +29,6 @@ class Settings extends AbstractPart
 {
 
     private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'evenAndOddHeaders');
-    private static $decimalProperties = array('zoom');
 
     /**
      * Read settings.xml.
@@ -67,7 +65,14 @@ class Settings extends AbstractPart
         }
     }
 
-    private function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node) {
+    /**
+     * Sets the document protection
+     * 
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMNode $node
+     */
+    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node) {
         $documentProtection = $phpWord->getSettings()->getDocumentProtection();
 
         $edit = $xmlReader->getAttribute('w:edit', $node);

From 88cc13dd85d24e36a7f47e33779ba9b0a1a9976f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 7 Jul 2017 08:02:31 +0200
Subject: [PATCH 077/370] fix

---
 src/PhpWord/Reader/Word2007/Settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 91153d70..df0d6dcf 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -72,7 +72,8 @@ class Settings extends AbstractPart
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
-    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node) {
+    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    {
         $documentProtection = $phpWord->getSettings()->getDocumentProtection();
 
         $edit = $xmlReader->getAttribute('w:edit', $node);

From 4c7c84b17e4a9f4a08b7d5080cfc8b41c670614e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 9 Jul 2017 22:21:34 +0200
Subject: [PATCH 078/370] fix pclzip compatibility issues

---
 src/PhpWord/Shared/PCLZip/pclzip.lib.php | 10562 ++++++++++-----------
 1 file changed, 5143 insertions(+), 5419 deletions(-)

diff --git a/src/PhpWord/Shared/PCLZip/pclzip.lib.php b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
index 4e2a496f..0a69f687 100644
--- a/src/PhpWord/Shared/PCLZip/pclzip.lib.php
+++ b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
@@ -25,4926 +25,2241 @@
 // $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
 // --------------------------------------------------------------------------------
 
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
 
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define( 'PCLZIP_SEPARATOR', ' ' );
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
+}
 
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//     you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
+}
 
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
+// ----- Optional static temporary directory
+//       By default temporary files are generated in the script current
+//       path.
+//       If defined :
+//       - MUST BE terminated by a '/'.
+//       - MUST be a valid, already created directory
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
+}
 
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
+// ----- Optional threshold ratio for use of temporary files
+//       Pclzip sense the size of the file to add/extract and decide to
+//       use or not temporary file. The algorythm is looking for
+//       memory_limit of PHP and apply a ratio.
+//       threshold = memory_limit * ratio.
+//       Recommended values are under 0.5. Default 0.47.
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
 
 // --------------------------------------------------------------------------------
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
 // --------------------------------------------------------------------------------
 
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
 
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+// ----- Error codes
+//   -1 : Unable to open file in binary write mode
+//   -2 : Unable to open file in binary read mode
+//   -3 : Invalid parameters
+//   -4 : File does not exist
+//   -5 : Filename is too long (max. 255)
+//   -6 : Not a valid zip file
+//   -7 : Invalid extracted file size
+//   -8 : Unable to create directory
+//   -9 : Invalid archive extension
+//  -10 : Invalid archive format
+//  -11 : Unable to delete file (unlink)
+//  -12 : Unable to rename file (rename)
+//  -13 : Invalid header checksum
+//  -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define( 'PCLZIP_OPT_CRYPT', 77018 );
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define( 'PCLZIP_CB_PRE_LIST', 78005 );
+define( 'PCLZIP_CB_POST_LIST', 78006 );
+define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+define( 'PCLZIP_CB_POST_DELETE', 78008 );
+*/
 
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//   PclZip is the class that represent a Zip archive.
+//   The public methods allow the manipulation of the archive.
+// Attributes :
+//   Attributes must not be accessed directly.
+// Methods :
+//   PclZip() : Object creator
+//   create() : Creates the Zip archive
+//   listContent() : List the content of the Zip archive
+//   extract() : Extract the content of the archive
+//   properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
     // ----- Filename of the zip file
-    var $zipname = '';
+    public $zipname = '';
 
     // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+    public $zip_fd = 0;
 
     // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
+    public $error_code = 1;
+    public $error_string = '';
 
     // ----- Current status of the magic_quotes_runtime
     // This value store the php configuration for magic_quotes
     // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+    public $magic_quotes_status;
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    // --------------------------------------------------------------------------------
+    // Function : PclZip()
+    // Description :
+    //   Creates a PclZip object and set the name of the associated Zip archive
+    //   filename.
+    //   Note that no real action is taken, if the archive does not exist it is not
+    //   created. Use create() for that.
+    // --------------------------------------------------------------------------------
+    public function __construct($p_zipname)
     {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                               "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-                        );
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                                   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-                        );
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                    ));
-        if ($v_result != 1) {
-          return 0;
+        // ----- Tests the zlib
+        if (!function_exists('gzopen')) {
+            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
         }
 
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-                                         $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG :
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+        // ----- Set the attributes
+        $this->zipname             = $p_zipname;
+        $this->zip_fd              = 0;
+        $this->magic_quotes_status = -1;
 
         // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
+        return;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   create($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two different synopsis. The first one is historical.
+    //   This method creates a Zip Archive. The Zip file is created in the
+    //   filesystem. The files and directories indicated in $p_filelist
+    //   are added in the archive. See the parameters description for the
+    //   supported format of $p_filelist.
+    //   When a directory is in the list, the directory and its content is added
+    //   in the archive.
+    //   In this synopsis, the function takes an optional variable list of
+    //   options. See bellow the supported options.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function create($p_filelist)
     {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-    // ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-                                 "Missing parameter value for option '"
-                                 .PclZipUtilOptionText($p_options_list[$i])
-                                 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-                                 "Wrong parameter value for option '"
-                                 .PclZipUtilOptionText($p_options_list[$i])
-                                 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                               "Unknown parameter '"
-                               .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
-
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                                   "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-
-    // end foreach
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-
-            $v_dirlist_nb++;
-          }
-
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Look for a stored different filename
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
+            // ----- Remove from the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    return 0;
+                }
+            }
         }
 
-        // ----- Use "in memory" zip algo
-        else {
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
+
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+
+            return 0;
         }
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                if ($v_string != '') {
+                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+                } else {
+                }
+            }
         }
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
         }
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
+        // ----- Call the create fct
+        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-                          $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-                          $p_header['size'],
-                          strlen($p_header['stored_filename']),
-                          $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-                          $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-                          $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-                          $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-                          $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-                          $p_nb_entries, $p_size,
-                          $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-        || (   (substr($p_path, 0, 1) != "/")
-            && (substr($p_path, 0, 3) != "../")
-            && (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
         // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-      // ----- Check compression method
-      if (   ($v_extract)
-          && (   ($v_header['compression'] != 8)
-              && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-                                   "Filename '".$v_header['stored_filename']."' is "
-                                   ."compressed by an unsupported compression "
-                                   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-          }
-      }
-
-      // ----- Check encrypted files
-      if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-                                   "Unsupported encryption for "
-                                   ." filename '".$v_header['stored_filename']
-                                   ."'");
-
-              return PclZip::errorCode();
-          }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-                                                $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-                && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-                                              $p_path, $p_remove_path,
-                                              $p_remove_all_path,
-                                              $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   add($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This methods add the list of files in an existing archive.
+    //   If a file with the same name already exists, it is added at the end of the
+    //   archive, the first one is still present.
+    //   If the archive does not exist, it is created.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_OPT_ADD_COMMENT :
+    //   PCLZIP_OPT_PREPEND_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function add($p_filelist)
     {
-      // ----- Return
-      return $v_result;
-    }
+        $v_result = 1;
 
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-            $p_entry['status'] = "filtered";
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-            return $v_result;
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_ADD_COMMENT => 'optional',
+                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
+
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
 
         // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']);
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-                                 "Filename '".$p_entry['filename']."' is "
-                                 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
+    // --------------------------------------------------------------------------------
+    // Function : listContent()
+    // Description :
+    //   This public method, gives the list of the files and directories, with their
+    //   properties.
+    //   The properties of each entries in the list are (used also in other functions) :
+    //     filename : Name of the file. For a create or add action it is the filename
+    //                given by the user. For an extract function it is the filename
+    //                of the extracted file.
+    //     stored_filename : Name of the file / directory stored in the archive.
+    //     size : Size of the stored file.
+    //     compressed_size : Size of the file's data compressed in the archive
+    //                       (without the headers overhead)
+    //     mtime : Last known modification date of the file (UNIX timestamp)
+    //     comment : Comment associated with the file
+    //     folder : true | false
+    //     index : index of the file in the archive
+    //     status : status of the action (depending of the action) :
+    //              Values are :
+    //                ok : OK !
+    //                filtered : the file / dir is not extracted (filtered by user)
+    //                already_a_directory : the file can not be extracted because a
+    //                                      directory with the same name already exists
+    //                write_protected : the file can not be extracted because a file
+    //                                  with the same name already exists and is
+    //                                  write protected
+    //                newer_exist : the file was not extracted because a newer file exists
+    //                path_creation_fail : the file is not extracted because the folder
+    //                                     does not exist and can not be created
+    //                write_error : the file was not extracted because there was a
+    //                              error while writing the file
+    //                read_error : the file was not extracted because there was a error
+    //                             while reading the file
+    //                invalid_header : the file was not extracted because of an archive
+    //                                 format error (bad file header)
+    //   Note that each time a method can continue operating when there
+    //   is an action error on a file, the error is only logged in the file status.
+    // Return Values :
+    //   0 on an unrecoverable failure,
+    //   The list of the files in the archive.
+    // --------------------------------------------------------------------------------
+    public function listContent()
     {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-                                 "Filename '".$p_entry['filename']."' is "
-                                 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-            }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-                                 "Filename '".$p_entry['filename']."' exists "
-                                 ."and is write protected");
-
-            return PclZip::errorCode();
-            }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-            && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-          }
-            else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-                && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-                         "Newer version of '".$p_entry['filename']."' exists "
-                        ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-              }
-            }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-              // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-
-          // ----- Look for extract in memory
-          else {
-
-
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-
-              return $v_result;
-            }
-
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-
-              return $v_result;
-            }
-
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Call the extracting fct
+        $p_list = array();
+        if (($v_result = $this->privList($p_list)) != 1) {
+            unset($p_list);
 
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
+            return (0);
         }
-      }
+
+        // ----- Return
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extract($p_path="./", $p_remove_path="")
+    //   extract([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method extract all the files / directories from the archive to the
+    //   folder indicated in $p_path.
+    //   If you want to ignore the 'root' part of path of the memorized files
+    //   you can indicate this in the optional $p_remove_path parameter.
+    //   By default, if a newer file with the same name already exists, the
+    //   file is not extracted.
+    //
+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+    //   at the end of the path value of PCLZIP_OPT_PATH.
+    // Parameters :
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 or a negative value on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function extract()
     {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
 
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Trace
+
+        // ----- Call the extracting fct
+        $p_list   = array();
+        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+        if ($v_result < 1) {
+            unset($p_list);
+
+            return (0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method is doing a partial extract of the archive.
+    //   The extracted files or folders are identified by their index in the
+    //   archive (from 0 to n).
+    //   Note that if the index identify a folder, only the folder entry is
+    //   extracted, not all the files included in the archive.
+    // Parameters :
+    //   $p_index : A single index (integer) or a string of indexes of files to
+    //              extract. The form of the string is "0,4-6,8-12" with only numbers
+    //              and '-' for range or ',' to separate ranges. No spaces or ';'
+    //              are allowed.
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+    //     not as files.
+    //     The resulting content is in a new field 'content' in the file
+    //     structure.
+    //     This option must be used alone (any other options are ignored).
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    //function extractByIndex($p_index, options...)
+    public function extractByIndex($p_index)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+                } else {
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
         // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
 
-    }
-
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-    // ----- Check the static values
-    // TBC
-    if ($p_local_header['filename'] != $p_central_header['filename']) {
-    }
-    if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-    }
-    if ($p_local_header['flag'] != $p_central_header['flag']) {
-    }
-    if ($p_local_header['compression'] != $p_central_header['compression']) {
-    }
-    if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-    }
-    if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-    }
-
-    // ----- Look for flag bit 3
-    if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
+        // ----- Trick
+        // Here I want to reuse extractByRule(), so I need to parse the $p_index
+        // with privParseOptions()
+        $v_arg_trick     = array(
+            PCLZIP_OPT_BY_INDEX,
+            $p_index
+        );
+        $v_options_trick = array();
+        $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
+            PCLZIP_OPT_BY_INDEX => 'optional'
+        ));
+        if ($v_result != 1) {
+            return 0;
+        }
+        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Call the extracting fct
+        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+            return (0);
         }
 
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
         // ----- Return
-        return PclZip::errorCode();
-      }
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   delete([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method removes files from the archive.
+    //   If no parameters are given, then all the archive is emptied.
+    // Parameters :
+    //   None or optional arguments.
+    // Options :
+    //   PCLZIP_OPT_BY_INDEX :
+    //   PCLZIP_OPT_BY_NAME :
+    //   PCLZIP_OPT_BY_EREG :
+    //   PCLZIP_OPT_BY_PREG :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the files which are still present in the archive.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function delete()
     {
+        $v_result = 1;
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-      // ----- Removed in release 2.2 see readme file
-      // The check of the file size is a little too strict.
-      // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-      // While decrypted, zip has training 0 bytes
-      if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-                           'The central dir is not at the end of the archive.'
-                           .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-      }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-        $v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
 
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Set default values
+        $v_options = array();
 
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Parse the options
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                PCLZIP_OPT_BY_NAME => 'optional',
+                PCLZIP_OPT_BY_EREG => 'optional',
+                PCLZIP_OPT_BY_PREG => 'optional',
+                PCLZIP_OPT_BY_INDEX => 'optional'
+            ));
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Call the delete fct
+        $v_list = array();
+        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            unset($v_list);
+
+            return (0);
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : deleteByIndex()
+    // Description :
+    //   ***** Deprecated *****
+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+    // --------------------------------------------------------------------------------
+    public function deleteByIndex($p_index)
+    {
+
+        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : properties()
+    // Description :
+    //   This method gives the properties of the archive.
+    //   The properties are :
+    //     nb : Number of files in the archive
+    //     comment : Comment associated with the archive file
+    //     status : not_exist, ok
+    // Parameters :
+    //   None
+    // Return Values :
+    //   0 on failure,
+    //   An array with the archive properties.
+    // --------------------------------------------------------------------------------
+    public function properties()
+    {
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            $this->privSwapBackMagicQuotes();
+
+            return (0);
+        }
+
+        // ----- Default properties
+        $v_prop            = array();
+        $v_prop['comment'] = '';
+        $v_prop['nb']      = 0;
+        $v_prop['status']  = 'not_exist';
+
+        // ----- Look if file exists
+        if (@is_file($this->zipname)) {
+            // ----- Open the zip file
+            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+                $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+                // ----- Return
+                return 0;
+            }
+
+            // ----- Read the central directory informations
+            $v_central_dir = array();
+            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return 0;
+            }
+
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Set the user attributes
+            $v_prop['comment'] = $v_central_dir['comment'];
+            $v_prop['nb']      = $v_central_dir['entries'];
+            $v_prop['status']  = 'ok';
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_prop;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : duplicate()
+    // Description :
+    //   This method creates an archive by copying the content of an other one. If
+    //   the archive already exist, it is replaced by the new one without any warning.
+    // Parameters :
+    //   $p_archive : The filename of a valid archive, or
+    //                a valid PclZip object.
+    // Return Values :
+    //   1 on success.
+    //   0 or a negative value on error (error code).
+    // --------------------------------------------------------------------------------
+    public function duplicate($p_archive)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the $p_archive is a PclZip object
+        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+
+            // ----- Duplicate the archive
+            $v_result = $this->privDuplicate($p_archive->zipname);
+
+        // ----- Look if the $p_archive is a string (so a filename)
+        } elseif (is_string($p_archive)) {
+
+            // ----- Check that $p_archive is a valid zip file
+            // TBC : Should also check the archive format
+            if (!is_file($p_archive)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+                $v_result = PCLZIP_ERR_MISSING_FILE;
+            } else {
+                // ----- Duplicate the archive
+                $v_result = $this->privDuplicate($p_archive);
+            }
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : merge()
+    // Description :
+    //   This method merge the $p_archive_to_add archive at the end of the current
+    //   one ($this).
+    //   If the archive ($this) does not exist, the merge becomes a duplicate.
+    //   If the $p_archive_to_add archive does not exist, the merge is a success.
+    // Parameters :
+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+    //                       or a PclZip object archive.
+    // Return Values :
+    //   1 on success,
+    //   0 or negative values on error (see below).
+    // --------------------------------------------------------------------------------
+    public function merge($p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Look if the $p_archive_to_add is a PclZip object
+        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($p_archive_to_add);
+
+        // ----- Look if the $p_archive_to_add is a string (so a filename)
+        } elseif (is_string($p_archive_to_add)) {
+
+            // ----- Create a temporary archive
+            $v_object_archive = new PclZip($p_archive_to_add);
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($v_object_archive);
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorCode()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorCode()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorCode());
+        } else {
+            return ($this->error_code);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorName()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorName($p_with_code = false)
+    {
+        $v_name = array(
+            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+        );
+
+        if (isset($v_name[$this->error_code])) {
+            $v_value = $v_name[$this->error_code];
+        } else {
+            $v_value = 'NoName';
+        }
+
+        if ($p_with_code) {
+            return ($v_value . ' (' . $this->error_code . ')');
+        } else {
+            return ($v_value);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorInfo()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorInfo($p_full = false)
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorString());
+        } else {
+            if ($p_full) {
+                return ($this->errorName(true) . " : " . $this->error_string);
+            } else {
+                return ($this->error_string . " [code " . $this->error_code . "]");
+            }
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+    // *****                                                        *****
+    // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFormat()
+    // Description :
+    //   This method check that the archive exists and is a valid zip archive.
+    //   Several level of check exists. (futur)
+    // Parameters :
+    //   $p_level : Level of check. Default 0.
+    //              0 : Check the first bytes (magic codes) (default value))
+    //              1 : 0 + Check the central directory (futur)
+    //              2 : 1 + Check each file header (futur)
+    // Return Values :
+    //   true on success,
+    //   false on error, the error code is set.
+    // --------------------------------------------------------------------------------
+    public function privCheckFormat($p_level = 0)
+    {
+        $v_result = true;
+
+        // ----- Reset the file system cache
+        clearstatcache();
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the file exits
+        if (!is_file($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check that the file is readeable
+        if (!is_readable($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check the magic code
+        // TBC
+
+        // ----- Check the central header
+        // TBC
+
+        // ----- Check each file header
+        // TBC
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privParseOptions()
+    // Description :
+    //   This internal methods reads the variable list of arguments ($p_options_list,
+    //   $p_size) and generate an array with the options and values ($v_result_list).
+    //   $v_requested_options contains the options that can be present and those that
+    //   must be present.
+    //   $v_requested_options is an array, with the option value as key, and 'optional',
+    //   or 'mandatory' as value.
+    // Parameters :
+    //   See above.
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- Read the options
+        $i = 0;
+        while ($i < $p_size) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$p_options_list[$i]])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return PclZip::errorCode();
             }
 
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for next option
+            switch ($p_options_list[$i]) {
+                // ----- Look for options that request a path value
+                case PCLZIP_OPT_PATH:
+                case PCLZIP_OPT_REMOVE_PATH:
+                case PCLZIP_OPT_ADD_PATH:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
-                // ----- Return
-                return $v_result;
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check the value
+                    $v_value = $p_options_list[$i + 1];
+                    if ((!is_integer($v_value)) || ($v_value < 0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value (and convert it in bytes)
+                    $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_ON:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_OFF:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+
+                        return PclZip::errorCode();
+                    }
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                        $i++;
+                    } else {
+                    }
+                    break;
+
+                // ----- Look for options that request an array of string for value
+                case PCLZIP_OPT_BY_NAME:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an EREG or PREG expression
+                case PCLZIP_OPT_BY_EREG:
+                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+                    // to PCLZIP_OPT_BY_PREG
+                case PCLZIP_OPT_BY_PREG:
+                    //case PCLZIP_OPT_CRYPT :
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_OPT_COMMENT:
+                case PCLZIP_OPT_ADD_COMMENT:
+                case PCLZIP_OPT_PREPEND_COMMENT:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an array of index
+                case PCLZIP_OPT_BY_INDEX:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_work_list = array();
+                    if (is_string($p_options_list[$i + 1])) {
+
+                        // ----- Remove spaces
+                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+
+                        // ----- Parse items
+                        $v_work_list = explode(",", $p_options_list[$i + 1]);
+                    } elseif (is_integer($p_options_list[$i + 1])) {
+                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_work_list = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Reduce the index list
+                    // each index item in the list must be a couple with a start and
+                    // an end value : [0,3], [5-5], [8-10], ...
+                    // ----- Check the format of each item
+                    $v_sort_flag  = false;
+                    $v_sort_value = 0;
+                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
+                        // ----- Explode the item
+                        $v_item_list      = explode("-", $v_work_list[$j]);
+                        $v_size_item_list = sizeof($v_item_list);
+
+                        // ----- TBC : Here we might check that each item is a
+                        // real integer ...
+
+                        // ----- Look for single value
+                        if ($v_size_item_list == 1) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
+                        } elseif ($v_size_item_list == 2) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
+                        } else {
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+
+                        // ----- Look for list sort
+                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                            $v_sort_flag = true;
+
+                            // ----- TBC : An automatic sort should be writen ...
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+                    }
+
+                    // ----- Sort the items
+                    if ($v_sort_flag) {
+                        // TBC : To Be Completed
+                    }
+
+                    // ----- Next option
+                    $i++;
+                    break;
+
+                // ----- Look for options that request no value
+                case PCLZIP_OPT_REMOVE_ALL_PATH:
+                case PCLZIP_OPT_EXTRACT_AS_STRING:
+                case PCLZIP_OPT_NO_COMPRESSION:
+                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+                case PCLZIP_OPT_REPLACE_NEWER:
+                case PCLZIP_OPT_STOP_ON_ERROR:
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                // ----- Look for options that request an octal value
+                case PCLZIP_OPT_SET_CHMOD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    $i++;
+                    break;
+
+                // ----- Look for options that request a call-back
+                case PCLZIP_CB_PRE_EXTRACT:
+                case PCLZIP_CB_POST_EXTRACT:
+                case PCLZIP_CB_PRE_ADD:
+                case PCLZIP_CB_POST_ADD:
+                    /* for futur use
+                    case PCLZIP_CB_PRE_DELETE :
+                    case PCLZIP_CB_POST_DELETE :
+                    case PCLZIP_CB_PRE_LIST :
+                    case PCLZIP_CB_POST_LIST :
+                    */
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_function_name = $p_options_list[$i + 1];
+
+                    // ----- Check that the value is a valid existing function
+                    if (!function_exists($v_function_name)) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Set the attribute
+                    $v_result_list[$p_options_list[$i]] = $v_function_name;
+                    $i++;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
             }
 
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-                                            $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
+            // ----- Next options
+            $i++;
+        }
 
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for mandatory options
+        if ($v_requested_options !== false) {
+            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                // ----- Look for mandatory option
+                if ($v_requested_options[$key] == 'mandatory') {
+                    // ----- Look if present
+                    if (!isset($v_result_list[$key])) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
 
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                }
             }
         }
 
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
+        // ----- Look for default values
+        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOptionDefaultThreshold()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privOptionDefaultThreshold(&$p_options)
+    {
+        $v_result = 1;
+
+        if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            return $v_result;
+        }
+
+        // ----- Get 'memory_limit' configuration value
+        $v_memory_limit = ini_get('memory_limit');
+        $v_memory_limit = trim($v_memory_limit);
+        $last           = strtolower(substr($v_memory_limit, -1));
+        $v_memory_limit = preg_replace('/[^0-9,.]/', '', $v_memory_limit);
+
+        if ($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1073741824;
+        }
+        if ($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1048576;
+        }
+        if ($last == 'k') {
+            $v_memory_limit = $v_memory_limit * 1024;
+        }
+
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
+
+        // ----- Sanity check : No threshold if value lower than 1M
+        if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+            unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrParseAtt()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- For each file in the list check the attributes
+        foreach ($p_file_list as $v_key => $v_value) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$v_key])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
 
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            // ----- Look for attribute
+            switch ($v_key) {
+                case PCLZIP_ATT_FILE_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['filename'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_short_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_full_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_ATT_FILE_COMMENT:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['comment'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_MTIME:
+                    if (!is_integer($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['mtime'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_CONTENT:
+                    $p_filedescr['content'] = $v_value;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Look for mandatory options
+            if ($v_requested_options !== false) {
+                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                    // ----- Look for mandatory option
+                    if ($v_requested_options[$key] == 'mandatory') {
+                        // ----- Look if present
+                        if (!isset($p_file_list[$key])) {
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                }
+            }
+
+            // end foreach
         }
 
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
 
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrExpand()
+    // Description :
+    //   This method look for each item of the list to see if its a file, a folder
+    //   or a string to be added as file. For any other type of files (link, other)
+    //   just ignore the item.
+    //   Then prepare the information that will be stored for that file.
+    //   When its a folder, expand the folder with all the files that are in that
+    //   folder (recursively).
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Create a result list
+        $v_result_list = array();
+
+        // ----- Look each entry
+        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
+
+            // ----- Get filedescr
+            $v_descr = $p_filedescr_list[$i];
+
+            // ----- Reduce the filename
+            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+            // ----- Look for real file or folder
+            if (file_exists($v_descr['filename'])) {
+                if (@is_file($v_descr['filename'])) {
+                    $v_descr['type'] = 'file';
+                } elseif (@is_dir($v_descr['filename'])) {
+                    $v_descr['type'] = 'folder';
+                } elseif (@is_link($v_descr['filename'])) {
+                    // skip
+                    continue;
+                } else {
+                    // skip
+                    continue;
+                }
+
+            // ----- Look for string added as file
+            } elseif (isset($v_descr['content'])) {
+                $v_descr['type'] = 'virtual_file';
+
+            // ----- Missing file
+            } else {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Calculate the stored filename
+            $this->privCalculateStoredFilename($v_descr, $p_options);
+
+            // ----- Add the descriptor in result list
+            $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+            // ----- Look for folder
+            if ($v_descr['type'] == 'folder') {
+                // ----- List of items in folder
+                $v_dirlist_descr = array();
+                $v_dirlist_nb    = 0;
+                if ($v_folder_handler = @opendir($v_descr['filename'])) {
+                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+                        // ----- Skip '.' and '..'
+                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                            continue;
+                        }
+
+                        // ----- Compose the full filename
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
+
+                        // ----- Look for different stored filename
+                        // Because the name of the folder was changed, the name of the
+                        // files/sub-folders also change
+                        if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                            if ($v_descr['stored_filename'] != '') {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
+                            } else {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+                            }
+                        }
+
+                        $v_dirlist_nb++;
+                    }
+
+                    @closedir($v_folder_handler);
+                } else {
+                    // TBC : unable to open folder in read mode
+                }
+
+                // ----- Expand each element of the list
+                if ($v_dirlist_nb != 0) {
+                    // ----- Expand
+                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+                        return $v_result;
+                    }
+
+                    // ----- Concat the resulting list
+                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+                } else {
+                }
+
+                // ----- Free local array
+                unset($v_dirlist_descr);
+            }
         }
 
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        // ----- Get the result list
+        $p_filedescr_list = $v_result_list;
 
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCreate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the file in write mode
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Add the list of files
+        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAdd()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Look if the archive exists or is empty
+        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+
+            // ----- Do a create
+            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+            // ----- Return
+            return $v_result;
+        }
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
 
             // ----- Return
             return $v_result;
         }
 
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    fclose($v_zip_temp_fd);
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = $v_central_dir['comment'];
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
         // ----- Close
-        $v_temp_zip->privCloseFd();
         $this->privCloseFd();
 
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
         // ----- Delete the zip file
         // TBC : I should test the result ...
         @unlink($this->zipname);
@@ -4954,544 +2269,2964 @@
         //@rename($v_zip_temp_name, $this->zipname);
         PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
+    // --------------------------------------------------------------------------------
+    // Function : privOpenFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privOpenFd($p_mode)
+    {
+        $v_result = 1;
+
+        // ----- Look if already open
+        if ($this->zip_fd != 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCloseFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privCloseFd()
+    {
+        $v_result = 1;
+
+        if ($this->zip_fd != 0) {
+            @fclose($this->zip_fd);
+        }
+        $this->zip_fd = 0;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to have PclTar
+    //   running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileList()
+    // Description :
+    // Parameters :
+    //   $p_filedescr_list : An array containing the file description
+    //                      or directory names to add in the zip
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+        $v_header = array();
+
+        // ----- Recuperate the current number of elt in list
+        $v_nb = sizeof($p_result_list);
+
+        // ----- Loop on the files
+        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
+            // ----- Format the filename
+            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+            // ----- Skip empty file names
+            // TBC : Can this be possible ? not checked in DescrParseAtt ?
+            if ($p_filedescr_list[$j]['filename'] == "") {
+                continue;
+            }
+
+            // ----- Check the filename
+            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
+
+                return PclZip::errorCode();
+            }
+
+            // ----- Look if it is a file or a dir with no all path remove option
+            // or a dir with all its path removed
+            //      if (   (is_file($p_filedescr_list[$j]['filename']))
+            //          || (   is_dir($p_filedescr_list[$j]['filename'])
+            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+                // ----- Add the file
+                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+                if ($v_result != 1) {
+                    return $v_result;
+                }
+
+                // ----- Store the file infos
+                $p_result_list[$v_nb++] = $v_header;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // TBC : Already done in the fileAtt check ... ?
+        if ($p_filename == "") {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Look for a stored different filename
+        /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        } else {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+        // ----- Set the file properties
+        clearstatcache();
+        $p_header['version']           = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag']              = 0;
+        $p_header['compression']       = 0;
+        $p_header['crc']               = 0;
+        $p_header['compressed_size']   = 0;
+        $p_header['filename_len']      = strlen($p_filename);
+        $p_header['extra_len']         = 0;
+        $p_header['disk']              = 0;
+        $p_header['internal']          = 0;
+        $p_header['offset']            = 0;
+        $p_header['filename']          = $p_filename;
+        // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['stored_filename']   = $p_filedescr['stored_filename'];
+        $p_header['extra']             = '';
+        $p_header['status']            = 'ok';
+        $p_header['index']             = -1;
+
+        // ----- Look for regular file
+        if ($p_filedescr['type'] == 'file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for regular folder
+        } elseif ($p_filedescr['type'] == 'folder') {
+            $p_header['external'] = 0x00000010;
+            $p_header['mtime']    = filemtime($p_filename);
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for virtual file
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = strlen($p_filedescr['content']);
+        }
+
+        // ----- Look for filetime
+        if (isset($p_filedescr['mtime'])) {
+            $p_header['mtime'] = $p_filedescr['mtime'];
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['mtime'] = time();
+        } else {
+            $p_header['mtime'] = filemtime($p_filename);
+        }
+
+        // ------ Look for file comment
+        if (isset($p_filedescr['comment'])) {
+            $p_header['comment_len'] = strlen($p_filedescr['comment']);
+            $p_header['comment']     = $p_filedescr['comment'];
+        } else {
+            $p_header['comment_len'] = 0;
+            $p_header['comment']     = '';
+        }
+
+        // ----- Look for pre-add callback
+        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_header['status'] = "skipped";
+                $v_result           = 1;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+            }
+        }
+
+        // ----- Look for empty stored filename
+        if ($p_header['stored_filename'] == "") {
+            $p_header['status'] = "filtered";
+        }
+
+        // ----- Check the path length
+        if (strlen($p_header['stored_filename']) > 0xFF) {
+            $p_header['status'] = 'filename_too_long';
+        }
+
+        // ----- Look if no error, or file not skipped
+        if ($p_header['status'] == 'ok') {
+
+            // ----- Look for a file
+            if ($p_filedescr['type'] == 'file') {
+                // ----- Look for using temporary file to zip
+                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                        return $v_result;
+                    }
+
+                // ----- Use "in memory" zip algo
+                } else {
+
+                    // ----- Open the source file
+                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Read the file content
+                    $v_content = @fread($v_file, $p_header['size']);
+
+                    // ----- Close the file
+                    @fclose($v_file);
+
+                    // ----- Calculate the CRC
+                    $p_header['crc'] = @crc32($v_content);
+
+                    // ----- Look for no compression
+                    if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = $p_header['size'];
+                        $p_header['compression']     = 0;
+
+                    // ----- Look for normal compression
+                    } else {
+                        // ----- Compress the content
+                        $v_content = @gzdeflate($v_content);
+
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = strlen($v_content);
+                        $p_header['compression']     = 8;
+                    }
+
+                    // ----- Call the header generation
+                    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                        @fclose($v_file);
+
+                        return $v_result;
+                    }
+
+                    // ----- Write the compressed (or not) content
+                    @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+                }
+
+            // ----- Look for a virtual file (a file from string)
+            } elseif ($p_filedescr['type'] == 'virtual_file') {
+
+                $v_content = $p_filedescr['content'];
+
+                // ----- Calculate the CRC
+                $p_header['crc'] = @crc32($v_content);
+
+                // ----- Look for no compression
+                if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = $p_header['size'];
+                    $p_header['compression']     = 0;
+
+                // ----- Look for normal compression
+                } else {
+                    // ----- Compress the content
+                    $v_content = @gzdeflate($v_content);
+
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = strlen($v_content);
+                    $p_header['compression']     = 8;
+                }
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    @fclose($v_file);
+
+                    return $v_result;
+                }
+
+                // ----- Write the compressed (or not) content
+                @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+            // ----- Look for a directory
+            } elseif ($p_filedescr['type'] == 'folder') {
+                // ----- Look for directory last '/'
+                if (@substr($p_header['stored_filename'], -1) != '/') {
+                    $p_header['stored_filename'] .= '/';
+                }
+
+                // ----- Set the file properties
+                $p_header['size']     = 0;
+                //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Look for post-add callback
+        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Ignored
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Nothing can be modified
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = PCLZIP_ERR_NO_ERROR;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Creates a compressed temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = filesize($p_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file);
+        @gzclose($v_file_compressed);
+
+        // ----- Check the minimum file size
+        if (filesize($v_gzip_temp_name) < 18) {
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the compressed attributes
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the gzip file header
+        $v_binary_data = @fread($v_file_compressed, 10);
+        $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+        // ----- Check some parameters
+        $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+        // ----- Read the gzip file footer
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
+        $v_binary_data = @fread($v_file_compressed, 8);
+        $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+        // ----- Set the attributes
+        $p_header['compression']     = ord($v_data_header['cm']);
+        //$p_header['mtime'] = $v_data_header['mtime'];
+        $p_header['crc']             = $v_data_footer['crc'];
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Add the compressed data
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        fseek($v_file_compressed, 10);
+        $v_size = $p_header['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file_compressed, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Unlink the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCalculateStoredFilename()
+    // Description :
+    //   Based on file descriptor properties and global options, this method
+    //   calculate the filename that will be stored in the archive.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variables
+        $p_filename = $p_filedescr['filename'];
+        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+        } else {
+            $p_add_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+        } else {
+            $p_remove_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        } else {
+            $p_remove_all_dir = 0;
+        }
+
+        // ----- Look for full name change
+        if (isset($p_filedescr['new_full_name'])) {
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+
+        // ----- Look for path and/or short name change
+        } else {
+
+            // ----- Look for short name change
+            // Its when we cahnge just the filename but not the path
+            if (isset($p_filedescr['new_short_name'])) {
+                $v_path_info = pathinfo($p_filename);
+                $v_dir       = '';
+                if ($v_path_info['dirname'] != '') {
+                    $v_dir = $v_path_info['dirname'] . '/';
+                }
+                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
+            } else {
+                // ----- Calculate the stored filename
+                $v_stored_filename = $p_filename;
+            }
+
+            // ----- Look for all path to remove
+            if ($p_remove_all_dir) {
+                $v_stored_filename = basename($p_filename);
+
+            // ----- Look for partial path remove
+            } elseif ($p_remove_dir != "") {
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= "/";
+                }
+
+                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+
+                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+                        $p_remove_dir = "./" . $p_remove_dir;
+                    }
+                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+                        $p_remove_dir = substr($p_remove_dir, 2);
+                    }
+                }
+
+                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+                if ($v_compare > 0) {
+                    if ($v_compare == 2) {
+                        $v_stored_filename = "";
+                    } else {
+                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+                    }
+                }
+            }
+
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+            // ----- Look for path to add
+            if ($p_add_dir != "") {
+                if (substr($p_add_dir, -1) == "/") {
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
+                }
+            }
+        }
+
+        // ----- Filename (reduce the path of stored name)
+        $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
+        $p_filedescr['stored_filename'] = $v_stored_filename;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Store the offset position of the file
+        $p_header['offset'] = ftell($this->zip_fd);
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+        // ----- Write the first 148 bytes of the header in the archive
+        fputs($this->zip_fd, $v_binary_data, 30);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // TBC
+        //for (reset($p_header); $key = key($p_header); next($p_header)) {
+        //}
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+        // ----- Write the 42 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 46);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $v_result = 1;
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+        // ----- Write the 22 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 22);
+
+        // ----- Write the variable fields
+        if (strlen($p_comment) != 0) {
+            fputs($this->zip_fd, $p_comment, strlen($p_comment));
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privList()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privList(&$p_list)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of Central Dir
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+            $v_header['index'] = $i;
+
+            // ----- Get the only interesting attributes
+            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+            unset($v_header);
+        }
+
+        // ----- Close the zip file
         $this->privCloseFd();
 
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privConvertHeader2FileInfo()
+    // Description :
+    //   This function takes the file informations from the central directory
+    //   entries and extract the interesting parameters that will be given back.
+    //   The resulting file infos are set in the array $p_info
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
+    //                           extracted in the filesystem (extract).
+    //     $p_info['stored_filename'] : Stored filename in the archive.
+    //     $p_info['size'] = Size of the file.
+    //     $p_info['compressed_size'] = Compressed size of the file.
+    //     $p_info['mtime'] = Last modification date of the file.
+    //     $p_info['comment'] = Comment associated with the file.
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //     $p_info['status'] = status of the action on the file.
+    //     $p_info['crc'] = CRC of the file content.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privConvertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result = 1;
+
+        // ----- Get the interesting attributes
+        $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
+        $p_info['filename']        = $v_temp_path;
+        $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
+        $p_info['stored_filename'] = $v_temp_path;
+        $p_info['size']            = $p_header['size'];
+        $p_info['compressed_size'] = $p_header['compressed_size'];
+        $p_info['mtime']           = $p_header['mtime'];
+        $p_info['comment']         = $p_header['comment'];
+        $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
+        $p_info['index']           = $p_header['index'];
+        $p_info['status']          = $p_header['status'];
+        $p_info['crc']             = $p_header['crc'];
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractByRule()
+    // Description :
+    //   Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //   $p_file_list : An array where will be placed the properties of each
+    //                  extracted file
+    //   $p_path : Path to add while writing the extracted files
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                    extracted files. If the path does not match the file path,
+    //                    the file is extracted with its memorized path.
+    //                    $p_remove_path does not apply to 'list' mode.
+    //                    $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //   1 on success,0 or less on error (see error code list)
+    // --------------------------------------------------------------------------------
+    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check the path
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+            $p_path = "./" . $p_path;
+        }
+
+        // ----- Reduce the path last (and duplicated) '/'
+        if (($p_path != "./") && ($p_path != "/")) {
+            // ----- Look for the path end '/'
+            while (substr($p_path, -1) == "/") {
+                $p_path = substr($p_path, 0, strlen($p_path) - 1);
+            }
+        }
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+
+        // ----- Read each entry
+        $j_start = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read next Central dir entry
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd, $v_pos_entry)) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_header = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header['index'] = $i;
+
+            // ----- Store the file position
+            $v_pos_entry = ftell($this->zip_fd);
+
+            // ----- Look for the specific extract rules
+            $v_extract = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_extract = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_extract = true;
+                    }
+                }
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+            $v_extract = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+                    $v_extract = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_extract = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+
+            // ----- Look for no rule, which means extract all the archive
+            } else {
+                $v_extract = true;
+            }
+
+            // ----- Check compression method
+            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+                $v_header['status'] = 'unsupported_compression';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Check encrypted files
+            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+                $v_header['status'] = 'unsupported_encryption';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Look for real extraction
+            if (($v_extract) && ($v_header['status'] != 'ok')) {
+                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+                if ($v_result != 1) {
+                    $this->privCloseFd();
+                    $this->privSwapBackMagicQuotes();
+
+                    return $v_result;
+                }
+
+                $v_extract = false;
+            }
+
+            // ----- Look for real extraction
+            if ($v_extract) {
+
+                // ----- Go to the file position
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Look for extraction as string
+                if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+                    $v_string = '';
+
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Set the file content
+                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+                    // ----- Next extracted file
+                    $v_nb_extracted++;
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for extraction in standard output
+                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    // ----- Extracting the file in standard output
+                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for normal extraction
+                } else {
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //
+    // 1 : ... ?
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+    // --------------------------------------------------------------------------------
+    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for all path to remove
+        if ($p_remove_all_path == true) {
+            // ----- Look for folder entry that not need to be extracted
+            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
+
+                $p_entry['status'] = "filtered";
+
+                return $v_result;
+            }
+
+            // ----- Get the basename of the path
+            $p_entry['filename'] = basename($p_entry['filename']);
+
+        // ----- Look for path to remove
+        } elseif ($p_remove_path != "") {
+            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+
+                // ----- Change the file status
+                $p_entry['status'] = "filtered";
+
+                // ----- Return
+                return $v_result;
+            }
+
+            $p_remove_path_size = strlen($p_remove_path);
+            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+
+                // ----- Remove the path
+                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+            }
+        }
+
+        // ----- Add the path
+        if ($p_path != '') {
+            $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
+        }
+
+        // ----- Check a base_dir_restriction
+        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+            if ($v_inclusion == 0) {
+
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Look for specific actions while the file exist
+            if (file_exists($p_entry['filename'])) {
+
+                // ----- Look if file is a directory
+                if (is_dir($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "already_a_directory";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if file is write protected
+                } elseif (!is_writeable($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "write_protected";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if the extracted file is older
+                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+                    // ----- Change the file status
+                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+                    } else {
+                        $p_entry['status'] = "newer_exist";
+
+                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                        // For historical reason first PclZip implementation does not stop
+                        // when this kind of error occurs.
+                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                } else {
+                }
+
+            // ----- Check the directory availability and create it if necessary
+            } else {
+                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                    $v_dir_to_check = $p_entry['filename'];
+                } elseif (!strstr($p_entry['filename'], "/")) {
+                    $v_dir_to_check = "";
+                } else {
+                    $v_dir_to_check = dirname($p_entry['filename']);
+                }
+
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "path_creation_fail";
+
+                    // ----- Return
+                    //return $v_result;
+                    $v_result = 1;
+                }
+            }
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Opening destination file
+                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                        // ----- Change the file status
+                        $p_entry['status'] = "write_error";
+
+                        // ----- Return
+                        return $v_result;
+                    }
+
+                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+                    $v_size = $p_entry['compressed_size'];
+                    while ($v_size != 0) {
+                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+                        $v_buffer    = @fread($this->zip_fd, $v_read_size);
+                        /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
+                        $v_size -= $v_read_size;
+                    }
+
+                    // ----- Closing the destination file
+                    fclose($v_dest_file);
+
+                    // ----- Change the file mtime
+                    touch($p_entry['filename'], $p_entry['mtime']);
+
+                } else {
+                    // ----- TBC
+                    // Need to be finished
+                    if (($p_entry['flag'] & 1) == 1) {
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Look for using temporary file to unzip
+                    if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+                        $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+                        if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                            return $v_result;
+                        }
+
+                    // ----- Look for extract in memory
+                    } else {
+
+                        // ----- Read the compressed file in a buffer (one shot)
+                        $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                        // ----- Decompress the file
+                        $v_file_content = @gzinflate($v_buffer);
+                        unset($v_buffer);
+                        if ($v_file_content === false) {
+
+                            // ----- Change the file status
+                            // TBC
+                            $p_entry['status'] = "error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Opening destination file
+                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                            // ----- Change the file status
+                            $p_entry['status'] = "write_error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Write the uncompressed data
+                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+                        unset($v_file_content);
+
+                        // ----- Closing the destination file
+                        @fclose($v_dest_file);
+
+                    }
+
+                    // ----- Change the file mtime
+                    @touch($p_entry['filename'], $p_entry['mtime']);
+                }
+
+                // ----- Look for chmod option
+                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+                    // ----- Change the mode of the file
+                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+                }
+
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Creates a temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Write gz file format header
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        @fwrite($v_dest_file, $v_binary_data, 10);
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Write gz file format footer
+        $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+        @fwrite($v_dest_file, $v_binary_data, 8);
+
+        // ----- Close the temporary file
+        @fclose($v_dest_file);
+
+        // ----- Opening destination file
+        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            $p_entry['status'] = "write_error";
+
+            return $v_result;
+        }
+
+        // ----- Open the temporary gz file
+        if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+            @fclose($v_dest_file);
+            $p_entry['status'] = "read_error";
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($v_src_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+        @fclose($v_dest_file);
+        @gzclose($v_src_file);
+
+        // ----- Delete the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileInOutput()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileInOutput(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Trace
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+                    // ----- Read the file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Send the file to the output
+                    echo $v_buffer;
+                    unset($v_buffer);
+                } else {
+
+                    // ----- Read the compressed file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    $v_file_content = gzinflate($v_buffer);
+                    unset($v_buffer);
+
+                    // ----- Send the file to the output
+                    echo $v_file_content;
+                    unset($v_file_content);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        $v_header = array();
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                //      if ($p_entry['compressed_size'] == $p_entry['size'])
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Reading the file
+                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+                } else {
+
+                    // ----- Reading the file
+                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    if (($p_string = @gzinflate($v_data)) === false) {
+                        // TBC
+                    }
+                }
+
+                // ----- Trace
+            } else {
+                // TBC : error : can not extract a folder in a string
+            }
+
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Swap the content to header
+            $v_local_header['content'] = $p_string;
+            $p_string                  = '';
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Swap back the content to header
+            $p_string = $v_local_header['content'];
+            unset($v_local_header['content']);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x04034b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 26);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 26) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+        // ----- Get filename
+        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+        // ----- Get extra_fields
+        if ($v_data['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Extract properties
+        $p_header['version_extracted'] = $v_data['version'];
+        $p_header['compression']       = $v_data['compression'];
+        $p_header['size']              = $v_data['size'];
+        $p_header['compressed_size']   = $v_data['compressed_size'];
+        $p_header['crc']               = $v_data['crc'];
+        $p_header['flag']              = $v_data['flag'];
+        $p_header['filename_len']      = $v_data['filename_len'];
+
+        // ----- Recuperate date in UNIX format
+        $p_header['mdate'] = $v_data['mdate'];
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // TBC
+        //for (reset($v_data); $key = key($v_data); next($v_data)) {
+        //}
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set the status field
+        $p_header['status'] = "ok";
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x02014b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 42);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 42) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+        // ----- Get filename
+        if ($p_header['filename_len'] != 0) {
+            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        } else {
+            $p_header['filename'] = '';
+        }
+
+        // ----- Get extra
+        if ($p_header['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Get comment
+        if ($p_header['comment_len'] != 0) {
+            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+        } else {
+            $p_header['comment'] = '';
+        }
+
+        // ----- Extract properties
+
+        // ----- Recuperate date in UNIX format
+        //if ($p_header['mdate'] && $p_header['mtime'])
+        // TBC : bug : this was ignoring time with 0/0/0
+        if (1) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set default status to ok
+        $p_header['status'] = 'ok';
+
+        // ----- Look if it is a directory
+        if (substr($p_header['filename'], -1) == '/') {
+            //$p_header['external'] = 0x41FF0010;
+            $p_header['external'] = 0x00000010;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFileHeaders()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success,
+    //   0 on error;
+    // --------------------------------------------------------------------------------
+    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+    {
+        $v_result = 1;
+
+        // ----- Check the static values
+        // TBC
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
+        }
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        }
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
+        }
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
+        }
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        }
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        }
+
+        // ----- Look for flag bit 3
+        if (($p_local_header['flag'] & 8) == 8) {
+            $p_local_header['size']            = $p_central_header['size'];
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+            $p_local_header['crc']             = $p_central_header['crc'];
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadEndCentralDir(&$p_central_dir)
+    {
+        $v_result = 1;
+
+        // ----- Go to the end of the zip file
+        $v_size = filesize($this->zipname);
+        @fseek($this->zip_fd, $v_size);
+        if (@ftell($this->zip_fd) != $v_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- First try : look if this is an archive with no commentaries (most of the time)
+        // in this case the end of central dir is at 22 bytes of the file end
+        $v_found = 0;
+        if ($v_size > 26) {
+            @fseek($this->zip_fd, $v_size - 22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read for bytes
+            $v_binary_data = @fread($this->zip_fd, 4);
+            $v_data        = @unpack('Vid', $v_binary_data);
+
+            // ----- Check signature
+            if ($v_data['id'] == 0x06054b50) {
+                $v_found = 1;
+            }
+
+            $v_pos = ftell($this->zip_fd);
+        }
+
+        // ----- Go back to the maximum possible size of the Central Dir End Record
+        if (!$v_found) {
+            $v_maximum_size = 65557; // 0xFFFF + 22;
+            if ($v_maximum_size > $v_size) {
+                $v_maximum_size = $v_size;
+            }
+            @fseek($this->zip_fd, $v_size - $v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read byte per byte in order to find the signature
+            $v_pos   = ftell($this->zip_fd);
+            $v_bytes = 0x00000000;
+            while ($v_pos < $v_size) {
+                // ----- Read a byte
+                $v_byte = @fread($this->zip_fd, 1);
+
+                // -----  Add the byte
+                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+                // ----- Compare the bytes
+                if ($v_bytes == 0x504b0506) {
+                    $v_pos++;
+                    break;
+                }
+
+                $v_pos++;
+            }
+
+            // ----- Look if not found end of central dir
+            if ($v_pos == $v_size) {
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Read the first 18 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 18);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 18) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+        // ----- Check the global size
+        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+            // ----- Removed in release 2.2 see readme file
+            // The check of the file size is a little too strict.
+            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+            // While decrypted, zip has training 0 bytes
+            if (0) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Get comment
+        if ($v_data['comment_size'] != 0) {
+            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+        } else {
+            $p_central_dir['comment'] = '';
+        }
+
+        $p_central_dir['entries']      = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset']       = $v_data['offset'];
+        $p_central_dir['size']         = $v_data['size'];
+        $p_central_dir['disk']         = $v_data['disk'];
+        $p_central_dir['disk_start']   = $v_data['disk_start'];
+
+        // TBC
+        //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+        //}
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDeleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDeleteByRule(&$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Scan all the files
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_pos_entry)) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        $v_header_list = array();
+        $j_start       = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read the file header
+            $v_header_list[$v_nb_extracted] = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header_list[$v_nb_extracted]['index'] = $i;
+
+            // ----- Look for the specific extract rules
+            $v_found = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_found = true;
+                    }
+                }
+
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+            $v_found = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                    $v_found = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_found = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+            } else {
+                $v_found = true;
+            }
+
+            // ----- Look for deletion
+            if ($v_found) {
+                unset($v_header_list[$v_nb_extracted]);
+            } else {
+                $v_nb_extracted++;
+            }
+        }
+
+        // ----- Look if something need to be deleted
+        if ($v_nb_extracted > 0) {
+
+            // ----- Creates a temporay file
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+            // ----- Creates a temporary zip archive
+            $v_temp_zip = new PclZip($v_zip_temp_name);
+
+            // ----- Open the temporary zip file in write mode
+            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+                $this->privCloseFd();
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Look which file need to be kept
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+
+                // ----- Calculate the position of the header
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Read the file header
+                $v_local_header = array();
+                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Check that local file header is same as central file header
+                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+                    // TBC
+                }
+                unset($v_local_header);
+
+                // ----- Write the file header
+                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Read/write the data block
+                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+            }
+
+            // ----- Store the offset of the central dir
+            $v_offset = @ftell($v_temp_zip->zip_fd);
+
+            // ----- Re-Create the Central Dir files header
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+                // ----- Create the file header
+                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Transform the header to a 'usable' info
+                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            }
+
+            // ----- Zip file comment
+            $v_comment = '';
+            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            }
+
+            // ----- Calculate the size of the central header
+            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
+
+            // ----- Create the central dir footer
+            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+                // ----- Reset the file list
+                unset($v_header_list);
+                $v_temp_zip->privCloseFd();
+                $this->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Close
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+
+            // ----- Delete the zip file
+            // TBC : I should test the result ...
+            @unlink($this->zipname);
+
+            // ----- Rename the temporary file
+            // TBC : I should test the result ...
+            //@rename($v_zip_temp_name, $this->zipname);
+            PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+            // ----- Destroy the temporary archive
+            unset($v_temp_zip);
+
+        // ----- Remove every files : reset the file
+        } elseif ($v_central_dir['entries'] != 0) {
+            $this->privCloseFd();
+
+            if (($v_result = $this->privOpenFd('wb')) != 1) {
+                return $v_result;
+            }
+
+            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+                return $v_result;
+            }
+
+            $this->privCloseFd();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDirCheck()
+    // Description :
+    //   Check if a directory exists, if not it creates it and all the parents directory
+    //   which may be useful.
+    // Parameters :
+    //   $p_dir : Directory path to check.
+    // Return Values :
+    //    1 : OK
+    //   -1 : Unable to create directory
+    // --------------------------------------------------------------------------------
+    public function privDirCheck($p_dir, $p_is_dir = false)
+    {
+        $v_result = 1;
+
+        // ----- Remove the final '/'
+        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
+        }
+
+        // ----- Check the directory availability
+        if ((is_dir($p_dir)) || ($p_dir == "")) {
+            return 1;
+        }
+
+        // ----- Extract parent directory
+        $p_parent_dir = dirname($p_dir);
+
+        // ----- Just a check
+        if ($p_parent_dir != $p_dir) {
+            // ----- Look for parent directory
+            if ($p_parent_dir != "") {
+                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Create the directory
+        if (!@mkdir($p_dir, 0777)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privMerge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privMerge(&$p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Look if the archive_to_add exists
+        if (!is_file($p_archive_to_add->zipname)) {
+
+            // ----- Nothing to merge, so merge is a success
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look if the archive exists
+        if (!is_file($this->zipname)) {
+
+            // ----- Do a duplicate
+            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Open the archive_to_add file
+        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir_to_add = array();
+        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($p_archive_to_add->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the files from the archive_to_add into the temporary file
+        $v_size = $v_central_dir_to_add['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_zip_temp_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the block of file headers from the archive_to_add
+        $v_size = $v_central_dir_to_add['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Merge the file comments
+        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
+
+        // ----- Calculate the size of the (new) central header
+        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive fd
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+            @fclose($v_zip_temp_fd);
+            $this->zip_fd = null;
+
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+        $p_archive_to_add->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDuplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDuplicate($p_archive_filename)
+    {
+        $v_result = 1;
+
+        // ----- Look if the $p_archive_filename exists
+        if (!is_file($p_archive_filename)) {
+
+            // ----- Nothing to duplicate, so duplicate is a success.
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
         if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
+            // ----- Return
+            return $v_result;
         }
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+            $this->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
         }
 
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = filesize($p_archive_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close
         $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorLog()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorLog($p_error_code = 0, $p_error_string = '')
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclError($p_error_code, $p_error_string);
+        } else {
+            $this->error_code   = $p_error_code;
+            $this->error_string = $p_error_string;
         }
-      }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorReset()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorReset()
     {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclErrorReset();
+        } else {
+            $this->error_code   = 0;
+            $this->error_string = '';
+        }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privDisableMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDisableMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if already done
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Get and memorize the magic_quote value
+        $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+        // ----- Disable magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime(0);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privSwapBackMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privSwapBackMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if something to do
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Swap back magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime($this->magic_quotes_status);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
+}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+// End of class
+// --------------------------------------------------------------------------------
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-        || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-    }
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-    }
-
-    // ----- Get and memorize the magic_quote value
-    $this->magic_quotes_status = @get_magic_quotes_runtime();
-
-    // ----- Disable magic_quotes
-    if ($this->magic_quotes_status == 1) {
-      @set_magic_quotes_runtime(0);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-        || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-    }
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-    }
-
-    // ----- Swap back magic_quotes
-    if ($this->magic_quotes_status == 1) {
-      @set_magic_quotes_runtime($this->magic_quotes_status);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
     $v_result = "";
 
     // ----- Look for not empty path
     if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
+        // ----- Explode path by directory names
+        $v_list = explode("/", $p_dir);
 
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-          $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-          // ----- First '/' i.e. root slash
-          if ($i == 0) {
-            $v_result = "/".$v_result;
-            if ($v_skip > 0) {
-                // ----- It is an invalid path, so the path is not modified
-                // TBC
-                $v_result = $p_dir;
-                $v_skip = 0;
+        // ----- Study directories from last to first
+        $v_skip = 0;
+        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+            // ----- Look for current path
+            if ($v_list[$i] == ".") {
+                // ----- Ignore this directory
+                // Should be the first $i=0, but no check is done
+            } elseif ($v_list[$i] == "..") {
+                $v_skip++;
+            } elseif ($v_list[$i] == "") {
+                // ----- First '/' i.e. root slash
+                if ($i == 0) {
+                    $v_result = "/" . $v_result;
+                    if ($v_skip > 0) {
+                        // ----- It is an invalid path, so the path is not modified
+                        // TBC
+                        $v_result = $p_dir;
+                        $v_skip   = 0;
+                    }
+
+                // ----- Last '/' i.e. indicates a directory
+                } elseif ($i == (sizeof($v_list) - 1)) {
+                    $v_result = $v_list[$i];
+
+                // ----- Double '/' inside the path
+                } else {
+                    // ----- Ignore only the double '//' in path,
+                    // but not the first and last '/'
+                }
+            } else {
+                // ----- Look for item to skip
+                if ($v_skip > 0) {
+                    $v_skip--;
+                } else {
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
+                }
             }
-          }
-          // ----- Last '/' i.e. indicates a directory
-          else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-          }
-          // ----- Double '/' inside the path
-          else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-          }
         }
-        else {
-          // ----- Look for item to skip
-          if ($v_skip > 0) {
-            $v_skip--;
-          }
-          else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-          }
-        }
-      }
 
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
+        // ----- Look for skip
+        if ($v_skip > 0) {
+            while ($v_skip > 0) {
+                $v_result = '../' . $v_result;
+                $v_skip--;
+            }
         }
-      }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//   This function indicates if the path $p_path is under the $p_dir tree. Or,
+//   said in an other way, if the file or sub-dir $p_path is inside the dir
+//   $p_dir.
+//   The function indicates also if the path is exactly the same as the dir.
+//   This function supports path with duplicated '/' like '//', but does not
+//   support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//   0 if $p_path is not inside directory $p_dir
+//   1 if $p_path is inside directory $p_dir
+//   2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
     $v_result = 1;
 
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
+    $v_list_dir       = explode("/", $p_dir);
+    $v_list_dir_size  = sizeof($v_list_dir);
+    $v_list_path      = explode("/", $p_path);
     $v_list_path_size = sizeof($v_list_path);
 
     // ----- Study directories paths
@@ -5499,193 +5234,182 @@
     $j = 0;
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
 
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+        if ($v_list_path[$j] == '') {
+            $j++;
+            continue;
+        }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+            $v_result = 0;
+        }
+
+        // ----- Next items
         $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
         $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
     }
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+        // ----- Skip all the empty items
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+            $i++;
+        }
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+            // ----- There are exactly the same
+            $v_result = 2;
+        } elseif ($i < $v_list_dir_size) {
+            // ----- The path is shorter than the dir
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//   $p_mode : read/write compression mode
+//             0 : src & dest normal
+//             1 : src gzip, dest normal
+//             2 : src normal, dest gzip
+//             3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
     $v_result = 1;
 
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
+    if ($p_mode == 0) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 1) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 2) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 3) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//   This function tries to do a simple rename() function. If it fails, it
+//   tries to copy the $p_src file in a new $p_dest file and then unlink the
+//   first one.
+// Parameters :
+//   $p_src : Old filename
+//   $p_dest : New filename
+// Return Values :
+//   1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
     $v_result = 1;
 
     // ----- Try to rename the files
     if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//   Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//   $p_option : the option value.
+// Return Values :
+//   The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
         $v_prefix = substr($v_key, 0, 10);
-        if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-            && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
+        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+            return $v_key;
         }
     }
 
     $v_result = 'Unknown';
 
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//   Translate windows path by replacing '\' by '/' and optionally removing
+//   drive letter.
+// Parameters :
+//   $p_path : path to translate.
+//   $p_remove_disk_letter : true | false
+// Return Values :
+//   The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
     if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
+        // ----- Look for potential disk letter
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+            $p_path = substr($p_path, $v_position + 1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
     }
+
     return $p_path;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------

From b72ffbdc988373101d8c78ae5d6a462477498c9b Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 9 Jul 2017 22:21:52 +0200
Subject: [PATCH 079/370] enable php 7.1 build

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1a36b21b..43c4b205 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,13 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
 ##    - hhvm
 
 matrix:
     allow_failures:
         - php: 7.0
+        - php: 7.1
 ##        - php: hhvm
 
 env:

From be6b6008e85f4036114f3fc63202df4a07b8f93a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 11 Jul 2017 01:56:20 +0200
Subject: [PATCH 080/370] add reader/writer for additional values in
 settings.xml (#1098)

* add reader/writer for settings.xml
The following values can currently be set/read
- w:trackRevisions
- w:doNotTrackMoves
- w:doNotTrackFormatting
- w:proofState
- w:zoom
- w:decimalSymbol
- w:revisionView
---
 docs/general.rst                              |  80 ++++++--
 src/PhpWord/ComplexType/ProofState.php        | 104 ++++++++++
 src/PhpWord/ComplexType/TrackChangesView.php  | 166 +++++++++++++++
 src/PhpWord/Metadata/Settings.php             | 192 +++++++++++++++++-
 src/PhpWord/Reader/Word2007/Settings.php      |  62 +++++-
 src/PhpWord/SimpleType/Zoom.php               |  42 ++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  74 ++++++-
 tests/PhpWord/Metadata/SettingsTest.php       |  69 +++++++
 tests/PhpWord/Reader/MsDocTest.php            |  59 ++++++
 .../Writer/Word2007/Part/SettingsTest.php     | 125 +++++++++++-
 tests/PhpWord/_files/documents/reader.doc     | Bin 0 -> 49664 bytes
 tests/PhpWord/_files/documents/reader.docx    | Bin 74121 -> 105546 bytes
 12 files changed, 935 insertions(+), 38 deletions(-)
 create mode 100644 src/PhpWord/ComplexType/ProofState.php
 create mode 100644 src/PhpWord/ComplexType/TrackChangesView.php
 create mode 100644 src/PhpWord/SimpleType/Zoom.php
 create mode 100644 tests/PhpWord/Reader/MsDocTest.php
 create mode 100644 tests/PhpWord/_files/documents/reader.doc

diff --git a/docs/general.rst b/docs/general.rst
index 8e347089..87fecb77 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -80,8 +80,8 @@ folder <https://github.com/PHPOffice/PHPWord/tree/master/samples/>`__.
     /* Note: we skip RTF, because it's not XML-based and requires a different example. */
     /* Note: we skip PDF, because "HTML-to-PDF" approach is used to create PDF documents. */
 
-Settings
---------
+PHPWord Settings
+----------------
 
 The ``PhpOffice\PhpWord\Settings`` class provides some options that will
 affect the behavior of PHPWord. Below are the options.
@@ -130,6 +130,35 @@ To turn it on set ``outputEscapingEnabled`` option to ``true`` in your PHPWord c
 
     \PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(true);
 
+Default font
+~~~~~~~~~~~~
+
+By default, every text appears in Arial 10 point. You can alter the
+default font by using the following two functions:
+
+.. code-block:: php
+
+    $phpWord->setDefaultFontName('Times New Roman');
+    $phpWord->setDefaultFontSize(12);
+
+Document settings
+-----------------
+Settings for the generated document can be set using ``$phpWord->getSettings()``
+
+Magnification Setting
+~~~~~~~~~~~~~~~~~~~~~
+The default zoom value is 100 percent. This can be changed either to another percentage
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setZoom(75);
+
+Or to predefined values ``fullPage``, ``bestFit``, ``textFit``
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setZoom(Zoom::BEST_FIT);
+
 Spelling and grammatical checks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -141,16 +170,36 @@ For big documents this can slow down the opening of the document. You can hide t
     $phpWord->getSettings()->setHideGrammaticalErrors(true);
     $phpWord->getSettings()->setHideSpellingErrors(true);
 
-Default font
-~~~~~~~~~~~~
-
-By default, every text appears in Arial 10 point. You can alter the
-default font by using the following two functions:
+You can also specify the status of the spell and grammar checks, marking spelling or grammar as dirty will force a re-check when opening the document.
 
 .. code-block:: php
 
-    $phpWord->setDefaultFontName('Times New Roman');
-    $phpWord->setDefaultFontSize(12);
+    $proofState = new ProofState();
+    $proofState->setGrammar(ProofState::CLEAN);
+    $proofState->setSpelling(ProofState::DIRTY);
+
+    $phpWord->getSettings()->setProofState(proofState);
+
+Track Revisions
+~~~~~~~~~~~~~~~
+Track changes can be activated using ``setTrackRevisions``, you can furture specify 
+
+-  Not to use move syntax, instead moved items will be seen as deleted in one place and added in another
+-  Not track formatting revisions
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setTrackRevisions(true);
+    $phpWord->getSettings()->setDoNotTrackMoves(true);
+    $phpWord->getSettings()->setDoNotTrackFormatting(true);
+
+Decimal Symbol
+~~~~~~~~~~~~~~
+The default symbol to represent a decimal figure is the ``.`` in english. In french you might want to change it to ``,`` for instance.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setDecimalSymbol(',');
 
 Document information
 --------------------
@@ -194,16 +243,3 @@ points to twips.
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Converter::inchToTwip(.5));
     // 2 cm right margin
     $sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(2));
-
-Language
---------
-
-You can hide spelling errors:
-
-.. code-block:: php
-    \PhpOffice\PhpWord\Settings::setSpellingErrorsHidden(true);
-
-And hide grammatical errors:
-
-.. code-block:: php
-    \PhpOffice\PhpWord\Settings::setGrammaticalErrorsHidden(true);
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
new file mode 100644
index 00000000..e5ac9c20
--- /dev/null
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\ComplexType;
+
+/**
+ * Spelling and Grammatical Checking State
+ *
+ * @see http://www.datypic.com/sc/ooxml/e-w_proofState-1.html
+ */
+final class ProofState
+{
+
+    /**
+     * Check Completed
+     */
+    const CLEAN = 'clean';
+
+    /**
+     * Check Not Completed
+     */
+    const DIRTY = 'dirty';
+
+    /**
+     * Spell Checking State
+     *
+     * @var string
+     */
+    private $spelling;
+
+    /**
+     * Grammatical Checking State
+     *
+     * @var string
+     */
+    private $grammar;
+
+    /**
+     * Set the Spell Checking State (dirty or clean)
+     *
+     * @param string $spelling            
+     * @throws \InvalidArgumentException
+     * @return self
+     */
+    public function setSpelling($spelling)
+    {
+        if ($spelling == self::CLEAN || $spelling == self::DIRTY) {
+            $this->spelling = $spelling;
+        } else {
+            throw new \InvalidArgumentException("Invalid value, dirty or clean possible");
+        }
+        return $this;
+    }
+
+    /**
+     * Get the Spell Checking State
+     *
+     * @return string
+     */
+    public function getSpelling()
+    {
+        return $this->spelling;
+    }
+
+    /**
+     * Set the Grammatical Checking State (dirty or clean)
+     *
+     * @param string $grammar            
+     * @throws \InvalidArgumentException
+     * @return self
+     */
+    public function setGrammar($grammar)
+    {
+        if ($grammar == self::CLEAN || $grammar == self::DIRTY) {
+            $this->grammar = $grammar;
+        } else {
+            throw new \InvalidArgumentException("Invalid value, dirty or clean possible");
+        }
+        return $this;
+    }
+
+    /**
+     * Get the Grammatical Checking State
+     *
+     * @return string
+     */
+    public function getGrammar()
+    {
+        return $this->grammar;
+    }
+}
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
new file mode 100644
index 00000000..ea26bc3c
--- /dev/null
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\ComplexType;
+
+/**
+ * Visibility of Annotation Types
+ *
+ * @see http://www.datypic.com/sc/ooxml/e-w_revisionView-1.html
+ */
+final class TrackChangesView
+{
+
+    /**
+     * Display Visual Indicator Of Markup Area
+     *
+     * @var boolean
+     */
+    private $markup;
+
+    /**
+     * Display Comments
+     *
+     * @var boolean
+     */
+    private $comments;
+
+    /**
+     * Display Content Revisions
+     *
+     * @var boolean
+     */
+    private $insDel;
+
+    /**
+     * Display Formatting Revisions
+     *
+     * @var boolean
+     */
+    private $formatting;
+
+    /**
+     * Display Ink Annotations
+     *
+     * @var boolean
+     */
+    private $inkAnnotations;
+
+    /**
+     * Get Display Visual Indicator Of Markup Area
+     *
+     * @return boolean True if markup is shown
+     */
+    public function hasMarkup()
+    {
+        return $this->markup;
+    }
+
+    /**
+     * Set Display Visual Indicator Of Markup Area
+     *
+     * @param boolean $markup
+     *            Set to true to show markup
+     */
+    public function setMarkup($markup)
+    {
+        $this->markup = $markup === null ? true : $markup;
+    }
+
+    /**
+     * Get Display Comments
+     *
+     * @return boolean True if comments are shown
+     */
+    public function hasComments()
+    {
+        return $this->comments;
+    }
+
+    /**
+     * Set Display Comments
+     *
+     * @param boolean $comments
+     *            Set to true to show comments
+     */
+    public function setComments($comments)
+    {
+        $this->comments = $comments === null ? true : $comments;
+    }
+
+    /**
+     * Get Display Content Revisions
+     *
+     * @return boolean True if content revisions are shown
+     */
+    public function hasInsDel()
+    {
+        return $this->insDel;
+    }
+
+    /**
+     * Set Display Content Revisions
+     *
+     * @param boolean $insDel
+     *            Set to true to show content revisions
+     */
+    public function setInsDel($insDel)
+    {
+        $this->insDel = $insDel === null ? true : $insDel;
+    }
+
+    /**
+     * Get Display Formatting Revisions
+     *
+     * @return boolean True if formatting revisions are shown
+     */
+    public function hasFormatting()
+    {
+        return $this->formatting;
+    }
+
+    /**
+     * Set Display Formatting Revisions
+     *
+     * @param boolean $insDel
+     *            Set to true to show formatting revisions
+     */
+    public function setFormatting($formatting)
+    {
+        $this->formatting = $formatting === null ? true : $formatting;
+    }
+
+    /**
+     * Get Display Ink Annotations
+     *
+     * @return boolean True if ink annotations are shown
+     */
+    public function hasInkAnnotations()
+    {
+        return $this->inkAnnotations;
+    }
+
+    /**
+     * Set Display Ink Annotations
+     *
+     * @param boolean $inkAnnotations
+     *            Set to true to show ink annotations
+     */
+    public function setInkAnnotations($inkAnnotations)
+    {
+        $this->inkAnnotations = $inkAnnotations === null ? true : $inkAnnotations;
+    }
+}
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index d1d1f0ce..9b2c2285 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -14,9 +14,12 @@
  * @copyright   2010-2016 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
-
 namespace PhpOffice\PhpWord\Metadata;
 
+use PhpOffice\PhpWord\ComplexType\ProofState;
+use PhpOffice\PhpWord\SimpleType\Zoom;
+use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+
 /**
  * Setting class
  *
@@ -26,24 +29,67 @@ namespace PhpOffice\PhpWord\Metadata;
 class Settings
 {
 
+    /**
+     * Magnification Setting
+     *
+     * @link http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
+     * @var mixed either integer, in which case it treated as a percent, or one of PhpOffice\PhpWord\SimpleType\Zoom
+     */
+    private $zoom = 100;
+
     /**
      * Hide spelling errors
-     * 
+     *
      * @var boolean
      */
     private $hideSpellingErrors = false;
 
     /**
      * Hide grammatical errors
-     * 
+     *
      * @var boolean
      */
     private $hideGrammaticalErrors = false;
 
+    /**
+     * Visibility of Annotation Types
+     *
+     * @var TrackChangesView
+     */
+    private $revisionView;
+
+    /**
+     * Track Revisions to Document
+     *
+     * @var boolean
+     */
+    private $trackRevisions = false;
+
+    /**
+     * Do Not Use Move Syntax When Tracking Revisions
+     *
+     * @var boolean
+     */
+    private $doNotTrackMoves = false;
+
+    /**
+     * Do Not Track Formatting Revisions When Tracking Revisions
+     *
+     * @var boolean
+     */
+    private $doNotTrackFormatting = false;
+
+    /**
+     * Spelling and Grammatical Checking State
+     *
+     * @var \PhpOffice\PhpWord\Metadata\ProofState
+     */
+    private $proofState;
+
     /**
      * Document Editing Restrictions
-     * 
-     * @var PhpOffice\PhpWord\Metadata\Protection
+     *
+     * @var \PhpOffice\PhpWord\Metadata\Protection
      */
     private $documentProtection;
 
@@ -54,6 +100,13 @@ class Settings
      */
     private $evenAndOddHeaders = false;
 
+    /**
+     * Radix Point for Field Code Evaluation
+     *
+     * @var string
+     */
+    private $decimalSymbol = '.';
+
     /**
      * @return Protection
      */
@@ -73,6 +126,25 @@ class Settings
         $this->documentProtection = $documentProtection;
     }
 
+    /**
+     * @return ProofState
+     */
+    public function getProofState()
+    {
+        if ($this->proofState == null) {
+            $this->proofState = new ProofState();
+        }
+        return $this->proofState;
+    }
+
+    /**
+     * @param ProofState $proofState
+     */
+    public function setProofState($proofState)
+    {
+        $this->proofState = $proofState;
+    }
+
     /**
      * Are spelling errors hidden
      *
@@ -128,4 +200,114 @@ class Settings
     {
         $this->evenAndOddHeaders = $evenAndOddHeaders === null ? true : $evenAndOddHeaders;
     }
+
+    /**
+     * Get the Visibility of Annotation Types
+     * 
+     * @return \PhpOffice\PhpWord\ComplexType\TrackChangesView
+     */
+    public function getRevisionView()
+    {
+        return $this->revisionView;
+    }
+
+    /**
+     * Set the Visibility of Annotation Types
+     * 
+     * @param TrackChangesView $trackChangesView
+     */
+    public function setRevisionView(TrackChangesView $trackChangesView = null)
+    {
+        $this->revisionView = $trackChangesView;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasTrackRevisions()
+    {
+        return $this->trackRevisions;
+    }
+
+    /**
+     * @param boolean $trackRevisions
+     */
+    public function setTrackRevisions($trackRevisions)
+    {
+        $this->trackRevisions = $trackRevisions === null ? true : $trackRevisions;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasDoNotTrackMoves()
+    {
+        return $this->doNotTrackMoves;
+    }
+
+    /**
+     * @param boolean $doNotTrackMoves
+     */
+    public function setDoNotTrackMoves($doNotTrackMoves)
+    {
+        $this->doNotTrackMoves = $doNotTrackMoves === null ? true : $doNotTrackMoves;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasDoNotTrackFormatting()
+    {
+        return $this->doNotTrackFormatting;
+    }
+
+    /**
+     * @param boolean $doNotTrackFormatting
+     */
+    public function setDoNotTrackFormatting($doNotTrackFormatting)
+    {
+        $this->doNotTrackFormatting = $doNotTrackFormatting === null ? true : $doNotTrackFormatting;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getZoom()
+    {
+        return $this->zoom;
+    }
+
+    /**
+     * @param mixed $zoom
+     */
+    public function setZoom($zoom)
+    {
+        if (is_numeric($zoom)) {
+            // zoom is a percentage
+            $this->zoom = $zoom;
+        } else {
+            Zoom::validate($zoom);
+            $this->zoom = $zoom;
+        }
+    }
+
+    /**
+     * Returns the Radix Point for Field Code Evaluation
+     * 
+     * @return string
+     */
+    public function getDecimalSymbol()
+    {
+        return $this->decimalSymbol;
+    }
+
+    /**
+     * sets the Radix Point for Field Code Evaluation
+     * 
+     * @param string $decimalSymbol
+     */
+    public function setDecimalSymbol($decimalSymbol)
+    {
+        $this->decimalSymbol = $decimalSymbol;
+    }
 }
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index df0d6dcf..d2ffc1f3 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 
 /**
  * Settings reader
@@ -28,7 +29,7 @@ use PhpOffice\PhpWord\PhpWord;
 class Settings extends AbstractPart
 {
 
-    private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'evenAndOddHeaders');
+    private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'trackRevisions', 'doNotTrackMoves', 'doNotTrackFormatting', 'evenAndOddHeaders');
 
     /**
      * Read settings.xml.
@@ -58,7 +59,7 @@ class Settings extends AbstractPart
                     }
                 } else if (method_exists($this, $method)) {
                     $this->$method($xmlReader, $phpWord, $node);
-                } else if (method_exists($this, $method)) {
+                } else if (method_exists($docSettings, $method)) {
                     $docSettings->$method($value);
                 }
             }
@@ -79,4 +80,61 @@ class Settings extends AbstractPart
         $edit = $xmlReader->getAttribute('w:edit', $node);
         $documentProtection->setEditing($edit);
     }
+
+    /**
+     * Sets the proof state
+     * 
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMNode $node
+     */
+    protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    {
+        $proofState = $phpWord->getSettings()->getProofState();
+
+        $spelling = $xmlReader->getAttribute('w:spelling', $node);
+        $grammar = $xmlReader->getAttribute('w:grammar', $node);
+
+        if ($spelling != null) {
+            $proofState->setSpelling($spelling);
+        }
+        if ($grammar != null) {
+            $proofState->setGrammar($grammar);
+        }
+    }
+
+    /**
+     * Sets the proof state
+     * 
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMNode $node
+     */
+    protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    {
+        $percent = $xmlReader->getAttribute('w:percent', $node);
+        $val = $xmlReader->getAttribute('w:val', $node);
+
+        if ($percent != null || $val != null) {
+            $phpWord->getSettings()->setZoom($percent == null ? $val : $percent);
+        }
+    }
+
+    /**
+     * Set the Revision view
+     * 
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMNode $node
+     */
+    protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    {
+        $revisionView = new TrackChangesView();
+        $revisionView->setMarkup($xmlReader->getAttribute('w:markup', $node));
+        $revisionView->setComments($xmlReader->getAttribute('w:comments', $node));
+        $revisionView->setInsDel($xmlReader->getAttribute('w:insDel', $node));
+        $revisionView->setFormatting($xmlReader->getAttribute('w:formatting', $node));
+        $revisionView->setInkAnnotations($xmlReader->getAttribute('w:inkAnnotations', $node));
+        $phpWord->getSettings()->setRevisionView($revisionView);
+    }
 }
diff --git a/src/PhpWord/SimpleType/Zoom.php b/src/PhpWord/SimpleType/Zoom.php
new file mode 100644
index 00000000..3b78fdf9
--- /dev/null
+++ b/src/PhpWord/SimpleType/Zoom.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Magnification Preset Values
+ *
+ * @since 0.14.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_Zoom.html
+ */
+final class Zoom extends AbstractEnum
+{
+    //No Preset Magnification
+    const NONE = 'none';
+
+    //Display One Full Page
+    const FULL_PAGE = 'fullPage';
+
+    //Display Page Width
+    const BEST_FIT = 'bestFit';
+
+    //Display Text Width
+    const TEXT_FIT = 'textFit';
+}
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 602205e9..529d47af 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -18,6 +18,8 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Settings as DocumentSettings;
+use PhpOffice\PhpWord\ComplexType\ProofState;
+use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 
 /**
  * Word2007 settings part writer: word/settings.xml
@@ -99,14 +101,17 @@ class Settings extends AbstractPart
      */
     private function getSettings()
     {
+
+        /** @var \PhpOffice\PhpWord\Metadata\Settings $documentSettings */
+        $documentSettings = $this->getParentWriter()->getPhpWord()->getSettings();
+
         // Default settings
         $this->settings = array(
-            'w:zoom' => array('@attributes' => array('w:percent' => '100')),
             'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
             'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
-            'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
+            'w:decimalSymbol' => array('@attributes' => array('w:val' => $documentSettings->getDecimalSymbol())),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
             'w:compat' => array(),
             'm:mathPr' => array(
@@ -140,15 +145,17 @@ class Settings extends AbstractPart
             ),
         );
 
-        /** @var \PhpOffice\PhpWord\Metadata\Settings $documentSettings */
-        $documentSettings = $this->getParentWriter()->getPhpWord()->getSettings();
-
         $this->setOnOffValue('w:hideSpellingErrors', $documentSettings->hasHideSpellingErrors());
         $this->setOnOffValue('w:hideGrammaticalErrors', $documentSettings->hasHideGrammaticalErrors());
+        $this->setOnOffValue('w:trackRevisions', $documentSettings->hasTrackRevisions());
+        $this->setOnOffValue('w:doNotTrackMoves', $documentSettings->hasDoNotTrackMoves());
+        $this->setOnOffValue('w:doNotTrackFormatting', $documentSettings->hasDoNotTrackFormatting());
         $this->setOnOffValue('w:evenAndOddHeaders', $documentSettings->hasEvenAndOddHeaders());
 
-        // Other settings
+        $this->setRevisionView($documentSettings->getRevisionView());
         $this->setDocumentProtection($documentSettings->getDocumentProtection());
+        $this->setProofState($documentSettings->getProofState());
+        $this->setZoom($documentSettings->getZoom());
         $this->getCompatibility();
     }
 
@@ -161,7 +168,11 @@ class Settings extends AbstractPart
     private function setOnOffValue($settingName, $booleanValue)
     {
         if ($booleanValue !== null && is_bool($booleanValue)) {
-            $this->settings[$settingName] = array('@attributes' => array('w:val' => $booleanValue ? 'true': 'false'));
+            if ($booleanValue) {
+                $this->settings[$settingName] = array('@attributes' => array());
+            } else {
+                $this->settings[$settingName] = array('@attributes' => array('w:val' => 'false'));
+            }
         }
     }
 
@@ -183,6 +194,55 @@ class Settings extends AbstractPart
         }
     }
 
+    /**
+     * Set the Proof state
+     *
+     * @param ProofState $proofState
+     */
+    private function setProofState(ProofState $proofState = null)
+    {
+        if ($proofState != null && $proofState->getGrammar() !== null && $proofState->getSpelling() !== null) {
+            $this->settings['w:proofState'] = array(
+                '@attributes' => array(
+                    'w:spelling' => $proofState->getSpelling(),
+                    'w:grammar' => $proofState->getGrammar()
+                )
+            );
+        }
+    }
+
+    /**
+     * Set the Proof state
+     *
+     * @param ProofState $proofState
+     */
+    private function setRevisionView(TrackChangesView $trackChangesView = null)
+    {
+        if ($trackChangesView != null) {
+
+            $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true': 'false';
+            $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true': 'false';
+            $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true': 'false';
+            $revisionView['w:formatting'] = $trackChangesView->hasFormatting() ? 'true': 'false';
+            $revisionView['w:inkAnnotations'] = $trackChangesView->hasInkAnnotations() ? 'true': 'false';
+
+            $this->settings['w:revisionView'] = array('@attributes' => $revisionView);
+        }
+    }
+
+    /**
+     * Set the magnification
+     * 
+     * @param mixed $zoom
+     */
+    private function setZoom($zoom = null)
+    {
+        if ($zoom !== null) {
+            $attr = is_int($zoom) ? 'w:percent' : 'w:val';
+            $this->settings['w:zoom'] = array('@attributes' => array($attr => $zoom));
+        }
+    }
+
     /**
      * Get compatibility setting.
      *
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 35c15edd..fff51652 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -17,6 +17,9 @@
 
 namespace PhpOffice\PhpWord\Metadata;
 
+use PhpOffice\PhpWord\ComplexType\ProofState;
+use PhpOffice\PhpWord\SimpleType\Zoom;
+
 /**
  * Test class for PhpOffice\PhpWord\Metadata\Settings
  *
@@ -66,4 +69,70 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $oSettings->getDocumentProtection()->setEditing('trackedChanges');
         $this->assertEquals('trackedChanges', $oSettings->getDocumentProtection()->getEditing());
     }
+
+    /**
+     * TrackRevistions
+     */
+    public function testTrackRevisions()
+    {
+        $oSettings = new Settings();
+        $oSettings->setTrackRevisions(true);
+        $this->assertEquals(true, $oSettings->hasTrackRevisions());
+    }
+
+    /**
+     * DoNotTrackFormatting
+     */
+    public function testDoNotTrackFormatting()
+    {
+        $oSettings = new Settings();
+        $oSettings->setDoNotTrackFormatting(true);
+        $this->assertEquals(true, $oSettings->hasDoNotTrackFormatting());
+    }
+
+    /**
+     * DoNotTrackMoves
+     */
+    public function testDoNotTrackMoves()
+    {
+        $oSettings = new Settings();
+        $oSettings->setDoNotTrackMoves(true);
+        $this->assertEquals(true, $oSettings->hasDoNotTrackMoves());
+    }
+
+    /**
+     * ProofState
+     */
+    public function testProofState()
+    {
+        $proofState = new ProofState();
+        $proofState->setGrammar(ProofState::CLEAN);
+        $proofState->setSpelling(ProofState::DIRTY);
+
+        $oSettings = new Settings();
+        $oSettings->setProofState($proofState);
+        $this->assertNotNull($oSettings->getProofState());
+        $this->assertEquals(ProofState::CLEAN, $oSettings->getProofState()->getGrammar());
+        $this->assertEquals(ProofState::DIRTY, $oSettings->getProofState()->getSpelling());
+    }
+
+    /**
+     * Zoom as percentage
+     */
+    public function testZoomPercentage()
+    {
+        $oSettings = new Settings();
+        $oSettings->setZoom(75);
+        $this->assertEquals(75, $oSettings->getZoom());
+    }
+
+    /**
+     * Zoom as string
+     */
+    public function testZoomEnum()
+    {
+        $oSettings = new Settings();
+        $oSettings->setZoom(Zoom::FULL_PAGE);
+        $this->assertEquals('fullPage', $oSettings->getZoom());
+    }
 }
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
new file mode 100644
index 00000000..b4173d17
--- /dev/null
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader;
+
+use PhpOffice\PhpWord\IOFactory;
+
+/**
+ * Test class for PhpOffice\PhpWord\Reader\MsDoc
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Reader\MsDoc
+ * @runTestsInSeparateProcesses
+ */
+class MsDocTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test canRead() method
+     */
+    public function testCanRead()
+    {
+        $object = new MsDoc();
+        $filename = __DIR__ . '/../_files/documents/reader.doc';
+        $this->assertTrue($object->canRead($filename));
+    }
+
+    /**
+     * Can read exception
+     */
+    public function testCanReadFailed()
+    {
+        $object = new MsDoc();
+        $filename = __DIR__ . '/../_files/documents/foo.doc';
+        $this->assertFalse($object->canRead($filename));
+    }
+
+    /**
+     * Load
+     */
+    public function testLoad()
+    {
+        $filename = __DIR__ . '/../_files/documents/reader.doc';
+        $phpWord = IOFactory::load($filename, 'MsDoc');
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
+    }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index fe6ea61c..828e1283 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -19,6 +19,8 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
 use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\SimpleType\Zoom;
+use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -102,7 +104,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($doc->elementExists($path, $file));
         $element = $doc->getElement($path, $file);
         
-        $this->assertEquals('true', $element->getAttribute('w:val'));
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
     }
 
     /**
@@ -121,6 +123,125 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($doc->elementExists($path, $file));
         
         $element = $doc->getElement($path, $file);
-        $this->assertEquals('true', $element->getAttribute('w:val'));
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test zoom percentage
+     */
+    public function testZoomPercentage()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setZoom(75);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:zoom';
+        $this->assertTrue($doc->elementExists($path, $file));
+        
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('75', $element->getAttribute('w:percent'));
+    }
+
+    /**
+     * Test zoom value
+     */
+    public function testZoomValue()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setZoom(Zoom::FULL_PAGE);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:zoom';
+        $this->assertTrue($doc->elementExists($path, $file));
+        
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('fullPage', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test Revision View
+     */
+    public function testRevisionView()
+    {
+        $trackChangesView = new TrackChangesView();
+        $trackChangesView->setFormatting(false);
+        $trackChangesView->setComments(true);
+
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setRevisionView($trackChangesView);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:revisionView';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('false', $element->getAttribute('w:formatting'));
+        $this->assertEquals('true', $element->getAttribute('w:comments'));
+    }
+
+    /**
+     * Test track Revisions
+     */
+    public function testTrackRevisions()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setTrackRevisions(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:trackRevisions';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test doNotTrackMoves
+     */
+    public function testDoNotTrackMoves()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setDoNotTrackMoves(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:doNotTrackMoves';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
+    /**
+     * Test DoNotTrackFormatting
+     */
+    public function testDoNotTrackFormatting()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setDoNotTrackFormatting(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:doNotTrackFormatting';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
     }
 }
diff --git a/tests/PhpWord/_files/documents/reader.doc b/tests/PhpWord/_files/documents/reader.doc
new file mode 100644
index 0000000000000000000000000000000000000000..a5ce295d8aa8c35e681eb66e26857259659f5955
GIT binary patch
literal 49664
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
P>HePb{}m?uU)KL$=${T1

literal 0
HcmV?d00001

diff --git a/tests/PhpWord/_files/documents/reader.docx b/tests/PhpWord/_files/documents/reader.docx
index d09091b11983772d56172c519b702ede44df8989..ef6b6615a90234c26186e5ea689de97d045c378a 100644
GIT binary patch
literal 105546
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

literal 74121
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%0Dv#LUed`^-+Mo|J2W>)<O9?3(ET;e|>MJ*3JN+|M
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
R!U}w&fFpZtlt2#-`5!b@qe=h(


From 18cb0b26f7fbf60265a02077fb3ed1a1c06eefb9 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 11 Jul 2017 01:58:54 +0200
Subject: [PATCH 081/370] Add support for comments (#1067)

Just a writer for now, reader to be done
---
 .gitignore                                    |   1 +
 composer.json                                 |   1 +
 docs/elements.rst                             |  25 +++-
 docs/intro.rst                                |   5 +
 samples/Sample_37_Comments.php                |  63 +++++++++
 src/PhpWord/Collection/Comments.php           |  27 ++++
 src/PhpWord/Element/AbstractContainer.php     |   9 +-
 src/PhpWord/Element/AbstractElement.php       |  65 +++++++++-
 src/PhpWord/Element/Comment.php               | 122 ++++++++++++++++++
 src/PhpWord/Element/TrackChange.php           |  77 +++++++++++
 src/PhpWord/PhpWord.php                       |   6 +-
 src/PhpWord/Writer/Word2007.php               |  26 ++++
 .../Word2007/Element/AbstractElement.php      |  53 ++++++++
 src/PhpWord/Writer/Word2007/Element/Chart.php |   1 +
 src/PhpWord/Writer/Word2007/Element/Image.php |   1 +
 src/PhpWord/Writer/Word2007/Element/Line.php  |   1 +
 .../Writer/Word2007/Element/Object.php        |   1 +
 src/PhpWord/Writer/Word2007/Element/Shape.php |   1 +
 .../Writer/Word2007/Element/TextBox.php       |   1 +
 src/PhpWord/Writer/Word2007/Part/Comments.php | 103 +++++++++++++++
 .../Writer/Word2007/Part/ContentTypes.php     |   1 +
 tests/PhpWord/Element/CommentTest.php         |  83 ++++++++++++
 .../Writer/Word2007/Part/CommentsTest.php     |  61 +++++++++
 23 files changed, 726 insertions(+), 8 deletions(-)
 create mode 100644 samples/Sample_37_Comments.php
 create mode 100644 src/PhpWord/Collection/Comments.php
 create mode 100644 src/PhpWord/Element/Comment.php
 create mode 100644 src/PhpWord/Element/TrackChange.php
 create mode 100644 src/PhpWord/Writer/Word2007/Part/Comments.php
 create mode 100644 tests/PhpWord/Element/CommentTest.php
 create mode 100644 tests/PhpWord/Writer/Word2007/Part/CommentsTest.php

diff --git a/.gitignore b/.gitignore
index 98f65dbf..66e64406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ Thumbs.db
 Desktop.ini
 .idea
 _build
+/build
 phpunit.xml
 composer.lock
 composer.phar
diff --git a/composer.json b/composer.json
index c49eb9cd..faa17c1b 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpdocumentor/phpdocumentor":"2.*",
+        "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "1.*",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",
diff --git a/docs/elements.rst b/docs/elements.rst
index 5b671936..c8f701d7 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -398,4 +398,27 @@ Available line style attributes:
 - ``endArrow``. End type of arrow: block, open, classic, diamond, oval.
 - ``width``. Line-object width in pt.
 - ``height``. Line-object height in pt.
-- ``flip``. Flip the line element: true, false.
\ No newline at end of file
+- ``flip``. Flip the line element: true, false.
+
+Comments
+---------
+
+Comments can be added to a document by using ``addComment``.
+The comment can contain formatted text. Once the comment has been added, it can be linked to any to any element.
+
+.. code-block:: php
+
+    // first create a comment
+    $comment= new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+    $comment->addText('Test', array('bold' => true));
+
+    // add it to the document
+    $phpWord->addComment($comment);
+
+    $textrun = $section->addTextRun();
+    $textrun->addText('This ');
+    $text = $textrun->addText('is');
+    // link the comment to the text you just created
+    $text->setCommentStart($comment);
+
+If no end is set for a comment using the ``setCommentEnd``, the comment will be ended automatically at the end of the element it is started on.
\ No newline at end of file
diff --git a/docs/intro.rst b/docs/intro.rst
index d1c791cf..d88cd626 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -49,6 +49,7 @@ Features
 - Insert drawing shapes (arc, curve, line, polyline, rect, oval)
 - Insert charts (pie, doughnut, bar, line, area, scatter, radar)
 - Insert form fields (textinput, checkbox, and dropdown)
+- Insert comments
 - Create document from templates
 - Use XSL 1.0 style sheets to transform headers, main document part, and footers of an OOXML template
 - ... and many more features on progress
@@ -102,6 +103,8 @@ Writers
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
 |                           | Endnote              | ✓      |       |       | ✓      |       |
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
+|                           | Comments             | ✓      |       |       |        |       |
++---------------------------+----------------------+--------+-------+-------+--------+-------+
 | **Graphs**                | 2D basic graphs      | ✓      |       |       |        |       |
 +---------------------------+----------------------+--------+-------+-------+--------+-------+
 |                           | 2D advanced graphs   |        |       |       |        |       |
@@ -161,6 +164,8 @@ Readers
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
 |                           | Endnote              | ✓      |       |       |       |       |
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
+|                           | Comments             |        |       |       |       |       |
++---------------------------+----------------------+--------+-------+-------+-------+-------+
 | **Graphs**                | 2D basic graphs      |        |       |       |       |       |
 +---------------------------+----------------------+--------+-------+-------+-------+-------+
 |                           | 2D advanced graphs   |        |       |       |       |       |
diff --git a/samples/Sample_37_Comments.php b/samples/Sample_37_Comments.php
new file mode 100644
index 00000000..670e914b
--- /dev/null
+++ b/samples/Sample_37_Comments.php
@@ -0,0 +1,63 @@
+<?php
+include_once 'Sample_Header.php';
+
+// New Word Document
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+// A comment
+$comment = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+$comment->addText('Test', array('bold' => true));
+$phpWord->addComment($comment);
+
+$section = $phpWord->addSection();
+
+$textrun = $section->addTextRun();
+$textrun->addText('This ');
+$text = $textrun->addText('is');
+$text->setCommentRangeStart($comment);
+$textrun->addText(' a test');
+
+$section->addTextBreak(2);
+
+// Let's create a comment that we will link to a start element and an end element
+$commentWithStartAndEnd = new \PhpOffice\PhpWord\Element\Comment('Foo Bar', new \DateTime(), '');
+$commentWithStartAndEnd->addText('A comment with a start and an end');
+$phpWord->addComment($commentWithStartAndEnd);
+
+$textrunWithEnd = $section->addTextRun();
+$textrunWithEnd->addText('This ');
+$textToStartOn = $textrunWithEnd->addText('is', array('bold' => true));
+$textToStartOn->setCommentRangeStart($commentWithStartAndEnd);
+$textrunWithEnd->addText(' another', array('italic' => true));
+$textToEndOn = $textrunWithEnd->addText(' test');
+$textToEndOn->setCommentRangeEnd($commentWithStartAndEnd);
+
+$section->addTextBreak(2);
+
+// Let's add a comment on an image
+$commentOnImage = new \PhpOffice\PhpWord\Element\Comment('Mr Smart', new \DateTime(), '');
+$imageComment = $commentOnImage->addTextRun();
+$imageComment->addText('Hey, Mars does look ');
+$imageComment->addText('red', array('color' => 'FF0000'));
+$phpWord->addComment($commentOnImage);
+$image = $section->addImage('resources/_mars.jpg');
+$image->setCommentRangeStart($commentOnImage);
+
+$section->addTextBreak(2);
+
+// We can also do things the other way round, link the comment to the element
+$anotherText = $section->addText("another text");
+
+$comment1 = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+$comment1->addText('Test', array('bold' => true));
+$comment1->setStartElement($anotherText);
+$comment1->setEndElement($anotherText);
+$phpWord->addComment($comment1);
+
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
new file mode 100644
index 00000000..e0383814
--- /dev/null
+++ b/src/PhpWord/Collection/Comments.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Collection;
+
+/**
+ * Comments collection
+ *
+ * @since 0.12.0
+ */
+class Comments extends AbstractCollection
+{
+}
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 9d1267db..0dbfe750 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -58,7 +58,7 @@ abstract class AbstractContainer extends AbstractElement
     protected $elements = array();
 
     /**
-     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun
+     * Container type Section|Header|Footer|Footnote|Endnote|Cell|TextRun|TextBox|ListItemRun|TrackChange
      *
      * @var string
      */
@@ -83,7 +83,7 @@ abstract class AbstractContainer extends AbstractElement
             'ListItem', 'ListItemRun', 'Table', 'Image', 'Object',
             'Footnote', 'Endnote', 'CheckBox', 'TextBox', 'Field',
             'Line', 'Shape', 'Title', 'TOC', 'PageBreak',
-            'Chart', 'FormField', 'SDT'
+            'Chart', 'FormField', 'SDT', 'Comment'
         );
         $functions = array();
         foreach ($elements as $element) {
@@ -188,7 +188,7 @@ abstract class AbstractContainer extends AbstractElement
     private function checkValidity($method)
     {
         $generalContainers = array(
-            'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun',
+            'Section', 'Header', 'Footer', 'Footnote', 'Endnote', 'Cell', 'TextRun', 'TextBox', 'ListItemRun', 'TrackChange',
         );
 
         $validContainers = array(
@@ -203,7 +203,8 @@ abstract class AbstractContainer extends AbstractElement
             'Shape'         => $generalContainers,
             'FormField'     => $generalContainers,
             'SDT'           => $generalContainers,
-            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
+            'TrackChange'   => $generalContainers,
+            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange'),
             'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index b0ed8ae2..8ff64194 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -108,12 +108,26 @@ abstract class AbstractElement
     protected $mediaRelation = false;
 
     /**
-     * Is part of collection; true for Title, Footnote, Endnote, and Chart
+     * Is part of collection; true for Title, Footnote, Endnote, Chart, and Comment
      *
      * @var bool
      */
     protected $collectionRelation = false;
 
+    /**
+     * The start position for the linked comment
+     * 
+     * @var Comment
+     */
+    protected $commentRangeStart;
+
+    /**
+     * The end position for the linked comment
+     * 
+     * @var Comment
+     */
+    protected $commentRangeEnd;
+
     /**
      * Get PhpWord
      *
@@ -265,6 +279,55 @@ abstract class AbstractElement
         return $this->nestedLevel;
     }
 
+    /**
+     * Get comment start
+     *
+     * @return Comment
+     */
+    public function getCommentRangeStart()
+    {
+        return $this->commentRangeStart;
+    }
+
+    /**
+     * Set comment start
+     * 
+     * @param Comment $value
+     */
+    public function setCommentRangeStart(Comment $value)
+    {
+        if ($this instanceof Comment) {
+            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+        }
+        $this->commentRangeStart= $value;
+        $this->commentRangeStart->setStartElement($this);
+    }
+
+    /**
+     * Get comment end
+     *
+     * @return Comment
+     */
+    public function getCommentRangeEnd()
+    {
+        return $this->commentRangeEnd;
+    }
+
+    /**
+     * Set comment end
+     *
+     * @param Comment $value
+     * @return void
+     */
+    public function setCommentRangeEnd(Comment $value)
+    {
+        if ($this instanceof Comment) {
+            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+        }
+        $this->commentRangeEnd= $value;
+        $this->commentRangeEnd->setEndElement($this);
+    }
+
     /**
      * Set parent container
      *
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
new file mode 100644
index 00000000..def9d5a8
--- /dev/null
+++ b/src/PhpWord/Element/Comment.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Comment element
+ */
+class Comment extends TrackChange
+{
+    /**
+     * Initials
+     *
+     * @var string
+     */
+    private $initials;
+
+    /**
+     * The Element where this comment starts
+     * 
+     * @var AbstractElement
+     */
+    private $startElement;
+
+    /**
+     * The Element where this comment ends
+     * 
+     * @var AbstractElement
+     */
+    private $endElement;
+
+    /**
+     * Is part of collection
+     *
+     * @var bool
+     */
+    protected $collectionRelation = true;
+
+    /**
+     * Create a new Comment Element
+     *
+     * @param string $author
+     * @param \DateTime $date
+     * @param string $initials
+     */
+    public function __construct($author, $date, $initials)
+    {
+        parent::__construct($author, $date);
+        $this->initials = $initials;
+        return $this;
+    }
+
+    /**
+     * Get Initials
+     *
+     * @return string
+     */
+    public function getInitials()
+    {
+        return $this->initials;
+    }
+
+    /**
+     * Sets the element where this comment starts
+     * 
+     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     */
+    public function setStartElement(AbstractElement $value)
+    {
+        $this->startElement = $value;
+        if ($value->getCommentRangeStart() == null) {
+            $value->setCommentRangeStart($this);
+        }
+    }
+
+    /**
+     * Get the element where this comment starts
+     * 
+     * @return \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    public function getStartElement()
+    {
+        return $this->startElement;
+    }
+
+    /**
+     * Sets the element where this comment ends
+     * 
+     * @param \PhpOffice\PhpWord\Element\AbstractElement $value
+     */
+    public function setEndElement(AbstractElement $value)
+    {
+        $this->endElement = $value;
+        if ($value->getCommentRangeEnd() == null) {
+            $value->setCommentRangeEnd($this);
+        }
+    }
+
+    /**
+     * Get the element where this comment ends
+     * 
+     * @return \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    public function getEndElement()
+    {
+        return $this->endElement;
+    }
+}
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
new file mode 100644
index 00000000..782e6f35
--- /dev/null
+++ b/src/PhpWord/Element/TrackChange.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * TrackChange element
+ */
+class TrackChange extends AbstractContainer
+{
+    /**
+     * @var string Container type
+     */
+    protected $container = 'TrackChange';
+
+    /**
+     * Author
+     *
+     * @var string
+     */
+    private $author;
+
+    /**
+     * Date
+     *
+     * @var DateTime
+     */
+    private $date;
+
+    /**
+     * Create a new TrackChange Element
+     *
+     * @param string $author
+     * @param DateTime $date
+     */
+    public function __construct($author, \DateTime $date)
+    {
+
+        $this->author = $author;
+        $this->date = $date;
+        return $this;
+    }
+
+    /**
+     * Get TrackChange Author
+     *
+     * @return string
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * Get TrackChange Date
+     *
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+}
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index bb5b4956..1571537e 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -27,11 +27,13 @@ use PhpOffice\PhpWord\Exception\Exception;
  * @method Collection\Footnotes getFootnotes()
  * @method Collection\Endnotes getEndnotes()
  * @method Collection\Charts getCharts()
+ * @method Collection\Comments getComments()
  * @method int addBookmark(Element\Bookmark $bookmark)
  * @method int addTitle(Element\Title $title)
  * @method int addFootnote(Element\Footnote $footnote)
  * @method int addEndnote(Element\Endnote $endnote)
  * @method int addChart(Element\Chart $chart)
+ * @method int addComment(Element\Comment $comment)
  *
  * @method Style\Paragraph addParagraphStyle(string $styleName, array $styles)
  * @method Style\Font addFontStyle(string $styleName, mixed $fontStyle, mixed $paragraphStyle = null)
@@ -84,7 +86,7 @@ class PhpWord
     public function __construct()
     {
         // Collection
-        $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts');
+        $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts', 'Comments');
         foreach ($collections as $collection) {
             $class = 'PhpOffice\\PhpWord\\Collection\\' . $collection;
             $this->collections[$collection] = new $class();
@@ -118,7 +120,7 @@ class PhpWord
         $addCollection = array();
         $addStyle = array();
 
-        $collections = array('Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart');
+        $collections = array('Bookmark', 'Title', 'Footnote', 'Endnote', 'Chart', 'Comment');
         foreach ($collections as $collection) {
             $getCollection[] = strtolower("get{$collection}s");
             $addCollection[] = strtolower("add{$collection}");
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index 8e10f5f6..bb7b521f 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -60,6 +60,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
             'DocPropsCustom' => 'docProps/custom.xml',
             'RelsDocument'   => 'word/_rels/document.xml.rels',
             'Document'       => 'word/document.xml',
+            'Comments'       => 'word/comments.xml',
             'Styles'         => 'word/styles.xml',
             'Numbering'      => 'word/numbering.xml',
             'Settings'       => 'word/settings.xml',
@@ -129,6 +130,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
 
         $this->addNotes($zip, $rId, 'footnote');
         $this->addNotes($zip, $rId, 'endnote');
+        $this->addComments($zip, $rId);
         $this->addChart($zip, $rId);
 
         // Write parts
@@ -255,6 +257,30 @@ class Word2007 extends AbstractWriter implements WriterInterface
         }
     }
 
+    /**
+     * Add comments
+     *
+     * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
+     * @param integer &$rId
+     * @return void
+     */
+    private function addComments(ZipArchive $zip, &$rId)
+    {
+        $phpWord = $this->getPhpWord();
+        $collection = $phpWord->getComments();
+        $partName = "comments";
+
+        // Add comment relations and contents
+        /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collection Type hint */
+        if ($collection->countItems() > 0) {
+            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId);
+
+            // Write content file, e.g. word/comments.xml
+            $writerPart = $this->getWriterPart($partName)->setElements($collection->getItems());
+            $zip->addFromString("word/{$partName}.xml", $writerPart->write());
+        }
+    }
+
     /**
      * Add chart.
      *
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index f5a454d2..79877b10 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -103,6 +103,7 @@ abstract class AbstractElement
                 $this->writeParagraphStyle();
             }
         }
+        $this->writeCommentRangeStart();
     }
 
     /**
@@ -112,11 +113,63 @@ abstract class AbstractElement
      */
     protected function endElementP()
     {
+        $this->writeCommentRangeEnd();
         if (!$this->withoutP) {
             $this->xmlWriter->endElement(); // w:p
         }
     }
 
+    /**
+     * Writes the w:commentRangeStart DOM element
+     *
+     * @return void
+     */
+    protected function writeCommentRangeStart()
+    {
+        if ($this->element->getCommentRangeStart() != null) {
+            $comment = $this->element->getCommentRangeStart();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeStart', array('w:id' => $comment->getElementId()));
+
+        }
+    }
+
+    /**
+     * Writes the w:commentRangeEnd DOM element
+     *
+     * @return void
+     */
+    protected function writeCommentRangeEnd()
+    {
+        if ($this->element->getCommentRangeEnd() != null) {
+            $comment = $this->element->getCommentRangeEnd();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->startElement('w:r');
+            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->endElement();
+        } elseif ($this->element->getCommentRangeStart() != null && $this->element->getCommentRangeStart()->getEndElement() == null) {
+            $comment = $this->element->getCommentRangeStart();
+            //only set the ID if it is not yet set, otherwise it will overwrite it
+            if ($comment->getElementId() == null) {
+                $comment->setElementId();
+            }
+
+            $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->startElement('w:r');
+            $this->xmlWriter->writeElementBlock('w:commentReference', array('w:id' => $comment->getElementId()));
+            $this->xmlWriter->endElement();
+        }
+    }
+
     /**
      * Write ending.
      *
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index 12602532..ecdde362 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -45,6 +45,7 @@ class Chart extends AbstractElement
         if (!$this->withoutP) {
             $xmlWriter->startElement('w:p');
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:drawing');
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 914c78ea..edf32739 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -63,6 +63,7 @@ class Image extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index ade91fb8..ebc5d395 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -48,6 +48,7 @@ class Line extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/Object.php
index 4fdf6fed..fc0532cd 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/Object.php
@@ -51,6 +51,7 @@ class Object extends AbstractElement
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:object');
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index f282c4a5..a589af6c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -55,6 +55,7 @@ class Shape extends AbstractElement
         if (!$this->withoutP) {
             $xmlWriter->startElement('w:p');
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 3c4f48c2..e83fe0c9 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -45,6 +45,7 @@ class TextBox extends Image
             $xmlWriter->startElement('w:p');
             $styleWriter->writeAlignment();
         }
+        $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
new file mode 100644
index 00000000..73314785
--- /dev/null
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Part;
+
+use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Comment;
+use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
+
+/**
+ * Word2007 comments part writer: word/comments.xml
+ */
+class Comments extends AbstractPart
+{
+    /**
+     * Comments collection to be written
+     *
+     * @var \PhpOffice\PhpWord\Collection\Comments
+     */
+    protected $elements;
+
+    /**
+     * Write part
+     *
+     * @return string
+     */
+    public function write()
+    {
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->startDocument('1.0', 'UTF-8', 'yes');
+        $xmlWriter->startElement('w:comments');
+        $xmlWriter->writeAttribute('xmlns:ve', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+        $xmlWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
+        $xmlWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+        $xmlWriter->writeAttribute('xmlns:m', 'http://schemas.openxmlformats.org/officeDocument/2006/math');
+        $xmlWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
+        $xmlWriter->writeAttribute('xmlns:wp', 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing');
+        $xmlWriter->writeAttribute('xmlns:w10', 'urn:schemas-microsoft-com:office:word');
+        $xmlWriter->writeAttribute('xmlns:w', 'http://schemas.openxmlformats.org/wordprocessingml/2006/main');
+        $xmlWriter->writeAttribute('xmlns:wne', 'http://schemas.microsoft.com/office/word/2006/wordml');
+
+        if ($this->elements !== null) {
+            foreach ($this->elements as $element) {
+                if ($element instanceof Comment) {
+                    $this->writeComment($xmlWriter, $element);
+                }
+            }
+        }
+
+        $xmlWriter->endElement(); // w:comments
+
+        return $xmlWriter->getData();
+    }
+
+    /**
+     * Write comment item.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Comment $comment
+     * @return void
+     */
+    protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
+    {
+        $xmlWriter->startElement('w:comment');
+        $xmlWriter->writeAttribute('w:id', $comment->getElementId());
+        $xmlWriter->writeAttribute('w:author', $comment->getAuthor());
+        $xmlWriter->writeAttribute('w:date', $comment->getDate()->format($this->dateFormat));
+        $xmlWriter->writeAttribute('w:initials', $comment->getInitials());
+
+        $containerWriter = new Container($xmlWriter, $comment);
+        $containerWriter->write();
+
+        $xmlWriter->endElement(); // w:comment
+    }
+
+    /**
+     * Set element
+     *
+     * @param \PhpOffice\PhpWord\Collection\Comments $elements
+     * @return self
+     */
+    public function setElements($elements)
+    {
+        $this->elements = $elements;
+
+        return $this;
+    }
+}
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 1c81f343..7a03243e 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -49,6 +49,7 @@ class ContentTypes extends AbstractPart
             '/word/theme/theme1.xml' => $openXMLPrefix . 'officedocument.theme+xml',
             '/word/webSettings.xml'  => $wordMLPrefix  . 'webSettings+xml',
             '/word/fontTable.xml'    => $wordMLPrefix  . 'fontTable+xml',
+            '/word/comments.xml'     => $wordMLPrefix  . 'comments+xml',
         );
 
         $defaults = $contentTypes['default'];
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
new file mode 100644
index 00000000..db9ec902
--- /dev/null
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Test class for PhpOffice\PhpWord\Element\Header
+ *
+ * @runTestsInSeparateProcesses
+ */
+class CommentTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * New instance
+     */
+    public function testConstructDefault()
+    {
+        $author = 'Test User';
+        $date = new \DateTime('2000-01-01');
+        $initials = 'default_user';
+        $oComment = new Comment($author, $date, $initials);
+
+        $oText = new Text('dummy text');
+        $oComment->setStartElement($oText);
+        $oComment->setEndElement($oText);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Comment', $oComment);
+        $this->assertEquals($author, $oComment->getAuthor());
+        $this->assertEquals($date, $oComment->getDate());
+        $this->assertEquals($initials, $oComment->getInitials());
+        $this->assertEquals($oText, $oComment->getStartElement());
+        $this->assertEquals($oText, $oComment->getEndElement());
+    }
+
+    /**
+     * Add text
+     */
+    public function testAddText()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $element = $oComment->addText('text');
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Text', $element);
+        $this->assertCount(1, $oComment->getElements());
+        $this->assertEquals('text', $element->getText());
+    }
+
+    /**
+     * Get elements
+     */
+    public function testGetElements()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+
+        $this->assertInternalType('array', $oComment->getElements());
+    }
+
+    /**
+     * Set/get relation Id
+     */
+    public function testRelationId()
+    {
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+
+        $iVal = rand(1, 1000);
+        $oComment->setRelationId($iVal);
+        $this->assertEquals($iVal, $oComment->getRelationId());
+    }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
new file mode 100644
index 00000000..aac4b15b
--- /dev/null
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Writer\Word2007\Part;
+
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Comment
+ *
+ * @runTestsInSeparateProcesses
+ */
+class CommentsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Executed before each method of the class
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Write comments
+     */
+    public function testWriteComments()
+    {
+
+        $comment = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
+        $comment->addText('Test');
+
+        $phpWord = new PhpWord();
+        $phpWord->addComment($comment);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $path = '/w:comments/w:comment';
+        $file = 'word/comments.xml';
+
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotNull($element->getAttribute('w:id'));
+        $this->assertEquals("Authors name", $element->getAttribute('w:author'));
+        $this->assertEquals("my_initials", $element->getAttribute('w:initials'));
+    }
+}

From cf76b1f217e9221e03848dc811e332bb45001075 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 20 Jul 2017 07:39:21 +0200
Subject: [PATCH 082/370] Simplify SimpleType validation

---
 composer.json                        |  4 +---
 src/PhpWord/Shared/AbstractEnum.php  | 27 +++++++++++++++++++--
 src/PhpWord/SimpleType/Jc.php        | 35 +++-------------------------
 src/PhpWord/SimpleType/JcTable.php   | 20 ++--------------
 src/PhpWord/Style/Frame.php          |  2 +-
 src/PhpWord/Style/NumberingLevel.php |  2 +-
 src/PhpWord/Style/Paragraph.php      |  2 +-
 src/PhpWord/Style/Table.php          |  2 +-
 8 files changed, 35 insertions(+), 59 deletions(-)

diff --git a/composer.json b/composer.json
index faa17c1b..6b8365bc 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         },
         {
             "name": "Franck Lefevre",
-            "homepage": "http://blog.rootslabs.net"
+            "homepage": "https://rootslabs.net/blog/"
         },
         {
             "name": "Ivan Lanin",
@@ -36,13 +36,11 @@
         "ext-xml": "*",
         "zendframework/zend-escaper": "2.4.*",
         "zendframework/zend-stdlib": "2.4.*",
-        "zendframework/zend-validator": "2.4.*",
         "phpoffice/common": "0.2.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpdocumentor/phpdocumentor":"2.*",
-        "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "1.*",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index 4584c2f9..f116e511 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -19,16 +19,39 @@ abstract class AbstractEnum
         return self::$constCacheArray[$calledClass];
     }
 
+    /**
+     * Returns all values for this enum
+     * 
+     * @return array
+     */
     public static function values()
     {
         return array_values(self::getConstants());
     }
 
-    public static function validate($value)
+    /**
+     * Returns true the value is valid for this enum
+     * 
+     * @param strign $value
+     * @return boolean true if value is valid
+     */
+    public static function isValid($value)
     {
         $values = array_values(self::getConstants());
-        if (!in_array($value, $values, true)) {
+        return in_array($value, $values, true);
+    }
+
+    /**
+     * Validates that the value passed is a valid value
+     * 
+     * @param string $value
+     * @throws \InvalidArgumentException if the value passed is not valid for this enum
+     */
+    public static function validate($value)
+    {
+        if (!self::isValid($value)) {
             $calledClass = get_called_class();
+            $values = array_values(self::getConstants());
             throw new \InvalidArgumentException("$value is not a valid value for $calledClass, possible values are " . implode(', ', $values));
         }
     }
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index e90674a4..5c399a16 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -17,7 +17,7 @@
 
 namespace PhpOffice\PhpWord\SimpleType;
 
-use Zend\Validator\InArray;
+use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
  * Horizontal Alignment Type.
@@ -28,10 +28,11 @@ use Zend\Validator\InArray;
  * @since 0.13.0
  *
  * @see \PhpOffice\PhpWord\SimpleType\JcTable For table alignment modes available since ISO/IEC-29500:2008.
+ * @link http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
  *
  * @codeCoverageIgnore
  */
-final class Jc
+final class Jc extends AbstractEnum
 {
     const START = 'start';
     const CENTER = 'center';
@@ -65,34 +66,4 @@ final class Jc
      * @deprecated 0.13.0 For documents based on ISO/IEC 29500:2008 and later use `BOTH` instead.
      */
     const JUSTIFY = 'justify';
-
-    /**
-     * @since 0.13.0
-     *
-     * @return \Zend\Validator\InArray
-     */
-    final public static function getValidator()
-    {
-        // todo: consider caching validator instances.
-        return new InArray(
-            array (
-                'haystack' => array(
-                    self::START,
-                    self::CENTER,
-                    self::END,
-                    self::BOTH,
-                    self::MEDIUM_KASHIDA,
-                    self::DISTRIBUTE,
-                    self::NUM_TAB,
-                    self::HIGH_KASHIDA,
-                    self::LOW_KASHIDA,
-                    self::THAI_DISTRIBUTE,
-                    self::LEFT,
-                    self::RIGHT,
-                    self::JUSTIFY,
-                ),
-                'strict'   => InArray::COMPARE_STRICT,
-            )
-        );
-    }
 }
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index d9648477..865b25a8 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -17,7 +17,7 @@
 
 namespace PhpOffice\PhpWord\SimpleType;
 
-use Zend\Validator\InArray;
+use PhpOffice\PhpWord\Shared\AbstractEnum;
 
 /**
  * Table Alignment Type.
@@ -28,25 +28,9 @@ use Zend\Validator\InArray;
  *
  * @codeCoverageIgnore
  */
-final class JcTable
+final class JcTable extends AbstractEnum
 {
     const START = 'start';
     const CENTER = 'center';
     const END = 'end';
-
-    /**
-     * @since 0.13.0
-     *
-     * @return \Zend\Validator\InArray
-     */
-    final public static function getValidator()
-    {
-        // todo: consider caching validator instances.
-        return new InArray(
-            array (
-                'haystack' => array(self::START, self::CENTER, self::END),
-                'strict'   => InArray::COMPARE_STRICT,
-            )
-        );
-    }
 }
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index 97faacfb..0a99146b 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -200,7 +200,7 @@ class Frame extends AbstractStyle
      */
     public function setAlignment($value)
     {
-        if (Jc::getValidator()->isValid($value)) {
+        if (Jc::isValid($value)) {
             $this->alignment = $value;
         }
 
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 827d4354..38b9fbee 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -300,7 +300,7 @@ class NumberingLevel extends AbstractStyle
      */
     public function setAlignment($value)
     {
-        if (Jc::getValidator()->isValid($value)) {
+        if (Jc::isValid($value)) {
             $this->alignment = $value;
         }
 
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index a9b53b2b..bad9ace9 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -240,7 +240,7 @@ class Paragraph extends Border
      */
     public function setAlignment($value)
     {
-        if (Jc::getValidator()->isValid($value)) {
+        if (Jc::isValid($value)) {
             $this->alignment = $value;
         }
 
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 91809528..a542af7b 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -510,7 +510,7 @@ class Table extends Border
      */
     public function setAlignment($value)
     {
-        if (JcTable::getValidator()->isValid($value) || Jc::getValidator()->isValid($value)) {
+        if (JcTable::isValid($value) || Jc::isValid($value)) {
             $this->alignment = $value;
         }
 

From c448046b52272d17a1863e1d8f9fe5c40367c820 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Wed, 2 Aug 2017 10:52:42 +0200
Subject: [PATCH 083/370] Fix: different footer for first page

---
 src/PhpWord/Element/Section.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 6e199bb9..3758af99 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -181,6 +181,11 @@ class Section extends AbstractContainer
                 return true;
             }
         }
+        foreach ($this->footers as $footer) {
+            if ($footer->getType() == Header::FIRST) {
+                return true;
+            }
+        }
         return false;
     }
 

From 15585dd3c75c621eac9d718cc0bb6a9fcabd53d1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 9 Sep 2017 01:25:33 +0200
Subject: [PATCH 084/370] - fix ZF version

Fix travis build to run on precise
Update the changelog
---
 .travis.yml       | 2 ++
 CHANGELOG.md      | 9 +++++++--
 README.md         | 3 +--
 composer.json     | 6 +++---
 docs/elements.rst | 6 +++---
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a36b21b..3508dca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: php
 
+dist: precise
+
 php:
     - 5.3
     - 5.4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1e0245f..52bd6aac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 v0.14.0 (?? ???? 2017)
 ----------------------
-This release fixes several bugs and adds some new features
+This release fixes several bugs and adds some new features.
+This is the last version to support PHP 5.3
 
 ### Added
 - Possibility to control the footnote numbering - @troosan #1068
@@ -13,8 +14,11 @@ This release fixes several bugs and adds some new features
 - Introduced the `\PhpOffice\PhpWord\SimpleType\NumberFormat` simple type. - @troosan
 - Support for ContextualSpacing - @postHawk #1088
 - Possiblity to hide spelling and/or grammatical errors - @troosan #542
+- Support for Comments - @troosan #1067
+- Add support for changing the document language - @troosan #1108
 
 ### Fixed
+- Loosen dependency to Zend
 - Images are not being printed when generating PDF - @hubertinio #1074 #431
 - Fixed some PHP 7 warnings - @	likeuntomurphy #927
 - Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
@@ -23,7 +27,8 @@ This release fixes several bugs and adds some new features
 - Fixed Word2007 reader where unnecessary paragraphs were being created - @donghaobo #1043 #620
 - Fixed Word2007 reader where margins were not being read correctly - @slowprog #885 #1008
 - Impossible to add element PreserveText in Section - @rvanlaak #452
-- Missing options for numbering format - @troosan #1041
+- Added missing options for numbering format - @troosan #1041
+- Fixed impossibility to set a different footer for first page - @ctrlaltca #1116
 
 v0.13.0 (31 July 2016)
 -------------------
diff --git a/README.md b/README.md
index 6b9f7dfa..f712c6c6 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,7 @@ PHPWord requires the following:
 - PHP 5.3.3+
 - [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
 - [Zend\Escaper component](http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html)
-- Zend\Stdlib component
-- [Zend\Validator component](http://framework.zend.com/manual/current/en/modules/zend.validator.html)
+- [Zend\Stdlib component](http://framework.zend.com/manual/current/en/modules/zend.stdlib.hydrator.html)
 - [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF)
 - [GD extension](http://php.net/manual/en/book.image.php) (optional, used to add images)
 - [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write OOXML and ODF)
diff --git a/composer.json b/composer.json
index 6b8365bc..9cc03123 100644
--- a/composer.json
+++ b/composer.json
@@ -34,9 +34,9 @@
     "require": {
         "php": ">=5.3.3",
         "ext-xml": "*",
-        "zendframework/zend-escaper": "2.4.*",
-        "zendframework/zend-stdlib": "2.4.*",
-        "phpoffice/common": "0.2.*"
+        "zendframework/zend-escaper": "^2.2",
+        "zendframework/zend-stdlib": "^2.2",
+        "phpoffice/common": "^0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
diff --git a/docs/elements.rst b/docs/elements.rst
index c8f701d7..ede34568 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -158,8 +158,8 @@ Parameters:
 - ``$text``. Text that appears in the document.
 - ``$depth``. Depth of list item.
 - ``$fontStyle``. See :ref:`font-style`.
-- ``$listStyle``. List style of the current element TYPE\_NUMBER,
-   TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\_Style\_ListItem.
+- ``$listStyle``. List style of the current element TYPE\_NUMBER, 
+  TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\\Style\\ListItem.
 - ``$paragraphStyle``. See :ref:`paragraph-style`.
 
 Advanced usage:
@@ -297,7 +297,7 @@ Your TOC can only be generated if you have add at least one title (See "Titles")
 
 Options for ``$tocStyle``:
 
-- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in PHPWord\_Style\_TOC.
+- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in PHPWord\\Style\\TOC.
 - ``tabPos``. The position of the tab where the page number appears in twips.
 - ``indent``. The indent factor of the titles in twips.
 

From 41a048604e3c87f60263dc965dc58b35e437fd4a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Sep 2017 22:10:04 +0200
Subject: [PATCH 085/370] upgrade to dompdf/dompdf 0.8.*

---
 composer.json                               | 11 +++++------
 src/PhpWord/Writer/PDF/AbstractRenderer.php | 20 +++++++++++---------
 src/PhpWord/Writer/PDF/DomPDF.php           |  9 +++++----
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index c49eb9cd..b06ca3c0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         },
         {
             "name": "Franck Lefevre",
-            "homepage": "http://blog.rootslabs.net"
+            "homepage": "https://rootslabs.net/blog/"
         },
         {
             "name": "Ivan Lanin",
@@ -34,10 +34,9 @@
     "require": {
         "php": ">=5.3.3",
         "ext-xml": "*",
-        "zendframework/zend-escaper": "2.4.*",
-        "zendframework/zend-stdlib": "2.4.*",
-        "zendframework/zend-validator": "2.4.*",
-        "phpoffice/common": "0.2.*"
+        "zendframework/zend-escaper": "^2.2",
+        "zendframework/zend-stdlib": "^2.2",
+        "phpoffice/common": "^0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
@@ -45,7 +44,7 @@
         "squizlabs/php_codesniffer": "1.*",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",
-        "dompdf/dompdf":"0.6.*",
+        "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
         "mpdf/mpdf": "5.*"
     },
diff --git a/src/PhpWord/Writer/PDF/AbstractRenderer.php b/src/PhpWord/Writer/PDF/AbstractRenderer.php
index 2778aa52..1c6a8f0d 100644
--- a/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -83,15 +83,17 @@ abstract class AbstractRenderer extends HTML
     public function __construct(PhpWord $phpWord)
     {
         parent::__construct($phpWord);
-        $includeFile = Settings::getPdfRendererPath() . '/' . $this->includeFile;
-        if (file_exists($includeFile)) {
-            /** @noinspection PhpIncludeInspection Dynamic includes */
-            require_once $includeFile;
-        } else {
-            // @codeCoverageIgnoreStart
-            // Can't find any test case. Uncomment when found.
-            throw new Exception('Unable to load PDF Rendering library');
-            // @codeCoverageIgnoreEnd
+        if ($this->includeFile != null) {
+            $includeFile = Settings::getPdfRendererPath() . '/' . $this->includeFile;
+            if (file_exists($includeFile)) {
+                /** @noinspection PhpIncludeInspection Dynamic includes */
+                require_once $includeFile;
+            } else {
+                // @codeCoverageIgnoreStart
+                // Can't find any test case. Uncomment when found.
+                throw new Exception('Unable to load PDF Rendering library');
+                // @codeCoverageIgnoreEnd
+            }
         }
     }
 
diff --git a/src/PhpWord/Writer/PDF/DomPDF.php b/src/PhpWord/Writer/PDF/DomPDF.php
index e31f3aae..4dc89612 100644
--- a/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/src/PhpWord/Writer/PDF/DomPDF.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\Writer\WriterInterface;
+use Dompdf\Dompdf as DompdfLib;
 
 /**
  * DomPDF writer
@@ -32,7 +33,7 @@ class DomPDF extends AbstractRenderer implements WriterInterface
      *
      * @var string
      */
-    protected $includeFile = 'dompdf_config.inc.php';
+    protected $includeFile = null;
 
     /**
      * Save PhpWord to file.
@@ -49,9 +50,9 @@ class DomPDF extends AbstractRenderer implements WriterInterface
         $orientation = 'portrait';
 
         //  Create PDF
-        $pdf = new \DOMPDF();
-        $pdf->set_paper(strtolower($paperSize), $orientation);
-        $pdf->load_html($this->getContent());
+        $pdf = new DompdfLib();
+        $pdf->setPaper(strtolower($paperSize), $orientation);
+        $pdf->loadHtml(str_replace(PHP_EOL, '', $this->getContent()));
         $pdf->render();
 
         //  Write to file

From 9d57693acdbc43fa2a8de51a951988c5ade14caf Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Sep 2017 23:15:46 +0200
Subject: [PATCH 086/370] update phpunit & hide output during tests

---
 composer.json                         | 2 +-
 tests/PhpWord/PhpWordTest.php         | 1 +
 tests/PhpWord/Writer/ODTextTest.php   | 1 +
 tests/PhpWord/Writer/RTFTest.php      | 1 +
 tests/PhpWord/Writer/Word2007Test.php | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0cfa7d15..189b5478 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
+        "phpunit/phpunit": "4.8.*",
         "phpdocumentor/phpdocumentor":"2.*",
         "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "1.*",
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index 459c67a0..a7684a48 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -152,6 +152,7 @@ class PhpWordTest extends \PHPUnit_Framework_TestCase
      */
     public function testSave()
     {
+        $this->setOutputCallback(function() {});
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Hello world!');
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index d79a9d42..f4c2078a 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -102,6 +102,7 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
+        $this->setOutputCallback(function() {});
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Test');
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index 0b4f6b0f..cdf162e6 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -103,6 +103,7 @@ class RTFTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
+        $this->setOutputCallback(function() {});
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText(htmlspecialchars('Test', ENT_COMPAT, 'UTF-8'));
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 76ba2114..656ac6df 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -166,6 +166,7 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
      */
     public function testSetGetUseDiskCaching()
     {
+        $this->setOutputCallback(function() {});
         $phpWord = new PhpWord();
         $phpWord->addSection();
         $object = new Word2007($phpWord);

From f1aee39700ef7279ef423695af5aa30cadfba424 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Sep 2017 23:24:35 +0200
Subject: [PATCH 087/370] run code coverage analysis on 1 build only

---
 .travis.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74b77909..4dc889d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ matrix:
 env:
     global:
         - secure: "Sq+6bVtnPsu0mWX8DWQ+9bGAjxMcGorksUiHc4YIXEJsuDfVmVlH8tTD547IeCjDAx9MxXerZ2Z4HSjxTB70VEnJPvZMHI/EZn4Ny31YLHEthdZbV5Gd1h0TGp8VOzPKGShvGrtGBX6MvMfgpK4zuieVWbSfdKeecm8ZNLMpUd4="
+    include:
+        - php: 5.6
+            env: COVERAGE=1
 
 before_install:
     ## Packages
@@ -27,6 +30,8 @@ before_install:
     - sudo apt-get install -y graphviz
 
 before_script:
+    ## Deactivate xdebug if we don't do code coverage
+    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
     ## Composer
     - composer self-update
     - composer install --prefer-source
@@ -36,15 +41,15 @@ before_script:
 
 script:
     ## PHP_CodeSniffer
-    - ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
     ## PHP Mess Detector
-    - ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit
-    - ./vendor/bin/phpunit -c ./ --coverage-text --coverage-html ./build/coverage
+    - ./vendor/bin/phpunit -c ./ $(if [ -n "$COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi)
     ## PHPLOC
-    - ./vendor/bin/phploc src/
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phploc src/ ; fi
     ## PHPDocumentor
-    - ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 
 after_script:
     ## PHPDocumentor

From 6cd2633b85cd7d665621328983cdb03657cc11ed Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Sep 2017 23:38:44 +0200
Subject: [PATCH 088/370] fix travis config

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4dc889d2..4af4822e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ php:
 ##    - hhvm
 
 matrix:
+    include:
+        - php: 5.6
+          env: COVERAGE=1
     allow_failures:
         - php: 7.0
         - php: 7.1
@@ -20,9 +23,6 @@ matrix:
 env:
     global:
         - secure: "Sq+6bVtnPsu0mWX8DWQ+9bGAjxMcGorksUiHc4YIXEJsuDfVmVlH8tTD547IeCjDAx9MxXerZ2Z4HSjxTB70VEnJPvZMHI/EZn4Ny31YLHEthdZbV5Gd1h0TGp8VOzPKGShvGrtGBX6MvMfgpK4zuieVWbSfdKeecm8ZNLMpUd4="
-    include:
-        - php: 5.6
-            env: COVERAGE=1
 
 before_install:
     ## Packages

From 0115fc3d9106215e55ad6175a2c66ea6b1b996cf Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 14 Sep 2017 00:00:48 +0200
Subject: [PATCH 089/370] fix formating

---
 .travis.yml                                       | 3 +--
 tests/PhpWord/PhpWordTest.php                     | 3 ++-
 tests/PhpWord/Writer/ODTextTest.php               | 3 ++-
 tests/PhpWord/Writer/RTFTest.php                  | 3 ++-
 tests/PhpWord/Writer/Word2007/Part/StylesTest.php | 3 ++-
 tests/PhpWord/Writer/Word2007Test.php             | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4af4822e..da4af286 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,5 +55,4 @@ after_script:
     ## PHPDocumentor
     - bash .travis_shell_after_success.sh
     ## Scrutinizer
-    - wget https://scrutinizer-ci.com/ocular.phar
-    - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+    - if [ -n "$COVERAGE" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index a7684a48..ef0385b9 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -152,7 +152,8 @@ class PhpWordTest extends \PHPUnit_Framework_TestCase
      */
     public function testSave()
     {
-        $this->setOutputCallback(function() {});
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Hello world!');
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index f4c2078a..e3027424 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -102,7 +102,8 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
-        $this->setOutputCallback(function() {});
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Test');
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index cdf162e6..ff27229a 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -103,7 +103,8 @@ class RTFTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
-        $this->setOutputCallback(function() {});
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText(htmlspecialchars('Test', ENT_COMPAT, 'UTF-8'));
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 9153fe65..e3d89d0e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -115,7 +115,8 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($element);
     }
 
-    function testFontStyleBasedOnOtherFontStyle() {
+    function testFontStyleBasedOnOtherFontStyle()
+    {
         $phpWord = new PhpWord();
 
         $styleGenerationP = new Paragraph();
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 656ac6df..97f16c43 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -166,7 +166,8 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
      */
     public function testSetGetUseDiskCaching()
     {
-        $this->setOutputCallback(function() {});
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $phpWord->addSection();
         $object = new Word2007($phpWord);

From 8b0ce2e936fa63ae00a0e018d82ab9c39db17190 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 14 Sep 2017 00:12:29 +0200
Subject: [PATCH 090/370] commit doc based on php 5.6 build

---
 .travis_shell_after_success.sh                    | 2 +-
 tests/PhpWord/Writer/Word2007/Part/StylesTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis_shell_after_success.sh b/.travis_shell_after_success.sh
index 35c7a338..12728526 100644
--- a/.travis_shell_after_success.sh
+++ b/.travis_shell_after_success.sh
@@ -5,7 +5,7 @@ echo "TRAVIS_REPO_SLUG: $TRAVIS_REPO_SLUG"
 echo "TRAVIS_PHP_VERSION: $TRAVIS_PHP_VERSION"
 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
 
-if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.5" ]; then
+if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then
 
   echo -e "Publishing PHPDoc...\n"
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index e3d89d0e..0c0f7aef 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -115,7 +115,7 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($element);
     }
 
-    function testFontStyleBasedOnOtherFontStyle()
+    public function testFontStyleBasedOnOtherFontStyle()
     {
         $phpWord = new PhpWord();
 

From f6aafe48bb8c9c6607840373b934b85c350ea32e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 14 Sep 2017 22:16:35 +0200
Subject: [PATCH 091/370] Add php-cs

---
 .gitignore    |   1 +
 .php_cs.dist  | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++
 .travis.yml   |   9 +++-
 composer.json |   3 +-
 4 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 .php_cs.dist

diff --git a/.gitignore b/.gitignore
index 66e64406..42f03ebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ vendor
 phpword.ini
 /.buildpath
 /.project
+/.php_cs.cache
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 00000000..a08e2b21
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,146 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->notPath('src/PhpWord/Shared/PCLZip/pclzip.lib.php')
+    ->in('samples')
+    ->in('src')
+    ->in('tests');
+
+return PhpCsFixer\Config::create()
+        ->setRiskyAllowed(true)
+        ->setFinder($finder)
+        ->setRules([
+            'array_syntax' => ['syntax' => 'long'],
+            'binary_operator_spaces' => ['align_double_arrow' => true],
+            'blank_line_after_namespace' => true,
+            'blank_line_after_opening_tag' => true,
+            'blank_line_before_return' => true,
+            'braces' => true,
+            'cast_spaces' => true,
+            'class_definition' => true,
+            'class_keyword_remove' => false, // ::class keyword gives us beter support in IDE
+            'combine_consecutive_unsets' => true,
+            'concat_space' => ['spacing' => 'one'],
+            'declare_equal_normalize' => true,
+            'declare_strict_types' => false, // Too early to adopt strict types
+            'dir_constant' => true,
+            'elseif' => true,
+            'encoding' => true,
+            'ereg_to_preg' => true,
+            'full_opening_tag' => true,
+            'function_declaration' => true,
+            'function_typehint_space' => true,
+            'general_phpdoc_annotation_remove' => false, // No use for that
+            'hash_to_slash_comment' => true,
+            'header_comment' => false, // We don't use common header in all our files
+            'heredoc_to_nowdoc' => false, // Not sure about this one
+            'is_null' => false, // Risky
+            'include' => true,
+            'indentation_type' => true,
+            'line_ending' => true,
+            'linebreak_after_opening_tag' => true,
+            'lowercase_cast' => true,
+            'lowercase_constants' => true,
+            'lowercase_keywords' => true,
+            'mb_str_functions' => false, // No, too dangerous to change that
+            'method_argument_space' => true,
+            'method_separation' => true,
+            'modernize_types_casting' => true,
+            'native_function_casing' => true,
+            'native_function_invocation'=> false, // This is risky and seems to be micro-optimization that make code uglier so not worth it, at least for now
+            'new_with_braces' => true,
+            'no_alias_functions' => true,
+            'no_blank_lines_after_class_opening' => true,
+            'no_blank_lines_after_phpdoc' => true,
+            'no_blank_lines_before_namespace' => false, // we want 1 blank line before namespace
+            'no_closing_tag' => true,
+            'no_empty_comment' => true,
+            'no_empty_phpdoc' => true,
+            'no_empty_statement' => true,
+            'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'useTrait', 'curly_brace_block', 'parenthesis_brace_block', 'square_brace_block'],
+            'no_leading_import_slash' => true,
+            'no_leading_namespace_whitespace' => true,
+            'no_mixed_echo_print' => true,
+            'no_multiline_whitespace_around_double_arrow' => true,
+            'no_multiline_whitespace_before_semicolons' => true,
+            'no_php4_constructor' => true,
+            'no_short_bool_cast' => true,
+            'no_short_echo_tag' => true,
+            'no_singleline_whitespace_before_semicolons' => true,
+            'no_spaces_after_function_name' => true,
+            'no_spaces_around_offset' => true,
+            'no_spaces_inside_parenthesis' => true,
+            'no_trailing_comma_in_list_call' => true,
+            'no_trailing_comma_in_singleline_array' => true,
+            'no_trailing_whitespace' => true,
+            'no_trailing_whitespace_in_comment' => true,
+            'no_unneeded_control_parentheses' => true,
+            'no_unreachable_default_argument_value' => true,
+            'no_unused_imports' => true,
+            'no_useless_else' => true,
+            'no_useless_return' => true,
+            'no_whitespace_before_comma_in_array' => true,
+            'no_whitespace_in_blank_line' => true,
+            'normalize_index_brace' => true,
+            'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
+            'not_operator_with_successor_space' => false, // idem
+            'object_operator_without_whitespace' => true,
+            'ordered_class_elements' => false, // We prefer to keep some freedom
+            'ordered_imports' => true,
+            'php_unit_construct' => true,
+            'php_unit_dedicate_assert' => true,
+            'php_unit_fqcn_annotation' => true,
+            'php_unit_strict' => false, // We sometime actually need assertEquals
+            'phpdoc_add_missing_param_annotation' => true,
+            'phpdoc_align' => false, // Waste of time
+            'phpdoc_annotation_without_dot' => true,
+            'phpdoc_indent' => true,
+            'phpdoc_inline_tag' => true,
+            'phpdoc_no_access' => true,
+            'phpdoc_no_alias_tag' => false, //@see instead of @link
+            'phpdoc_no_empty_return' => true,
+            'phpdoc_no_package' => true,
+            'phpdoc_no_useless_inheritdoc' => true,
+            'phpdoc_order' => true,
+            'phpdoc_return_self_reference' => true,
+            'phpdoc_scalar' => true,
+            'phpdoc_separation' => false, //TODO
+            'phpdoc_single_line_var_spacing' => true,
+            'phpdoc_summary' => false,
+            'phpdoc_to_comment' => true,
+            'phpdoc_trim' => true,
+            'phpdoc_types' => true,
+            'phpdoc_var_without_name' => true,
+            'pow_to_exponentiation' => false,
+            'pre_increment' => true,
+            'protected_to_private' => true,
+            'psr0' => true,
+            'psr4' => true,
+            'random_api_migration' => false, // This breaks our unit tests
+            'return_type_declaration' => true,
+            'self_accessor' => true,
+            'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
+            'short_scalar_cast' => true,
+            'silenced_deprecation_error' => true,
+            'simplified_null_return' => false, // While technically correct we prefer to be explicit when returning null
+            'single_blank_line_at_eof' => true,
+            'single_blank_line_before_namespace' => false,//a lot of occurences TODO
+            'single_class_element_per_statement' => true,
+            'single_import_per_statement' => true,
+            'single_line_after_imports' => true,
+            'single_quote' => true,
+            'space_after_semicolon' => true,
+            'standardize_not_equals' => true,
+            'strict_comparison' => false, // No, too dangerous to change that
+            'strict_param' =>  false, // No, too dangerous to change that
+            'switch_case_semicolon_to_colon' => true,
+            'switch_case_space' => true,
+            'ternary_operator_spaces' => true,
+            'ternary_to_null_coalescing' => false, // Cannot use that with PHP 5.6
+            'trailing_comma_in_multiline_array' => true,
+            'trim_array_spaces' => false,
+            'unary_operator_spaces' => true,
+            'visibility_required' => true,
+            'whitespace_after_comma_in_array' => true,
+    ]);
diff --git a/.travis.yml b/.travis.yml
index da4af286..37234348 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ php:
     - 5.6
     - 7.0
     - 7.1
-##    - hhvm
 
 matrix:
     include:
@@ -18,7 +17,11 @@ matrix:
     allow_failures:
         - php: 7.0
         - php: 7.1
-##        - php: hhvm
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
 
 env:
     global:
@@ -42,6 +45,8 @@ before_script:
 script:
     ## PHP_CodeSniffer
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
+    ## PHP-CS-Fixer
+    #- if [ -z "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run ; fi
     ## PHP Mess Detector
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit
diff --git a/composer.json b/composer.json
index 189b5478..ab8b6aa6 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,8 @@
         "phpunit/phpunit": "4.8.*",
         "phpdocumentor/phpdocumentor":"2.*",
         "twig/twig":"1.27",
-        "squizlabs/php_codesniffer": "1.*",
+        "squizlabs/php_codesniffer": "^2.7",
+        "friendsofphp/php-cs-fixer": "^2.0",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",
         "dompdf/dompdf":"0.8.*",

From 8ce1a19ec4201ec1d2fc26e5dc685e54e10f1b13 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 17 Sep 2017 21:38:00 +0200
Subject: [PATCH 092/370] make FontStyle basedOn paragraph if the paragraph is
 set on the font (#926)

* make FontStyle based on paragraph if it set
* replace tab with spaces
* basedOn not correctly set if FontStyle is based on other FontStyle
* Fix warnings
---
 .../ComplexType/FootnoteProperties.php        | 16 ++---
 src/PhpWord/ComplexType/ProofState.php        |  4 +-
 src/PhpWord/Element/AbstractElement.php       |  6 +-
 src/PhpWord/Element/Comment.php               | 12 ++--
 src/PhpWord/Element/Image.php                 |  4 +-
 src/PhpWord/Element/Section.php               |  7 +-
 src/PhpWord/Escaper/AbstractEscaper.php       |  2 +-
 src/PhpWord/Escaper/EscaperInterface.php      |  2 +-
 src/PhpWord/Escaper/RegExp.php                |  2 +-
 src/PhpWord/Escaper/Rtf.php                   |  2 +-
 src/PhpWord/Escaper/Xml.php                   |  2 +-
 src/PhpWord/Metadata/Settings.php             |  8 +--
 src/PhpWord/Reader/MsDoc.php                  | 40 +++++------
 src/PhpWord/Reader/ODText/Content.php         |  1 -
 src/PhpWord/Reader/Word2007.php               |  1 -
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  2 -
 src/PhpWord/Reader/Word2007/Settings.php      |  8 +--
 src/PhpWord/Reader/Word2007/Styles.php        |  1 -
 src/PhpWord/Settings.php                      |  4 +-
 src/PhpWord/Shared/AbstractEnum.php           |  6 +-
 src/PhpWord/Shared/OLERead.php                |  1 -
 src/PhpWord/Style/Font.php                    |  4 +-
 src/PhpWord/Style/NumberingLevel.php          |  2 +-
 src/PhpWord/Style/Paragraph.php               |  4 +-
 src/PhpWord/TemplateProcessor.php             |  2 +-
 src/PhpWord/Writer/HTML/Part/AbstractPart.php |  2 +-
 src/PhpWord/Writer/RTF/Part/AbstractPart.php  |  2 +-
 .../Word2007/Element/AbstractElement.php      |  1 -
 src/PhpWord/Writer/Word2007/Part/Chart.php    |  1 -
 src/PhpWord/Writer/Word2007/Part/Settings.php |  5 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   | 11 ++-
 .../ComplexType/FootnotePropertiesTest.php    |  6 +-
 tests/PhpWord/PhpWordTest.php                 |  1 -
 .../Writer/Word2007/Part/StylesTest.php       | 69 +++++++++++++++++++
 tests/PhpWord/_includes/XmlDocument.php       |  1 -
 35 files changed, 153 insertions(+), 89 deletions(-)

diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
index 882834d5..0c1fb40e 100644
--- a/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -65,7 +65,7 @@ final class FootnoteProperties
 
     /**
      * Get the Footnote Positioning Location
-     * 
+     *
      * @return string
      */
     public function getPos()
@@ -75,7 +75,7 @@ final class FootnoteProperties
 
     /**
      * Set the Footnote Positioning Location (pageBottom, beneathText, sectEnd, docEnd)
-     * 
+     *
      * @param string $pos
      * @throws \InvalidArgumentException
      * @return self
@@ -99,7 +99,7 @@ final class FootnoteProperties
 
     /**
      * Get the Footnote Numbering Format
-     * 
+     *
      * @return string
      */
     public function getNumFmt()
@@ -109,7 +109,7 @@ final class FootnoteProperties
 
     /**
      * Set the Footnote Numbering Format
-     * 
+     *
      * @param string $numFmt One of NumberFormat
      * @return self
      */
@@ -122,7 +122,7 @@ final class FootnoteProperties
 
     /**
      * Get the Footnote Numbering Format
-     * 
+     *
      * @return double
      */
     public function getNumStart()
@@ -132,7 +132,7 @@ final class FootnoteProperties
 
     /**
      * Set the Footnote Numbering Format
-     * 
+     *
      * @param double $numStart
      * @return self
      */
@@ -144,7 +144,7 @@ final class FootnoteProperties
 
     /**
      * Get the Footnote and Endnote Numbering Starting Value
-     * 
+     *
      * @return string
      */
     public function getNumRestart()
@@ -154,7 +154,7 @@ final class FootnoteProperties
 
     /**
      * Set the Footnote and Endnote Numbering Starting Value (continuous, eachSect, eachPage)
-     * 
+     *
      * @param  string $numRestart
      * @throws \InvalidArgumentException
      * @return self
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
index e5ac9c20..daa705dd 100644
--- a/src/PhpWord/ComplexType/ProofState.php
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -51,7 +51,7 @@ final class ProofState
     /**
      * Set the Spell Checking State (dirty or clean)
      *
-     * @param string $spelling            
+     * @param string $spelling
      * @throws \InvalidArgumentException
      * @return self
      */
@@ -78,7 +78,7 @@ final class ProofState
     /**
      * Set the Grammatical Checking State (dirty or clean)
      *
-     * @param string $grammar            
+     * @param string $grammar
      * @throws \InvalidArgumentException
      * @return self
      */
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 8ff64194..f657dd1b 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -116,14 +116,14 @@ abstract class AbstractElement
 
     /**
      * The start position for the linked comment
-     * 
+     *
      * @var Comment
      */
     protected $commentRangeStart;
 
     /**
      * The end position for the linked comment
-     * 
+     *
      * @var Comment
      */
     protected $commentRangeEnd;
@@ -291,7 +291,7 @@ abstract class AbstractElement
 
     /**
      * Set comment start
-     * 
+     *
      * @param Comment $value
      */
     public function setCommentRangeStart(Comment $value)
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index def9d5a8..685ed296 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -31,14 +31,14 @@ class Comment extends TrackChange
 
     /**
      * The Element where this comment starts
-     * 
+     *
      * @var AbstractElement
      */
     private $startElement;
 
     /**
      * The Element where this comment ends
-     * 
+     *
      * @var AbstractElement
      */
     private $endElement;
@@ -76,7 +76,7 @@ class Comment extends TrackChange
 
     /**
      * Sets the element where this comment starts
-     * 
+     *
      * @param \PhpOffice\PhpWord\Element\AbstractElement $value
      */
     public function setStartElement(AbstractElement $value)
@@ -89,7 +89,7 @@ class Comment extends TrackChange
 
     /**
      * Get the element where this comment starts
-     * 
+     *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
     public function getStartElement()
@@ -99,7 +99,7 @@ class Comment extends TrackChange
 
     /**
      * Sets the element where this comment ends
-     * 
+     *
      * @param \PhpOffice\PhpWord\Element\AbstractElement $value
      */
     public function setEndElement(AbstractElement $value)
@@ -112,7 +112,7 @@ class Comment extends TrackChange
 
     /**
      * Get the element where this comment ends
-     * 
+     *
      * @return \PhpOffice\PhpWord\Element\AbstractElement
      */
     public function getEndElement()
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index b8b5cca1..1c8c520d 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -476,9 +476,9 @@ class Image extends AbstractElement
 
     /**
      * get image size from string
-     * 
+     *
      * @param string $source
-     * 
+     *
      * @codeCoverageIgnore this method is just a replacement for getimagesizefromstring which exists only as of PHP 5.4
      */
     private function getStringImageSize($source)
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 3758af99..e9beffcf 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -50,7 +50,7 @@ class Section extends AbstractContainer
 
     /**
      * The properties for the footnote of this section
-     * 
+     *
      * @var FootnoteProperties
      */
     private $footnoteProperties;
@@ -148,7 +148,7 @@ class Section extends AbstractContainer
 
     /**
      * Get the footnote properties
-     * 
+     *
      * @return \PhpOffice\PhpWord\Element\FooterProperties
      */
     public function getFootnotePropoperties()
@@ -158,7 +158,7 @@ class Section extends AbstractContainer
 
     /**
      * Set the footnote properties
-     * 
+     *
      * @param FootnoteProperties $footnoteProperties
      */
     public function setFootnoteProperties(FootnoteProperties $footnoteProperties = null)
@@ -219,7 +219,6 @@ class Section extends AbstractContainer
         } else {
             throw new \Exception('Invalid header/footer type.');
         }
-
     }
 
     /**
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index 6ddcbb51..8ce4e301 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -19,7 +19,7 @@ namespace PhpOffice\PhpWord\Escaper;
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 abstract class AbstractEscaper implements EscaperInterface
diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
index c34cf370..71cf36b4 100644
--- a/src/PhpWord/Escaper/EscaperInterface.php
+++ b/src/PhpWord/Escaper/EscaperInterface.php
@@ -19,7 +19,7 @@ namespace PhpOffice\PhpWord\Escaper;
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 interface EscaperInterface
diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
index de510bcf..dfcfb1e1 100644
--- a/src/PhpWord/Escaper/RegExp.php
+++ b/src/PhpWord/Escaper/RegExp.php
@@ -19,7 +19,7 @@ namespace PhpOffice\PhpWord\Escaper;
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class RegExp extends AbstractEscaper
diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
index 6f83604d..ec24c0af 100644
--- a/src/PhpWord/Escaper/Rtf.php
+++ b/src/PhpWord/Escaper/Rtf.php
@@ -19,7 +19,7 @@ namespace PhpOffice\PhpWord\Escaper;
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class Rtf extends AbstractEscaper
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
index 274cade5..3a0981aa 100644
--- a/src/PhpWord/Escaper/Xml.php
+++ b/src/PhpWord/Escaper/Xml.php
@@ -19,7 +19,7 @@ namespace PhpOffice\PhpWord\Escaper;
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class Xml extends AbstractEscaper
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 9b2c2285..cd0eaabe 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -203,7 +203,7 @@ class Settings
 
     /**
      * Get the Visibility of Annotation Types
-     * 
+     *
      * @return \PhpOffice\PhpWord\ComplexType\TrackChangesView
      */
     public function getRevisionView()
@@ -213,7 +213,7 @@ class Settings
 
     /**
      * Set the Visibility of Annotation Types
-     * 
+     *
      * @param TrackChangesView $trackChangesView
      */
     public function setRevisionView(TrackChangesView $trackChangesView = null)
@@ -293,7 +293,7 @@ class Settings
 
     /**
      * Returns the Radix Point for Field Code Evaluation
-     * 
+     *
      * @return string
      */
     public function getDecimalSymbol()
@@ -303,7 +303,7 @@ class Settings
 
     /**
      * sets the Radix Point for Field Code Evaluation
-     * 
+     *
      * @param string $decimalSymbol
      */
     public function setDecimalSymbol($decimalSymbol)
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index f21b2bf4..b3fdd9d4 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -1303,7 +1303,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         print_r('$sprm.ispmd : 0x'.dechex($sprm_IsPmd).PHP_EOL);
                         print_r('$sprm.f : 0x'.dechex($sprm_F).PHP_EOL);
                         print_r('$sprm.sgc : 0x'.dechex($sprm_Sgc));
-                        switch(dechex($sprm_Sgc)) {
+                        switch (dechex($sprm_Sgc)) {
                             case 0x01:
                                 print_r(' (Paragraph property)');
                                 break;
@@ -1322,12 +1322,12 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         }
                         print_r(PHP_EOL);
                         print_r('$sprm.spra : 0x'.dechex($sprm_Spra).PHP_EOL);
-                        switch(dechex($sprm_Spra)) {
+                        switch (dechex($sprm_Spra)) {
                             case 0x0:
                                 $operand = self::getInt1d($this->dataWorkDocument, $offset);
                                 $offset += 1;
                                 $cb -= 1;
-                                switch(dechex($operand)) {
+                                switch (dechex($operand)) {
                                     case 0x00:
                                         $operand = 'OFF';
                                         break;
@@ -1376,9 +1376,9 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         }
 
                         //
-                        switch(dechex($sprm_Sgc)) {
+                        switch (dechex($sprm_Sgc)) {
                             case 0x01: // Sprm is modifying a paragraph property.
-                                switch($sprm_IsPmd) {
+                                switch ($sprm_IsPmd) {
                                     case 0x0A: // sprmPIlvl
                                         print_r('sprmPIlvl : '.$operand.PHP_EOL.PHP_EOL);
                                         break;
@@ -1391,28 +1391,28 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                 }
                                 break;
                             case 0x02: // Sprm is modifying a character property.
-                                switch($sprm_IsPmd) {
+                                switch ($sprm_IsPmd) {
                                     default:
                                         print_r('$sprm_IsPmd(2) : '.$sprm_IsPmd.PHP_EOL.PHP_EOL);
                                         break;
                                 }
                                 break;
                             case 0x03: // Sprm is modifying a picture property.
-                                switch($sprm_IsPmd) {
+                                switch ($sprm_IsPmd) {
                                     default:
                                         print_r('$sprm_IsPmd(3) : '.$sprm_IsPmd.PHP_EOL.PHP_EOL);
                                         break;
                                 }
                                 break;
                             case 0x04: // Sprm is modifying a section property.
-                                switch($sprm_IsPmd) {
+                                switch ($sprm_IsPmd) {
                                     default:
                                         print_r('$sprm_IsPmd(4) : '.$sprm_IsPmd.PHP_EOL.PHP_EOL);
                                         break;
                                 }
                                 break;
                             case 0x05: // Sprm is modifying a table property.
-                                switch($sprm_IsPmd) {
+                                switch ($sprm_IsPmd) {
                                     default:
                                         print_r('$sprm_IsPmd(4) : '.$sprm_IsPmd.PHP_EOL.PHP_EOL);
                                         break;
@@ -1514,11 +1514,11 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $length = 0;
         $operand = null;
 
-        switch(dechex($oSprm->spra)) {
+        switch (dechex($oSprm->spra)) {
             case 0x0:
                 $operand = self::getInt1d($data, $pos);
                 $length = 1;
-                switch(dechex($operand)) {
+                switch (dechex($operand)) {
                     case 0x00:
                         $operand = false;
                         break;
@@ -1593,7 +1593,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
             $cbNum -= $arrayReturn['length'];
             $operand = $arrayReturn['operand'];
 
-            switch(dechex($oSprm->sgc)) {
+            switch (dechex($oSprm->sgc)) {
                 // Paragraph property
                 case 0x01:
                     break;
@@ -1602,7 +1602,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                     if (!isset($oStylePrl->styleFont)) {
                         $oStylePrl->styleFont = array();
                     }
-                    switch($oSprm->isPmd) {
+                    switch ($oSprm->isPmd) {
                         // sprmCFRMarkIns
                         case 0x01:
                             break;
@@ -1620,7 +1620,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         // sprmCFItalic
                         case 0x36:
                             // By default, text is not italicized.
-                            switch($operand) {
+                            switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['italic'] = $operand;
@@ -1640,7 +1640,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         // sprmCFBold
                         case 0x35:
                             // By default, text is not bold.
-                            switch($operand) {
+                            switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['bold'] = $operand;
@@ -1656,7 +1656,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         // sprmCFStrike
                         case 0x37:
                             // By default, text is not struck through.
-                            switch($operand) {
+                            switch ($operand) {
                                 case false:
                                 case true:
                                     $oStylePrl->styleFont['strikethrough'] = $operand;
@@ -1671,7 +1671,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             break;
                         // sprmCKul
                         case 0x3E:
-                            switch(dechex($operand)) {
+                            switch (dechex($operand)) {
                                 case 0x00:
                                     $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_NONE;
                                     break;
@@ -1734,7 +1734,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         // sprmCIco
                         //@link http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
                         case 0x42:
-                            switch(dechex($operand)) {
+                            switch (dechex($operand)) {
                                 case 0x00:
                                 case 0x01:
                                     $oStylePrl->styleFont['color'] = '000000';
@@ -1873,7 +1873,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                     if (!isset($oStylePrl->styleSection)) {
                         $oStylePrl->styleSection = array();
                     }
-                    switch($oSprm->isPmd) {
+                    switch ($oSprm->isPmd) {
                         // sprmSNfcPgn
                         case 0x0E:
                             // numbering format used for page numbers
@@ -1925,7 +1925,6 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         default:
                             // print_r('@todo Section : 0x'.dechex($oSprm->isPmd));
                             // print_r(PHP_EOL);
-
                     }
                     break;
                 // Table property
@@ -2285,7 +2284,6 @@ class MsDoc extends AbstractReader implements ReaderInterface
                     }
                 }
             }
-
         }
     }
 
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index 7362b02c..0e11147b 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -44,7 +44,6 @@ class Content extends AbstractPart
             foreach ($nodes as $node) {
                 // $styleName = $xmlReader->getAttribute('text:style-name', $node);
                 switch ($node->nodeName) {
-
                     case 'text:h': // Heading
                         $depth = $xmlReader->getAttribute('text:outline-level', $node);
                         $section->addTitle($node->nodeValue, $depth);
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index 875415a3..d203dd29 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -94,7 +94,6 @@ class Word2007 extends AbstractReader implements ReaderInterface
             $part->setRels($relationships);
             $part->read($phpWord);
         }
-
     }
 
     /**
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 51970a06..5aafcb0d 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -263,7 +263,6 @@ abstract class AbstractPart
         foreach ($tblNodes as $tblNode) {
             if ('w:tblGrid' == $tblNode->nodeName) { // Column
                 // @todo Do something with table columns
-
             } elseif ('w:tr' == $tblNode->nodeName) { // Row
                 $rowHeight = $xmlReader->getAttribute('w:val', $tblNode, 'w:trPr/w:trHeight');
                 $rowHRule = $xmlReader->getAttribute('w:hRule', $tblNode, 'w:trPr/w:trHeight');
@@ -279,7 +278,6 @@ abstract class AbstractPart
                 foreach ($rowNodes as $rowNode) {
                     if ('w:trPr' == $rowNode->nodeName) { // Row style
                         // @todo Do something with row style
-
                     } elseif ('w:tc' == $rowNode->nodeName) { // Cell
                         $cellWidth = $xmlReader->getAttribute('w:w', $rowNode, 'w:tcPr/w:tcW');
                         $cellStyle = null;
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index d2ffc1f3..7ade4dc5 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -68,7 +68,7 @@ class Settings extends AbstractPart
 
     /**
      * Sets the document protection
-     * 
+     *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
      * @param \DOMNode $node
@@ -83,7 +83,7 @@ class Settings extends AbstractPart
 
     /**
      * Sets the proof state
-     * 
+     *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
      * @param \DOMNode $node
@@ -105,7 +105,7 @@ class Settings extends AbstractPart
 
     /**
      * Sets the proof state
-     * 
+     *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
      * @param \DOMNode $node
@@ -122,7 +122,7 @@ class Settings extends AbstractPart
 
     /**
      * Set the Revision view
-     * 
+     *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
      * @param \DOMNode $node
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index 645c9830..c38ca144 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -49,7 +49,6 @@ class Styles extends AbstractPart
                 preg_match('/Heading(\d)/', $name, $headingMatches);
                 // $default = ($xmlReader->getAttribute('w:default', $node) == 1);
                 switch ($type) {
-
                     case 'paragraph':
                         $paragraphStyle = $this->readParagraphStyle($xmlReader, $node);
                         $fontStyle = $this->readFontStyle($xmlReader, $node);
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 70fad3e8..5309baf7 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -318,7 +318,7 @@ class Settings
 
     /**
      * @since 0.13.0
-     * 
+     *
      * @return boolean
      *
      * @codeCoverageIgnore
@@ -330,7 +330,7 @@ class Settings
 
     /**
      * @since 0.13.0
-     * 
+     *
      * @param boolean $outputEscapingEnabled
      *
      * @codeCoverageIgnore
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index f116e511..35a5749a 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -21,7 +21,7 @@ abstract class AbstractEnum
 
     /**
      * Returns all values for this enum
-     * 
+     *
      * @return array
      */
     public static function values()
@@ -31,7 +31,7 @@ abstract class AbstractEnum
 
     /**
      * Returns true the value is valid for this enum
-     * 
+     *
      * @param strign $value
      * @return boolean true if value is valid
      */
@@ -43,7 +43,7 @@ abstract class AbstractEnum
 
     /**
      * Validates that the value passed is a valid value
-     * 
+     *
      * @param string $value
      * @throws \InvalidArgumentException if the value passed is not valid for this enum
      */
diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index cf9b15d3..aa671522 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -294,7 +294,6 @@ class OLERead
 
             $offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
         }
-
     }
 
     /**
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index b625e3b8..5cc80fb3 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -223,7 +223,7 @@ class Font extends AbstractStyle
     private $shading;
 
     /**
-     * Right to left languages 
+     * Right to left languages
      * @var boolean
      */
     private $rtl = false;
@@ -725,7 +725,7 @@ class Font extends AbstractStyle
     }
 
     /**
-     * Set shading
+     * Set Paragraph
      *
      * @param mixed $value
      * @return self
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 38b9fbee..9da1a2b1 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -85,7 +85,7 @@ class NumberingLevel extends AbstractStyle
 
     /**
      * Justification, w:lvlJc
-     * 
+     *
      * @var string, one of PhpOffice\PhpWord\SimpleType\Jc
      */
     private $alignment = '';
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index bad9ace9..8d342550 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -742,7 +742,7 @@ class Paragraph extends Border
     
     /**
      * Get contextualSpacing
-     * 
+     *
      * @return bool
      */
     public function hasContextualSpacing()
@@ -752,7 +752,7 @@ class Paragraph extends Border
 
     /**
      * Set contextualSpacing
-     * 
+     *
      * @param bool $contextualSpacing
      * @return self
      */
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index e7a8d039..2f6d6258 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -147,7 +147,7 @@ class TemplateProcessor
 
     /**
      * Applies XSL style sheet to template's parts.
-     * 
+     *
      * Note: since the method doesn't make any guess on logic of the provided XSL style sheet,
      * make sure that output is correctly escaped. Otherwise you may get broken document.
      *
diff --git a/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 638f846b..584e4489 100644
--- a/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -48,7 +48,7 @@ abstract class AbstractPart
 
     /**
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     * 
+     *
      * @return void
      */
     public function setParentWriter(AbstractWriter $writer = null)
diff --git a/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 152493db..04fb4cfd 100644
--- a/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -48,7 +48,7 @@ abstract class AbstractPart
 
     /**
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     * 
+     *
      * @return void
      */
     public function setParentWriter(AbstractWriter $writer = null)
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 79877b10..305a768e 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -134,7 +134,6 @@ abstract class AbstractElement
             }
 
             $this->xmlWriter->writeElementBlock('w:commentRangeStart', array('w:id' => $comment->getElementId()));
-
         }
     }
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 3dd3968b..86045b9a 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -213,7 +213,6 @@ class Chart extends AbstractPart
             $xmlWriter->endElement(); // c:ser
             $index++;
         }
-
     }
 
     /**
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 529d47af..d2cb8117 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -161,7 +161,7 @@ class Settings extends AbstractPart
 
     /**
      * Adds a boolean attribute to the settings array
-     * 
+     *
      * @param string $settingName
      * @param boolean $booleanValue
      */
@@ -219,7 +219,6 @@ class Settings extends AbstractPart
     private function setRevisionView(TrackChangesView $trackChangesView = null)
     {
         if ($trackChangesView != null) {
-
             $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true': 'false';
             $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true': 'false';
             $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true': 'false';
@@ -232,7 +231,7 @@ class Settings extends AbstractPart
 
     /**
      * Set the magnification
-     * 
+     *
      * @param mixed $zoom
      */
     private function setZoom($zoom = null)
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 7bcb8d92..01b84c08 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -170,6 +170,9 @@ class Styles extends AbstractPart
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
+        } else if (!is_null($paragraphStyle)) {
+            // if type is 'paragraph' it should have a styleId
+            $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
 
         // Style name
@@ -178,7 +181,13 @@ class Styles extends AbstractPart
         $xmlWriter->endElement();
 
         // Parent style
-        $xmlWriter->writeElementIf(!is_null($paragraphStyle), 'w:basedOn', 'w:val', 'Normal');
+        if (!is_null($paragraphStyle)) {
+            if ($paragraphStyle->getStyleName() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getStyleName());
+            } elseif ($paragraphStyle->getBasedOn() != null) {
+                $xmlWriter->writeElementBlock('w:basedOn', 'w:val', $paragraphStyle->getBasedOn());
+            }
+        }
 
         // w:pPr
         if (!is_null($paragraphStyle)) {
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index 025e8c91..39392fcd 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -47,7 +47,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Test throws exception if wrong position given
-     * 
+     *
      * @expectedException \InvalidArgumentException
      */
     public function testWrongPos()
@@ -58,7 +58,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Test throws exception if wrong number format given
-     * 
+     *
      * @expectedException \InvalidArgumentException
      */
     public function testWrongNumFmt()
@@ -69,7 +69,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Test throws exception if wrong number restart given
-     * 
+     *
      * @expectedException \InvalidArgumentException
      */
     public function testWrongNumRestart()
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index 459c67a0..b49666f5 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -99,7 +99,6 @@ class PhpWordTest extends \PHPUnit_Framework_TestCase
             $phpWord->$method($styleId, array());
             $this->assertInstanceOf("PhpOffice\\PhpWord\\Style\\{$value}", Style::getStyle($styleId));
         }
-
     }
 
     /**
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index f40387a1..0c0f7aef 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -18,7 +18,10 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles
@@ -74,4 +77,70 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement($path, $file);
         $this->assertEquals('Normal', $element->getAttribute('w:val'));
     }
+
+    public function testFontStyleBasedOn()
+    {
+        $phpWord = new PhpWord();
+
+        $baseParagraphStyle = new Paragraph();
+        $baseParagraphStyle->setAlignment(Jc::CENTER);
+        $baseParagraphStyle = $phpWord->addParagraphStyle('BaseStyle', $baseParagraphStyle);
+         
+        $childFont = new Font();
+        $childFont->setParagraph($baseParagraphStyle);
+        $childFont->setSize(16);
+        $childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
+         
+        $otherFont = new Font();
+        $otherFont->setSize(20);
+        $otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        // Normal style generated?
+        $path = '/w:styles/w:style[@w:styleId="BaseStyle"]/w:name';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style with paragraph should have it's base style set to that paragraphs style name
+        $path = '/w:styles/w:style[w:name/@w:val="ChildFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('BaseStyle', $element->getAttribute('w:val'));
+
+        // Font style without paragraph should not have a base style set
+        $path = '/w:styles/w:style[w:name/@w:val="OtherFontStyle"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertNull($element);
+    }
+
+    public function testFontStyleBasedOnOtherFontStyle()
+    {
+        $phpWord = new PhpWord();
+
+        $styleGenerationP = new Paragraph();
+        $styleGenerationP->setAlignment(Jc::BOTH);
+
+        $styleGeneration = new Font();
+        $styleGeneration->setParagraph($styleGenerationP);
+        $styleGeneration->setSize(9.5);
+        $phpWord->addFontStyle('Generation', $styleGeneration);
+
+        $styleGenerationEteinteP = new Paragraph();
+        $styleGenerationEteinteP->setBasedOn('Generation');
+
+        $styleGenerationEteinte = new Font();
+        $styleGenerationEteinte->setParagraph($styleGenerationEteinteP);
+        $styleGenerationEteinte->setSize(8.5);
+        $phpWord->addFontStyle('GeneratEteinte', $styleGenerationEteinte);
+        
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/styles.xml';
+
+        $path = '/w:styles/w:style[@w:styleId="GeneratEteinte"]/w:basedOn';
+        $element = $doc->getElement($path, $file);
+        $this->assertEquals('Generation', $element->getAttribute('w:val'));
+    }
 }
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 72b18c29..c3bab0f6 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -96,7 +96,6 @@ class XmlDocument
 
         if (null === $this->xpath) {
             $this->xpath = new \DOMXpath($this->dom);
-
         }
 
         return $this->xpath->query($path);

From 34a1be00532b296a4677b576514e297e2b9652b6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 18 Sep 2017 21:45:59 +0200
Subject: [PATCH 093/370] Add support for XE and INDEX fields (#922)

---
 docs/elements.rst                             |  30 ++++-
 samples/Sample_27_Field.php                   |  24 +++-
 src/PhpWord/Element/AbstractContainer.php     |   2 +-
 src/PhpWord/Element/Field.php                 |  61 +++++++++-
 src/PhpWord/Writer/Word2007/Element/Field.php | 111 ++++++++++++++----
 tests/PhpWord/Element/FieldTest.php           |  53 +++++++++
 tests/PhpWord/Writer/Word2007/ElementTest.php |  46 ++++++++
 7 files changed, 295 insertions(+), 32 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index ede34568..a35eb654 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -377,7 +377,35 @@ To be completed
 Fields
 ------
 
-To be completed
+Currently the following fields are supported: 
+
+- PAGE
+- NUMPAGES
+- DATE
+- XE
+- INDEX
+
+.. code-block:: php
+
+    $section->addField($fieldType, [$properties], [$options], [$fieldText])
+
+See ``\PhpOffice\PhpWord\Element\Field`` for list of properties and options available for each field type.
+Options which are not specifically defined can be added. Those must start with a ``\``.
+
+For instance for the INDEX field, you can do the following (See `Index Field for list of available options <https://support.office.com/en-us/article/Field-codes-Index-field-adafcf4a-cb30-43f6-85c7-743da1635d9e?ui=en-US&rs=en-US&ad=US>`_ ):
+
+.. code-block:: php
+
+    //the $fieldText can be either a simple string
+    $fieldText = 'The index value';
+
+    //or a 'TextRun', to be able to format the text you want in the index
+    $fieldText = new TextRun();
+    $fieldText->addText('My ');
+    $fieldText->addText('bold index', ['bold' => true]);
+    $fieldText->addText(' entry');
+
+    $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), $fieldText);
 
 Line
 ------
diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index 57747895..b5be12ca 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -1,4 +1,6 @@
 <?php
+use PhpOffice\PhpWord\Element\TextRun;
+
 include_once 'Sample_Header.php';
 
 // New Word document
@@ -14,10 +16,28 @@ $section->addText('Date field:');
 $section->addField('DATE', array('dateformat' => 'dddd d MMMM yyyy H:mm:ss'), array('PreserveFormat'));
 
 $section->addText('Page field:');
-$section->addField('PAGE', array('format' => 'ArabicDash'));
+$section->addField('PAGE', array('format' => 'Arabic'));
 
 $section->addText('Number of pages field:');
-$section->addField('NUMPAGES', array('format' => 'Arabic', 'numformat' => '0,00'), array('PreserveFormat'));
+$section->addField('NUMPAGES', array('numformat' => '0,00', 'format' => 'Arabic'), array('PreserveFormat'));
+
+$textrun = $section->addTextRun();
+$textrun->addText('An index field is ');
+$textrun->addField('XE', array(), array('Italic'), 'My first index');
+$textrun->addText('here:');
+
+$indexEntryText = new TextRun();
+$indexEntryText->addText('My ');
+$indexEntryText->addText('bold index', ['bold' => true]);
+$indexEntryText->addText(' entry');
+
+$textrun = $section->addTextRun();
+$textrun->addText('A complex index field is ');
+$textrun->addField('XE', array(), array('Bold'), $indexEntryText);
+$textrun->addText('here:');
+
+$section->addText('The actual index:');
+$section->addField('INDEX', array(), array('\\e "	"'), 'right click to update the index');
 
 $textrun = $section->addTextRun(array('alignment' => \PhpOffice\PhpWord\SimpleType\Jc::CENTER));
 $textrun->addText('This is the date of lunar calendar ');
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 0dbfe750..d5b4cc62 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -39,7 +39,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
  * @method Object addObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
- * @method Field addField(string $type = null, array $properties = array(), array $options = array())
+ * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
  * @method Line addLine(mixed $lineStyle = null)
  * @method Shape addShape(string $type, mixed $style = null)
  * @method Chart addChart(string $type, array $categories, array $values, array $style = null)
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 48dc1d2e..380d7a92 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -40,7 +40,8 @@ class Field extends AbstractElement
         ),
         'NUMPAGES'=>array(
            'properties'=>array(
-               'format' => array('Arabic', 'ArabicDash', 'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN'),
+               'format' => array('Arabic', 'ArabicDash', 'CardText', 'DollarText', 'Ordinal', 'OrdText',
+                   'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper'),
                'numformat' => array('0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%')
            ),
            'options'=>array('PreserveFormat')
@@ -52,6 +53,14 @@ class Field extends AbstractElement
                     'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss')
             ),
             'options'=>array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat')
+        ),
+        'XE'=>array(
+            'properties' => array(),
+            'options' => array('Bold', 'Italic')
+        ),
+        'INDEX'=>array(
+            'properties' => array(),
+            'options' => array('PreserveFormat')
         )
     );
 
@@ -62,6 +71,13 @@ class Field extends AbstractElement
      */
     protected $type;
 
+    /**
+     * Field text
+     *
+     * @var TextRun | string
+     */
+    protected $text;
+
     /**
      * Field properties
      *
@@ -82,12 +98,14 @@ class Field extends AbstractElement
      * @param string $type
      * @param array $properties
      * @param array $options
+     * @param TextRun | string $text
      */
-    public function __construct($type = null, $properties = array(), $options = array())
+    public function __construct($type = null, $properties = array(), $options = array(), $text = null)
     {
         $this->setType($type);
         $this->setProperties($properties);
         $this->setOptions($options);
+        $this->setText($text);
     }
 
     /**
@@ -105,7 +123,7 @@ class Field extends AbstractElement
             if (isset($this->fieldsArray[$type])) {
                 $this->type = $type;
             } else {
-                throw new \InvalidArgumentException("Invalid type");
+                throw new \InvalidArgumentException("Invalid type '$type'");
             }
         }
         return $this->type;
@@ -135,7 +153,7 @@ class Field extends AbstractElement
         if (is_array($properties)) {
             foreach (array_keys($properties) as $propkey) {
                 if (!(isset($this->fieldsArray[$this->type]['properties'][$propkey]))) {
-                    throw new \InvalidArgumentException("Invalid property");
+                    throw new \InvalidArgumentException("Invalid property '$propkey'");
                 }
             }
             $this->properties = array_merge($this->properties, $properties);
@@ -166,8 +184,8 @@ class Field extends AbstractElement
     {
         if (is_array($options)) {
             foreach (array_keys($options) as $optionkey) {
-                if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey]))) {
-                    throw new \InvalidArgumentException("Invalid option");
+                if (!(isset($this->fieldsArray[$this->type]['options'][$optionkey])) && substr($optionkey, 0, 1) !== '\\') {
+                    throw new \InvalidArgumentException("Invalid option '$optionkey', possible values are " . implode(', ', $this->fieldsArray[$this->type]['options']));
                 }
             }
             $this->options = array_merge($this->options, $options);
@@ -184,4 +202,35 @@ class Field extends AbstractElement
     {
         return $this->options;
     }
+
+    /**
+     * Set Field text
+     *
+     * @param string | TextRun $text
+     *
+     * @return string | TextRun
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function setText($text)
+    {
+        if (isset($text)) {
+            if (is_string($text) || $text instanceof TextRun) {
+                $this->text = $text;
+            } else {
+                throw new \InvalidArgumentException("Invalid text");
+            }
+        }
+        return $this->text;
+    }
+
+    /**
+     * Get Field text
+     *
+     * @return string | TextRun
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index ae4c66ba..9fc45b21 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -37,16 +37,90 @@ class Field extends Text
             return;
         }
 
+        $this->startElementP();
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'begin');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
         $instruction = ' ' . $element->getType() . ' ';
+        if ($element->getText() != null) {
+            if (is_string($element->getText())) {
+                $instruction .= '"' . $element->getText() . '" ';
+                $instruction .= $this->buildPropertiesAndOptions($element);
+            } else {
+                $instruction .= '"';
+            }
+        } else {
+            $instruction .= $this->buildPropertiesAndOptions($element);
+        }
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:instrText');
+        $xmlWriter->writeAttribute('xml:space', 'preserve');
+        $xmlWriter->text($instruction);
+        $xmlWriter->endElement(); // w:instrText
+        $xmlWriter->endElement(); // w:r
+
+        if ($element->getText() != null) {
+            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
+
+                $containerWriter = new Container($xmlWriter, $element->getText(), true);
+                $containerWriter->write();
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->text('"' . $this->buildPropertiesAndOptions($element));
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+
+                $xmlWriter->startElement('w:r');
+                $xmlWriter->startElement('w:instrText');
+                $xmlWriter->writeAttribute('xml:space', 'preserve');
+                $xmlWriter->text(' ');
+                $xmlWriter->endElement(); // w:instrText
+                $xmlWriter->endElement(); // w:r
+            }
+        }
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'separate');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:rPr');
+        $xmlWriter->startElement('w:noProof');
+        $xmlWriter->endElement(); // w:noProof
+        $xmlWriter->endElement(); // w:rPr
+        $xmlWriter->writeElement('w:t', $element->getText() != null && is_string($element->getText()) ? $element->getText() : '1');
+        $xmlWriter->endElement(); // w:r
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'end');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $this->endElementP(); // w:p
+    }
+
+    private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
+    {
+        $propertiesAndOptions = '';
         $properties  = $element->getProperties();
         foreach ($properties as $propkey => $propval) {
             switch ($propkey) {
                 case 'format':
+                    $propertiesAndOptions.= '\* ' . $propval . ' ';
+                    break;
                 case 'numformat':
-                    $instruction .= '\* ' . $propval . ' ';
+                    $propertiesAndOptions.= '\# ' . $propval . ' ';
                     break;
                 case 'dateformat':
-                    $instruction .= '\@ "' . $propval . '" ';
+                    $propertiesAndOptions.= '\@ "' . $propval . '" ';
                     break;
             }
         }
@@ -55,34 +129,27 @@ class Field extends Text
         foreach ($options as $option) {
             switch ($option) {
                 case 'PreserveFormat':
-                    $instruction .= '\* MERGEFORMAT ';
+                    $propertiesAndOptions.= '\* MERGEFORMAT ';
                     break;
                 case 'LunarCalendar':
-                    $instruction .= '\h ';
+                    $propertiesAndOptions.= '\h ';
                     break;
                 case 'SakaEraCalendar':
-                    $instruction .= '\s ';
+                    $propertiesAndOptions.= '\s ';
                     break;
                 case 'LastUsedFormat':
-                    $instruction .= '\l ';
+                    $propertiesAndOptions.= '\l ';
                     break;
+                case 'Bold':
+                    $propertiesAndOptions.= '\b ';
+                    break;
+                case 'Italic':
+                    $propertiesAndOptions.= '\i ';
+                    break;
+                default:
+                    $propertiesAndOptions.= $option .' ';
             }
         }
-
-        $this->startElementP();
-
-        $xmlWriter->startElement('w:fldSimple');
-        $xmlWriter->writeAttribute('w:instr', $instruction);
-        $xmlWriter->startElement('w:r');
-        $xmlWriter->startElement('w:rPr');
-        $xmlWriter->startElement('w:noProof');
-        $xmlWriter->endElement(); // w:noProof
-        $xmlWriter->endElement(); // w:rPr
-
-        $xmlWriter->writeElement('w:t', '1');
-        $xmlWriter->endElement(); // w:r
-        $xmlWriter->endElement(); // w:fldSimple
-
-        $this->endElementP(); // w:p
+        return $propertiesAndOptions;
     }
 }
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index b9afad1f..6f5ebbbf 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -70,6 +70,47 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('SakaEraCalendar', 'PreserveFormat'), $oField->getOptions());
     }
 
+    /**
+     * New instance with type and properties and options and text
+     */
+    public function testConstructWithTypePropertiesOptionsText()
+    {
+        $oField = new Field('XE', array(), array('Bold', 'Italic'), 'FieldValue');
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('XE', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('Bold', 'Italic'), $oField->getOptions());
+        $this->assertEquals('FieldValue', $oField->getText());
+    }
+
+    /**
+     * New instance with type and properties and options and text as TextRun
+     */
+    public function testConstructWithTypePropertiesOptionsTextAsTextRun()
+    {
+        $textRun = new TextRun();
+        $textRun->addText('test string');
+
+        $oField = new Field('XE', array(), array('Bold', 'Italic'), $textRun);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('XE', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('Bold', 'Italic'), $oField->getOptions());
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oField->getText());
+    }
+
+    public function testConstructWithOptionValue()
+    {
+        $oField = new Field('INDEX', array(), array('\\c "3" \\h "A"'));
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Field', $oField);
+        $this->assertEquals('INDEX', $oField->getType());
+        $this->assertEquals(array(), $oField->getProperties());
+        $this->assertEquals(array('\\c "3" \\h "A"'), $oField->getOptions());
+    }
+
     /**
      * Test setType exception
      *
@@ -105,4 +146,16 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $object = new Field('PAGE');
         $object->setOptions(array('foo' => 'bar'));
     }
+
+    /**
+     * Test setText exception
+     *
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid text
+     */
+    public function testSetTextException()
+    {
+        $object = new Field('XE');
+        $object->setText(array());
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 027ba86a..b3c7b197 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007;
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Element\TextRun;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Element subnamespace
@@ -192,6 +193,51 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testFieldElement()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $section->addField('INDEX', array(), array('\\c "3"'));
+        $section->addField('XE', array(), array('Bold', 'Italic'), 'Index Entry');
+        $section->addField('DATE', array('dateformat' => 'd-M-yyyy'), array('PreserveFormat', 'LastUsedFormat'));
+        $section->addField('DATE', array(), array('LunarCalendar'));
+        $section->addField('DATE', array(), array('SakaEraCalendar'));
+        $section->addField('NUMPAGES', array('format' => 'roman', 'numformat' => '0,00'), array('SakaEraCalendar'));
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p/w:r/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' INDEX \\c "3" ', $doc->getElement($element)->textContent);
+    }
+
+    public function testFieldElementWithComplexText()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $text = new TextRun();
+        $text->addText('test string', array('bold' => true));
+
+        $section->addField('XE', array(), array('Bold', 'Italic'), $text);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p/w:r[2]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' XE "', $doc->getElement($element)->textContent);
+
+        $element = '/w:document/w:body/w:p/w:r[3]/w:rPr/w:b';
+        $this->assertTrue($doc->elementExists($element));
+
+        $element = '/w:document/w:body/w:p/w:r[3]/w:t';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('test string', $doc->getElement($element)->textContent);
+
+        $element = '/w:document/w:body/w:p/w:r[4]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('"\\b \\i ', $doc->getElement($element)->textContent);
+    }
+
     /**
      * Test form fields
      */

From 743dbff9d4ab6e32a45284acd1eacdd9884ac183 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 18 Sep 2017 22:35:27 +0200
Subject: [PATCH 094/370] use php 5.3 array construct

---
 samples/Sample_27_Field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index b5be12ca..ec9dbe25 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -28,7 +28,7 @@ $textrun->addText('here:');
 
 $indexEntryText = new TextRun();
 $indexEntryText->addText('My ');
-$indexEntryText->addText('bold index', ['bold' => true]);
+$indexEntryText->addText('bold index', array('bold' => true));
 $indexEntryText->addText(' entry');
 
 $textrun = $section->addTextRun();

From 0be9ae335362d83f80230c68ca5704e5e8c5cc7b Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Sep 2017 07:00:58 +0200
Subject: [PATCH 095/370] Fix php-cs option

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fbcc4dd5..f2730575 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
     ## PHP_CodeSniffer
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
     ## PHP-CS-Fixer
-    - if [ -z "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run --cache-dir=$HOME/.php-cs-fixer ; fi
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run --cache-file=$HOME/.php-cs-fixer ; fi
     ## PHP Mess Detector
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit

From 3f3f398524aea7936f9464db8888affeb7fadd2d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Sep 2017 21:30:59 +0200
Subject: [PATCH 096/370] php-cs fix

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f2730575..0f4d2532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ cache:
     directories:
         - vendor
         - $HOME/.composer/cache
-        - $HOME/.php-cs-fixer
+        - .php-cs.cache
 
 env:
     global:
@@ -47,7 +47,7 @@ script:
     ## PHP_CodeSniffer
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
     ## PHP-CS-Fixer
-    - if [ -z "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run --cache-file=$HOME/.php-cs-fixer ; fi
+    - if [ -n "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run --cache-file=.php-cs.cache ; fi
     ## PHP Mess Detector
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit

From 5364feb6c86a902584c350674e85b8bb11ff6c9c Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Sep 2017 22:48:53 +0200
Subject: [PATCH 097/370] remove cache-file option

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0f4d2532..0ec84081 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
     ## PHP_CodeSniffer
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
     ## PHP-CS-Fixer
-    - if [ -n "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run --cache-file=.php-cs.cache ; fi
+    - if [ -n "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run ; fi
     ## PHP Mess Detector
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit

From e0a2c40fb4c777c5f09fdcd6033e0b008e3493ea Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 26 Sep 2017 08:01:28 +0200
Subject: [PATCH 098/370] fix failing test

---
 tests/bootstrap.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e75a1c34..1fcdbc40 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -14,7 +14,6 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
-
 require_once __DIR__ . '/../bootstrap.php';
 
 date_default_timezone_set('UTC');

From cb469b973ee44183dbe3df1497a53a4c8acfef97 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 26 Sep 2017 17:34:57 +0200
Subject: [PATCH 099/370] more fixes

---
 .php_cs.dist                                  |  4 ++--
 src/PhpWord/Collection/AbstractCollection.php |  2 +-
 src/PhpWord/Collection/Bookmarks.php          |  1 +
 src/PhpWord/Collection/Charts.php             |  1 +
 src/PhpWord/Collection/Comments.php           |  1 +
 src/PhpWord/Collection/Endnotes.php           |  1 +
 src/PhpWord/Collection/Footnotes.php          |  1 +
 src/PhpWord/Collection/Titles.php             |  1 +
 .../ComplexType/FootnoteProperties.php        |  1 +
 src/PhpWord/ComplexType/ProofState.php        |  1 +
 src/PhpWord/ComplexType/TrackChangesView.php  |  1 +
 src/PhpWord/Element/AbstractContainer.php     |  1 +
 src/PhpWord/Element/AbstractElement.php       |  1 +
 src/PhpWord/Element/Bookmark.php              |  1 +
 src/PhpWord/Element/Cell.php                  |  1 +
 src/PhpWord/Element/Chart.php                 |  3 +--
 src/PhpWord/Element/CheckBox.php              |  1 +
 src/PhpWord/Element/Comment.php               |  1 +
 src/PhpWord/Element/Endnote.php               |  1 +
 src/PhpWord/Element/Field.php                 |  1 +
 src/PhpWord/Element/Footer.php                |  2 +-
 src/PhpWord/Element/Footnote.php              |  1 +
 src/PhpWord/Element/FormField.php             |  1 +
 src/PhpWord/Element/Header.php                |  1 +
 src/PhpWord/Element/Image.php                 |  1 +
 src/PhpWord/Element/Line.php                  |  1 +
 src/PhpWord/Element/Link.php                  |  1 +
 src/PhpWord/Element/ListItem.php              |  1 +
 src/PhpWord/Element/ListItemRun.php           |  1 +
 src/PhpWord/Element/Object.php                |  2 +-
 src/PhpWord/Element/PageBreak.php             |  1 +
 src/PhpWord/Element/PreserveText.php          |  1 +
 src/PhpWord/Element/Row.php                   |  1 +
 src/PhpWord/Element/SDT.php                   |  1 +
 src/PhpWord/Element/Section.php               |  2 +-
 src/PhpWord/Element/Shape.php                 |  1 +
 src/PhpWord/Element/TOC.php                   |  3 +--
 src/PhpWord/Element/Table.php                 |  2 +-
 src/PhpWord/Element/Text.php                  |  1 +
 src/PhpWord/Element/TextBox.php               |  1 +
 src/PhpWord/Element/TextBreak.php             |  1 +
 src/PhpWord/Element/TextRun.php               |  1 +
 src/PhpWord/Element/Title.php                 |  1 +
 src/PhpWord/Element/TrackChange.php           |  1 +
 src/PhpWord/Escaper/AbstractEscaper.php       |  1 +
 src/PhpWord/Escaper/EscaperInterface.php      |  1 +
 src/PhpWord/Escaper/RegExp.php                |  1 +
 src/PhpWord/Escaper/Rtf.php                   |  1 +
 src/PhpWord/Escaper/Xml.php                   |  1 +
 src/PhpWord/Exception/CopyFileException.php   |  1 +
 .../CreateTemporaryFileException.php          |  1 +
 src/PhpWord/Exception/Exception.php           |  1 +
 .../Exception/InvalidImageException.php       |  1 +
 .../Exception/InvalidObjectException.php      |  1 +
 .../Exception/InvalidStyleException.php       |  1 +
 .../UnsupportedImageTypeException.php         |  1 +
 src/PhpWord/IOFactory.php                     |  1 +
 src/PhpWord/Media.php                         |  1 +
 src/PhpWord/Metadata/Compatibility.php        |  1 +
 src/PhpWord/Metadata/DocInfo.php              |  1 +
 src/PhpWord/Metadata/Protection.php           |  1 +
 src/PhpWord/Metadata/Settings.php             |  1 +
 src/PhpWord/PhpWord.php                       |  3 +--
 src/PhpWord/Reader/AbstractReader.php         |  1 +
 src/PhpWord/Reader/HTML.php                   |  1 +
 src/PhpWord/Reader/MsDoc.php                  |  1 +
 src/PhpWord/Reader/ODText.php                 |  2 +-
 src/PhpWord/Reader/ODText/AbstractPart.php    |  1 +
 src/PhpWord/Reader/ODText/Content.php         |  2 +-
 src/PhpWord/Reader/ODText/Meta.php            |  2 +-
 src/PhpWord/Reader/RTF.php                    |  1 +
 src/PhpWord/Reader/RTF/Document.php           | 22 +------------------
 src/PhpWord/Reader/ReaderInterface.php        |  1 +
 src/PhpWord/Reader/Word2007.php               |  2 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  5 +----
 src/PhpWord/Reader/Word2007/DocPropsApp.php   |  1 +
 src/PhpWord/Reader/Word2007/DocPropsCore.php  |  2 +-
 .../Reader/Word2007/DocPropsCustom.php        |  2 +-
 src/PhpWord/Reader/Word2007/Document.php      |  1 +
 src/PhpWord/Reader/Word2007/Endnotes.php      |  1 +
 src/PhpWord/Reader/Word2007/Footnotes.php     |  2 +-
 src/PhpWord/Reader/Word2007/Numbering.php     |  1 +
 src/PhpWord/Reader/Word2007/Settings.php      |  1 +
 src/PhpWord/Reader/Word2007/Styles.php        |  1 +
 src/PhpWord/Settings.php                      |  3 +--
 src/PhpWord/Shared/Converter.php              |  1 +
 src/PhpWord/Shared/Html.php                   |  8 +------
 src/PhpWord/Shared/ZipArchive.php             |  1 +
 src/PhpWord/SimpleType/Jc.php                 |  1 +
 src/PhpWord/SimpleType/JcTable.php            |  1 +
 src/PhpWord/SimpleType/NumberFormat.php       |  1 +
 src/PhpWord/SimpleType/Zoom.php               |  1 +
 src/PhpWord/Style.php                         |  1 +
 src/PhpWord/Style/AbstractStyle.php           |  1 +
 src/PhpWord/Style/Border.php                  |  1 +
 src/PhpWord/Style/Cell.php                    |  1 +
 src/PhpWord/Style/Chart.php                   |  1 +
 src/PhpWord/Style/Extrusion.php               |  1 +
 src/PhpWord/Style/Fill.php                    |  1 +
 src/PhpWord/Style/Font.php                    |  1 +
 src/PhpWord/Style/Frame.php                   |  1 +
 src/PhpWord/Style/Image.php                   |  1 +
 src/PhpWord/Style/Indentation.php             |  1 +
 src/PhpWord/Style/Line.php                    |  1 +
 src/PhpWord/Style/LineNumbering.php           |  1 +
 src/PhpWord/Style/ListItem.php                |  1 +
 src/PhpWord/Style/Numbering.php               |  1 +
 src/PhpWord/Style/NumberingLevel.php          |  1 +
 src/PhpWord/Style/Outline.php                 |  1 +
 src/PhpWord/Style/Paper.php                   |  1 +
 src/PhpWord/Style/Paragraph.php               |  1 +
 src/PhpWord/Style/Row.php                     |  1 +
 src/PhpWord/Style/Section.php                 |  1 +
 src/PhpWord/Style/Shading.php                 |  1 +
 src/PhpWord/Style/Shadow.php                  |  1 +
 src/PhpWord/Style/Shape.php                   |  1 +
 src/PhpWord/Style/Spacing.php                 |  1 +
 src/PhpWord/Style/TOC.php                     |  1 +
 src/PhpWord/Style/Tab.php                     |  1 +
 src/PhpWord/Style/Table.php                   |  1 +
 src/PhpWord/Style/TextBox.php                 |  8 +------
 src/PhpWord/Template.php                      |  1 +
 src/PhpWord/TemplateProcessor.php             |  1 +
 src/PhpWord/Writer/AbstractWriter.php         |  1 +
 src/PhpWord/Writer/HTML.php                   |  1 +
 .../Writer/HTML/Element/AbstractElement.php   |  2 +-
 src/PhpWord/Writer/HTML/Element/Container.php |  1 +
 src/PhpWord/Writer/HTML/Element/Endnote.php   |  1 +
 src/PhpWord/Writer/HTML/Element/Footnote.php  |  1 +
 src/PhpWord/Writer/HTML/Element/Image.php     |  1 +
 src/PhpWord/Writer/HTML/Element/Link.php      |  1 +
 src/PhpWord/Writer/HTML/Element/ListItem.php  |  1 +
 src/PhpWord/Writer/HTML/Element/PageBreak.php |  1 +
 src/PhpWord/Writer/HTML/Element/Table.php     |  1 +
 src/PhpWord/Writer/HTML/Element/Text.php      |  1 +
 src/PhpWord/Writer/HTML/Element/TextBreak.php |  1 +
 src/PhpWord/Writer/HTML/Element/TextRun.php   |  1 +
 src/PhpWord/Writer/HTML/Element/Title.php     |  1 +
 src/PhpWord/Writer/HTML/Part/AbstractPart.php |  1 +
 src/PhpWord/Writer/HTML/Part/Body.php         |  1 +
 src/PhpWord/Writer/HTML/Part/Head.php         |  1 +
 .../Writer/HTML/Style/AbstractStyle.php       |  2 +-
 src/PhpWord/Writer/HTML/Style/Font.php        |  1 +
 src/PhpWord/Writer/HTML/Style/Generic.php     |  1 +
 src/PhpWord/Writer/HTML/Style/Image.php       |  1 +
 src/PhpWord/Writer/HTML/Style/Paragraph.php   |  1 +
 src/PhpWord/Writer/ODText.php                 |  2 +-
 .../Writer/ODText/Element/AbstractElement.php |  1 +
 .../Writer/ODText/Element/Container.php       |  1 +
 src/PhpWord/Writer/ODText/Element/Image.php   |  1 +
 src/PhpWord/Writer/ODText/Element/Link.php    |  1 +
 src/PhpWord/Writer/ODText/Element/Table.php   |  1 +
 src/PhpWord/Writer/ODText/Element/Text.php    |  1 +
 .../Writer/ODText/Element/TextBreak.php       |  1 +
 src/PhpWord/Writer/ODText/Element/TextRun.php |  1 +
 src/PhpWord/Writer/ODText/Element/Title.php   |  1 +
 .../Writer/ODText/Part/AbstractPart.php       |  3 +--
 src/PhpWord/Writer/ODText/Part/Content.php    |  6 +----
 src/PhpWord/Writer/ODText/Part/Manifest.php   |  1 +
 src/PhpWord/Writer/ODText/Part/Meta.php       |  2 +-
 src/PhpWord/Writer/ODText/Part/Mimetype.php   |  1 +
 src/PhpWord/Writer/ODText/Part/Styles.php     |  1 +
 .../Writer/ODText/Style/AbstractStyle.php     |  1 +
 src/PhpWord/Writer/ODText/Style/Font.php      |  3 +--
 src/PhpWord/Writer/ODText/Style/Image.php     |  3 +--
 src/PhpWord/Writer/ODText/Style/Paragraph.php |  3 +--
 src/PhpWord/Writer/ODText/Style/Section.php   |  1 +
 src/PhpWord/Writer/ODText/Style/Table.php     |  3 +--
 src/PhpWord/Writer/PDF.php                    |  1 +
 src/PhpWord/Writer/PDF/AbstractRenderer.php   |  1 +
 src/PhpWord/Writer/PDF/DomPDF.php             |  2 +-
 src/PhpWord/Writer/PDF/MPDF.php               |  2 +-
 src/PhpWord/Writer/PDF/TCPDF.php              |  1 +
 src/PhpWord/Writer/RTF.php                    |  1 +
 .../Writer/RTF/Element/AbstractElement.php    |  1 +
 src/PhpWord/Writer/RTF/Element/Container.php  |  1 +
 src/PhpWord/Writer/RTF/Element/Image.php      |  1 +
 src/PhpWord/Writer/RTF/Element/Link.php       |  1 +
 src/PhpWord/Writer/RTF/Element/ListItem.php   |  1 +
 src/PhpWord/Writer/RTF/Element/PageBreak.php  |  1 +
 src/PhpWord/Writer/RTF/Element/Table.php      |  1 +
 src/PhpWord/Writer/RTF/Element/Text.php       |  1 +
 src/PhpWord/Writer/RTF/Element/TextBreak.php  |  1 +
 src/PhpWord/Writer/RTF/Element/TextRun.php    |  1 +
 src/PhpWord/Writer/RTF/Element/Title.php      |  1 +
 src/PhpWord/Writer/RTF/Part/AbstractPart.php  |  1 +
 src/PhpWord/Writer/RTF/Part/Document.php      |  1 +
 src/PhpWord/Writer/RTF/Part/Header.php        |  6 +----
 .../Writer/RTF/Style/AbstractStyle.php        |  1 +
 src/PhpWord/Writer/RTF/Style/Border.php       |  1 +
 src/PhpWord/Writer/RTF/Style/Font.php         |  1 +
 src/PhpWord/Writer/RTF/Style/Paragraph.php    |  2 +-
 src/PhpWord/Writer/RTF/Style/Section.php      |  1 +
 src/PhpWord/Writer/Word2007.php               |  1 +
 .../Word2007/Element/AbstractElement.php      |  1 +
 .../Writer/Word2007/Element/Bookmark.php      |  1 +
 src/PhpWord/Writer/Word2007/Element/Chart.php |  3 +--
 .../Writer/Word2007/Element/CheckBox.php      |  1 +
 .../Writer/Word2007/Element/Container.php     |  3 +--
 .../Writer/Word2007/Element/Endnote.php       |  1 +
 src/PhpWord/Writer/Word2007/Element/Field.php |  1 +
 .../Writer/Word2007/Element/Footnote.php      |  3 +--
 .../Writer/Word2007/Element/FormField.php     |  1 +
 src/PhpWord/Writer/Word2007/Element/Image.php |  7 +-----
 src/PhpWord/Writer/Word2007/Element/Line.php  |  1 +
 src/PhpWord/Writer/Word2007/Element/Link.php  |  3 +--
 .../Writer/Word2007/Element/ListItem.php      |  3 +--
 .../Writer/Word2007/Element/ListItemRun.php   |  3 +--
 .../Writer/Word2007/Element/Object.php        |  3 +--
 .../Writer/Word2007/Element/PageBreak.php     |  2 +-
 .../Word2007/Element/ParagraphAlignment.php   |  1 +
 .../Writer/Word2007/Element/PreserveText.php  |  3 +--
 src/PhpWord/Writer/Word2007/Element/SDT.php   |  6 +----
 src/PhpWord/Writer/Word2007/Element/Shape.php |  8 +------
 src/PhpWord/Writer/Word2007/Element/TOC.php   |  6 +----
 src/PhpWord/Writer/Word2007/Element/Table.php |  1 +
 .../Word2007/Element/TableAlignment.php       |  1 +
 src/PhpWord/Writer/Word2007/Element/Text.php  |  3 +--
 .../Writer/Word2007/Element/TextBox.php       |  3 +--
 .../Writer/Word2007/Element/TextBreak.php     |  3 +--
 .../Writer/Word2007/Element/TextRun.php       |  3 +--
 src/PhpWord/Writer/Word2007/Element/Title.php |  3 +--
 .../Writer/Word2007/Part/AbstractPart.php     |  1 +
 src/PhpWord/Writer/Word2007/Part/Chart.php    |  1 +
 src/PhpWord/Writer/Word2007/Part/Comments.php |  2 +-
 .../Writer/Word2007/Part/ContentTypes.php     |  1 +
 .../Writer/Word2007/Part/DocPropsApp.php      |  1 +
 .../Writer/Word2007/Part/DocPropsCore.php     |  1 +
 .../Writer/Word2007/Part/DocPropsCustom.php   |  1 +
 src/PhpWord/Writer/Word2007/Part/Document.php |  3 +--
 src/PhpWord/Writer/Word2007/Part/Endnotes.php |  1 +
 .../Writer/Word2007/Part/FontTable.php        |  1 +
 src/PhpWord/Writer/Word2007/Part/Footer.php   |  1 +
 .../Writer/Word2007/Part/Footnotes.php        |  2 +-
 src/PhpWord/Writer/Word2007/Part/Header.php   |  1 +
 .../Writer/Word2007/Part/Numbering.php        |  4 +---
 src/PhpWord/Writer/Word2007/Part/Rels.php     |  1 +
 .../Writer/Word2007/Part/RelsDocument.php     |  1 +
 src/PhpWord/Writer/Word2007/Part/RelsPart.php |  1 +
 src/PhpWord/Writer/Word2007/Part/Settings.php |  1 +
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  1 +
 src/PhpWord/Writer/Word2007/Part/Theme.php    |  1 +
 .../Writer/Word2007/Part/WebSettings.php      |  1 +
 .../Writer/Word2007/Style/AbstractStyle.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/Cell.php    |  4 +---
 .../Writer/Word2007/Style/Extrusion.php       |  1 +
 src/PhpWord/Writer/Word2007/Style/Fill.php    |  3 +--
 src/PhpWord/Writer/Word2007/Style/Font.php    |  1 +
 src/PhpWord/Writer/Word2007/Style/Frame.php   |  1 +
 src/PhpWord/Writer/Word2007/Style/Image.php   |  1 +
 .../Writer/Word2007/Style/Indentation.php     |  3 +--
 src/PhpWord/Writer/Word2007/Style/Line.php    |  1 +
 .../Writer/Word2007/Style/LineNumbering.php   |  1 +
 .../Writer/Word2007/Style/MarginBorder.php    |  1 +
 src/PhpWord/Writer/Word2007/Style/Outline.php |  1 +
 .../Writer/Word2007/Style/Paragraph.php       |  1 +
 src/PhpWord/Writer/Word2007/Style/Row.php     |  1 +
 src/PhpWord/Writer/Word2007/Style/Section.php |  1 +
 src/PhpWord/Writer/Word2007/Style/Shading.php |  1 +
 src/PhpWord/Writer/Word2007/Style/Shadow.php  |  1 +
 src/PhpWord/Writer/Word2007/Style/Shape.php   |  3 +--
 src/PhpWord/Writer/Word2007/Style/Spacing.php |  3 +--
 src/PhpWord/Writer/Word2007/Style/Tab.php     |  1 +
 src/PhpWord/Writer/Word2007/Style/Table.php   | 10 +--------
 src/PhpWord/Writer/Word2007/Style/TextBox.php |  1 +
 src/PhpWord/Writer/WriterInterface.php        |  1 +
 tests/PhpWord/Collection/CollectionTest.php   |  1 +
 .../ComplexType/FootnotePropertiesTest.php    |  1 +
 tests/PhpWord/Element/AbstractElementTest.php |  1 +
 tests/PhpWord/Element/CellTest.php            |  1 +
 tests/PhpWord/Element/CheckBoxTest.php        |  1 +
 tests/PhpWord/Element/CommentTest.php         |  1 +
 tests/PhpWord/Element/FieldTest.php           |  1 +
 tests/PhpWord/Element/FooterTest.php          |  1 +
 tests/PhpWord/Element/FootnoteTest.php        |  1 +
 tests/PhpWord/Element/HeaderTest.php          |  1 +
 tests/PhpWord/Element/ImageTest.php           |  1 +
 tests/PhpWord/Element/LineTest.php            |  1 +
 tests/PhpWord/Element/LinkTest.php            |  1 +
 tests/PhpWord/Element/ListItemRunTest.php     |  1 +
 tests/PhpWord/Element/ListItemTest.php        |  1 +
 tests/PhpWord/Element/ObjectTest.php          |  1 +
 tests/PhpWord/Element/PageBreakTest.php       |  1 +
 tests/PhpWord/Element/PreserveTextTest.php    |  1 +
 tests/PhpWord/Element/RowTest.php             |  1 +
 tests/PhpWord/Element/SDTTest.php             |  1 +
 tests/PhpWord/Element/SectionTest.php         |  1 +
 tests/PhpWord/Element/TOCTest.php             |  1 +
 tests/PhpWord/Element/TableTest.php           |  1 +
 tests/PhpWord/Element/TextBoxTest.php         |  1 +
 tests/PhpWord/Element/TextBreakTest.php       |  1 +
 tests/PhpWord/Element/TextRunTest.php         |  1 +
 tests/PhpWord/Element/TextTest.php            |  1 +
 tests/PhpWord/Element/TitleTest.php           |  1 +
 .../Exception/CopyFileExceptionTest.php       |  1 +
 .../CreateTemporaryFileExceptionTest.php      |  1 +
 tests/PhpWord/Exception/ExceptionTest.php     |  1 +
 .../Exception/InvalidImageExceptionTest.php   |  1 +
 .../Exception/InvalidStyleExceptionTest.php   |  1 +
 .../UnsupportedImageTypeExceptionTest.php     |  1 +
 tests/PhpWord/IOFactoryTest.php               |  1 +
 tests/PhpWord/MediaTest.php                   |  1 +
 tests/PhpWord/Metadata/DocInfoTest.php        |  1 +
 tests/PhpWord/Metadata/SettingsTest.php       |  1 +
 tests/PhpWord/PhpWordTest.php                 |  1 +
 tests/PhpWord/Reader/HTMLTest.php             |  1 +
 tests/PhpWord/Reader/MsDocTest.php            |  1 +
 tests/PhpWord/Reader/ODTextTest.php           |  1 +
 tests/PhpWord/Reader/RTFTest.php              |  1 +
 tests/PhpWord/Reader/Word2007Test.php         |  1 +
 tests/PhpWord/SettingsTest.php                |  1 +
 tests/PhpWord/Shared/ConverterTest.php        |  1 +
 tests/PhpWord/Shared/HtmlTest.php             |  1 +
 tests/PhpWord/Shared/ZipArchiveTest.php       |  1 +
 tests/PhpWord/Style/AbstractStyleTest.php     |  1 +
 tests/PhpWord/Style/CellTest.php              |  1 +
 tests/PhpWord/Style/FontTest.php              |  1 +
 tests/PhpWord/Style/ImageTest.php             |  1 +
 tests/PhpWord/Style/IndentationTest.php       |  1 +
 tests/PhpWord/Style/LineNumberingTest.php     |  1 +
 tests/PhpWord/Style/LineTest.php              |  1 +
 tests/PhpWord/Style/ListItemTest.php          |  1 +
 tests/PhpWord/Style/NumberingLevelTest.php    |  1 +
 tests/PhpWord/Style/NumberingTest.php         |  1 +
 tests/PhpWord/Style/PaperTest.php             |  1 +
 tests/PhpWord/Style/ParagraphTest.php         |  1 +
 tests/PhpWord/Style/RowTest.php               |  1 +
 tests/PhpWord/Style/SectionTest.php           |  1 +
 tests/PhpWord/Style/ShadingTest.php           |  1 +
 tests/PhpWord/Style/SpacingTest.php           |  1 +
 tests/PhpWord/Style/TOCTest.php               |  1 +
 tests/PhpWord/Style/TabTest.php               |  1 +
 tests/PhpWord/Style/TableTest.php             |  1 +
 tests/PhpWord/Style/TextBoxTest.php           |  1 +
 tests/PhpWord/StyleTest.php                   |  1 +
 tests/PhpWord/TemplateProcessorTest.php       |  1 +
 tests/PhpWord/Writer/HTML/ElementTest.php     |  1 +
 tests/PhpWord/Writer/HTML/PartTest.php        |  1 +
 tests/PhpWord/Writer/HTML/StyleTest.php       |  1 +
 tests/PhpWord/Writer/HTMLTest.php             |  1 +
 tests/PhpWord/Writer/ODText/ElementTest.php   |  1 +
 .../Writer/ODText/Part/AbstractPartTest.php   |  1 +
 .../Writer/ODText/Part/ContentTest.php        |  1 +
 tests/PhpWord/Writer/ODText/StyleTest.php     |  1 +
 tests/PhpWord/Writer/ODTextTest.php           |  1 +
 tests/PhpWord/Writer/PDF/DomPDFTest.php       |  1 +
 tests/PhpWord/Writer/PDF/MPDFTest.php         |  1 +
 tests/PhpWord/Writer/PDF/TCPDFTest.php        |  1 +
 tests/PhpWord/Writer/PDFTest.php              |  1 +
 tests/PhpWord/Writer/RTF/ElementTest.php      |  1 +
 tests/PhpWord/Writer/RTF/StyleTest.php        |  1 +
 tests/PhpWord/Writer/RTFTest.php              |  1 +
 tests/PhpWord/Writer/Word2007/ElementTest.php |  1 +
 .../Writer/Word2007/Part/AbstractPartTest.php |  1 +
 .../Writer/Word2007/Part/CommentsTest.php     |  1 +
 .../Writer/Word2007/Part/DocumentTest.php     |  1 +
 .../Writer/Word2007/Part/FooterTest.php       |  1 +
 .../Writer/Word2007/Part/FootnotesTest.php    |  1 +
 .../Writer/Word2007/Part/HeaderTest.php       |  1 +
 .../Writer/Word2007/Part/NumberingTest.php    |  1 +
 .../Writer/Word2007/Part/SettingsTest.php     |  1 +
 .../Writer/Word2007/Part/StylesTest.php       |  1 +
 tests/PhpWord/Writer/Word2007/PartTest.php    |  1 +
 .../Writer/Word2007/Style/FontTest.php        |  1 +
 tests/PhpWord/Writer/Word2007/StyleTest.php   |  1 +
 tests/PhpWord/Writer/Word2007Test.php         |  1 +
 tests/PhpWord/_includes/TestHelperDOCX.php    |  1 +
 tests/PhpWord/_includes/XmlDocument.php       |  1 +
 368 files changed, 369 insertions(+), 166 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index d441972b..51a6117a 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -99,7 +99,7 @@ return PhpCsFixer\Config::create()
             'phpdoc_inline_tag' => true,
             'phpdoc_no_access' => true,
             'phpdoc_no_alias_tag' => false, //@see instead of @link
-            'phpdoc_no_empty_return' => false, //TODO: reactivate
+            'phpdoc_no_empty_return' => true,
             'phpdoc_no_package' => true,
             'phpdoc_no_useless_inheritdoc' => true,
             'phpdoc_order' => true,
@@ -125,7 +125,7 @@ return PhpCsFixer\Config::create()
             'silenced_deprecation_error' => true,
             'simplified_null_return' => false, // While technically correct we prefer to be explicit when returning null
             'single_blank_line_at_eof' => true,
-            'single_blank_line_before_namespace' => false,//a lot of occurences TODO
+            'single_blank_line_before_namespace' => true,
             'single_class_element_per_statement' => true,
             'single_import_per_statement' => true,
             'single_line_after_imports' => true,
diff --git a/src/PhpWord/Collection/AbstractCollection.php b/src/PhpWord/Collection/AbstractCollection.php
index 39e8f1d3..f7f29785 100644
--- a/src/PhpWord/Collection/AbstractCollection.php
+++ b/src/PhpWord/Collection/AbstractCollection.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
@@ -60,7 +61,6 @@ abstract class AbstractCollection
      *
      * @param int $index
      * @param mixed $item
-     * @return void
      */
     public function setItem($index, $item)
     {
diff --git a/src/PhpWord/Collection/Bookmarks.php b/src/PhpWord/Collection/Bookmarks.php
index d1a07755..c7bcc34f 100644
--- a/src/PhpWord/Collection/Bookmarks.php
+++ b/src/PhpWord/Collection/Bookmarks.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/Collection/Charts.php b/src/PhpWord/Collection/Charts.php
index 117cdaf0..ad550a2c 100644
--- a/src/PhpWord/Collection/Charts.php
+++ b/src/PhpWord/Collection/Charts.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
index 75ee8a9b..828c56b7 100644
--- a/src/PhpWord/Collection/Comments.php
+++ b/src/PhpWord/Collection/Comments.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/Collection/Endnotes.php b/src/PhpWord/Collection/Endnotes.php
index 11f2d136..f30f638f 100644
--- a/src/PhpWord/Collection/Endnotes.php
+++ b/src/PhpWord/Collection/Endnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/Collection/Footnotes.php b/src/PhpWord/Collection/Footnotes.php
index d93a6124..bb09e3ec 100644
--- a/src/PhpWord/Collection/Footnotes.php
+++ b/src/PhpWord/Collection/Footnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/Collection/Titles.php b/src/PhpWord/Collection/Titles.php
index 4c2cc6de..b2a81065 100644
--- a/src/PhpWord/Collection/Titles.php
+++ b/src/PhpWord/Collection/Titles.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 /**
diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
index b96b6255..6d0e45c1 100644
--- a/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
index 2e91abbf..b41e2441 100644
--- a/src/PhpWord/ComplexType/ProofState.php
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
index ed777a55..b74e5e3c 100644
--- a/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 7fddb6fc..75fb38b2 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index cdb6b0ee..00130170 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Media;
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index 5f304047..5bb93f65 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/Cell.php b/src/PhpWord/Element/Cell.php
index c01cfb4d..18f698c6 100644
--- a/src/PhpWord/Element/Cell.php
+++ b/src/PhpWord/Element/Cell.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Cell as CellStyle;
diff --git a/src/PhpWord/Element/Chart.php b/src/PhpWord/Element/Chart.php
index 1a4ee327..0453bd95 100644
--- a/src/PhpWord/Element/Chart.php
+++ b/src/PhpWord/Element/Chart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Chart as ChartStyle;
@@ -82,7 +83,6 @@ class Chart extends AbstractElement
      * Set type.
      *
      * @param string $value
-     * @return void
      */
     public function setType($value)
     {
@@ -95,7 +95,6 @@ class Chart extends AbstractElement
      *
      * @param array $categories
      * @param array $values
-     * @return void
      */
     public function addSeries($categories, $values)
     {
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
index 27f031a4..cf55166a 100644
--- a/src/PhpWord/Element/CheckBox.php
+++ b/src/PhpWord/Element/CheckBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 91a6cf78..6189afd9 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php
index 3b3d55f9..36ae66f3 100644
--- a/src/PhpWord/Element/Endnote.php
+++ b/src/PhpWord/Element/Endnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Paragraph;
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 6048530a..c9f50357 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php
index 5aaf802b..fa668dd7 100644
--- a/src/PhpWord/Element/Footer.php
+++ b/src/PhpWord/Element/Footer.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
@@ -63,7 +64,6 @@ class Footer extends AbstractContainer
      * @since 0.10.0
      *
      * @param string $value
-     * @return void
      */
     public function setType($value = self::AUTO)
     {
diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php
index e4e13b6b..7789b2db 100644
--- a/src/PhpWord/Element/Footnote.php
+++ b/src/PhpWord/Element/Footnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Paragraph;
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index 77edcabd..19955416 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/Header.php b/src/PhpWord/Element/Header.php
index 79faed90..2e2612b6 100644
--- a/src/PhpWord/Element/Header.php
+++ b/src/PhpWord/Element/Header.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 25ca706c..46fb60a0 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Exception\CreateTemporaryFileException;
diff --git a/src/PhpWord/Element/Line.php b/src/PhpWord/Element/Line.php
index 3da26317..e94a5791 100644
--- a/src/PhpWord/Element/Line.php
+++ b/src/PhpWord/Element/Line.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Line as LineStyle;
diff --git a/src/PhpWord/Element/Link.php b/src/PhpWord/Element/Link.php
index d41cd50c..d884fc71 100644
--- a/src/PhpWord/Element/Link.php
+++ b/src/PhpWord/Element/Link.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php
index ce8e58d5..c1294908 100644
--- a/src/PhpWord/Element/ListItem.php
+++ b/src/PhpWord/Element/ListItem.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
index 061a9274..9a44dd50 100644
--- a/src/PhpWord/Element/ListItemRun.php
+++ b/src/PhpWord/Element/ListItemRun.php
@@ -14,6 +14,7 @@
 * @copyright   2010-2017 PHPWord contributors
 * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\ListItem as ListItemStyle;
diff --git a/src/PhpWord/Element/Object.php b/src/PhpWord/Element/Object.php
index cd32ab95..891b7d53 100644
--- a/src/PhpWord/Element/Object.php
+++ b/src/PhpWord/Element/Object.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Exception\InvalidObjectException;
@@ -132,7 +133,6 @@ class Object extends AbstractElement
      * Set Image Relation ID.
      *
      * @param int $rId
-     * @return void
      */
     public function setImageRelationId($rId)
     {
diff --git a/src/PhpWord/Element/PageBreak.php b/src/PhpWord/Element/PageBreak.php
index fc44700f..a2debaf6 100644
--- a/src/PhpWord/Element/PageBreak.php
+++ b/src/PhpWord/Element/PageBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index 7a0aaa6d..e9fa4839 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/Row.php b/src/PhpWord/Element/Row.php
index 213f1450..f3d26ef5 100644
--- a/src/PhpWord/Element/Row.php
+++ b/src/PhpWord/Element/Row.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Row as RowStyle;
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 7135b060..2efefc1e 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 6b6f770d..eb562586 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
@@ -72,7 +73,6 @@ class Section extends AbstractContainer
      * Set section style.
      *
      * @param array $style
-     * @return void
      */
     public function setStyle($style = null)
     {
diff --git a/src/PhpWord/Element/Shape.php b/src/PhpWord/Element/Shape.php
index e5405468..a2412ce9 100644
--- a/src/PhpWord/Element/Shape.php
+++ b/src/PhpWord/Element/Shape.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Shape as ShapeStyle;
diff --git a/src/PhpWord/Element/TOC.php b/src/PhpWord/Element/TOC.php
index c9b37e00..e01aec84 100644
--- a/src/PhpWord/Element/TOC.php
+++ b/src/PhpWord/Element/TOC.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -130,7 +131,6 @@ class TOC extends AbstractElement
      * Set max depth.
      *
      * @param int $value
-     * @return void
      */
     public function setMaxDepth($value)
     {
@@ -151,7 +151,6 @@ class TOC extends AbstractElement
      * Set min depth.
      *
      * @param int $value
-     * @return void
      */
     public function setMinDepth($value)
     {
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 016d2a60..777b84e2 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Table as TableStyle;
@@ -120,7 +121,6 @@ class Table extends AbstractElement
      * Set table width.
      *
      * @param int $width
-     * @return void
      */
     public function setWidth($width)
     {
diff --git a/src/PhpWord/Element/Text.php b/src/PhpWord/Element/Text.php
index 89c62ee7..f50f3366 100644
--- a/src/PhpWord/Element/Text.php
+++ b/src/PhpWord/Element/Text.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/TextBox.php b/src/PhpWord/Element/TextBox.php
index dbeaae92..b97a46d1 100644
--- a/src/PhpWord/Element/TextBox.php
+++ b/src/PhpWord/Element/TextBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle;
diff --git a/src/PhpWord/Element/TextBreak.php b/src/PhpWord/Element/TextBreak.php
index 0a216e7a..da986f74 100644
--- a/src/PhpWord/Element/TextBreak.php
+++ b/src/PhpWord/Element/TextBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Font;
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
index f114dcef..9a23470f 100644
--- a/src/PhpWord/Element/TextRun.php
+++ b/src/PhpWord/Element/TextRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Paragraph;
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index dd1db965..40be3a2b 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index df88ea8f..721c372a 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index d1309dfb..cb3fdfeb 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Escaper;
 
 /**
diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
index a77da3c5..45f7f301 100644
--- a/src/PhpWord/Escaper/EscaperInterface.php
+++ b/src/PhpWord/Escaper/EscaperInterface.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Escaper;
 
 /**
diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
index 99691074..18279eb8 100644
--- a/src/PhpWord/Escaper/RegExp.php
+++ b/src/PhpWord/Escaper/RegExp.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Escaper;
 
 /**
diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
index 332a69ab..9663c6fc 100644
--- a/src/PhpWord/Escaper/Rtf.php
+++ b/src/PhpWord/Escaper/Rtf.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Escaper;
 
 /**
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
index f45d8f8a..7b092aac 100644
--- a/src/PhpWord/Escaper/Xml.php
+++ b/src/PhpWord/Escaper/Xml.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Escaper;
 
 /**
diff --git a/src/PhpWord/Exception/CopyFileException.php b/src/PhpWord/Exception/CopyFileException.php
index 7557616b..97e68112 100644
--- a/src/PhpWord/Exception/CopyFileException.php
+++ b/src/PhpWord/Exception/CopyFileException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/Exception/CreateTemporaryFileException.php b/src/PhpWord/Exception/CreateTemporaryFileException.php
index ade359ee..16a9baa0 100644
--- a/src/PhpWord/Exception/CreateTemporaryFileException.php
+++ b/src/PhpWord/Exception/CreateTemporaryFileException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/Exception/Exception.php b/src/PhpWord/Exception/Exception.php
index dd6dfbc6..498ef38c 100644
--- a/src/PhpWord/Exception/Exception.php
+++ b/src/PhpWord/Exception/Exception.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/Exception/InvalidImageException.php b/src/PhpWord/Exception/InvalidImageException.php
index ed422a25..4d863545 100644
--- a/src/PhpWord/Exception/InvalidImageException.php
+++ b/src/PhpWord/Exception/InvalidImageException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/Exception/InvalidObjectException.php b/src/PhpWord/Exception/InvalidObjectException.php
index 9e9f185a..61e933f3 100644
--- a/src/PhpWord/Exception/InvalidObjectException.php
+++ b/src/PhpWord/Exception/InvalidObjectException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/Exception/InvalidStyleException.php b/src/PhpWord/Exception/InvalidStyleException.php
index ef0ca430..4110e55e 100644
--- a/src/PhpWord/Exception/InvalidStyleException.php
+++ b/src/PhpWord/Exception/InvalidStyleException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 use InvalidArgumentException;
diff --git a/src/PhpWord/Exception/UnsupportedImageTypeException.php b/src/PhpWord/Exception/UnsupportedImageTypeException.php
index 4c4d6c39..d2d2b360 100644
--- a/src/PhpWord/Exception/UnsupportedImageTypeException.php
+++ b/src/PhpWord/Exception/UnsupportedImageTypeException.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/src/PhpWord/IOFactory.php b/src/PhpWord/IOFactory.php
index f33b2500..b523480c 100644
--- a/src/PhpWord/IOFactory.php
+++ b/src/PhpWord/IOFactory.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
index b696d796..c358f2a0 100644
--- a/src/PhpWord/Media.php
+++ b/src/PhpWord/Media.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Element\Image;
diff --git a/src/PhpWord/Metadata/Compatibility.php b/src/PhpWord/Metadata/Compatibility.php
index b6cc3b61..d990b095 100644
--- a/src/PhpWord/Metadata/Compatibility.php
+++ b/src/PhpWord/Metadata/Compatibility.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 /**
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index 9239f71f..37a5ff92 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 /**
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 18747061..448b1063 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 /**
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 7cf79b2e..418c044d 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 use PhpOffice\PhpWord\ComplexType\ProofState;
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index c3dfac70..6f524350 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Element\Section;
@@ -240,7 +241,6 @@ class PhpWord
      * Set default font name.
      *
      * @param string $fontName
-     * @return void
      */
     public function setDefaultFontName($fontName)
     {
@@ -261,7 +261,6 @@ class PhpWord
      * Set default font size.
      *
      * @param int $fontSize
-     * @return void
      */
     public function setDefaultFontSize($fontSize)
     {
diff --git a/src/PhpWord/Reader/AbstractReader.php b/src/PhpWord/Reader/AbstractReader.php
index be1a2a09..7779226f 100644
--- a/src/PhpWord/Reader/AbstractReader.php
+++ b/src/PhpWord/Reader/AbstractReader.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Reader/HTML.php b/src/PhpWord/Reader/HTML.php
index d58908e5..46ea4abc 100644
--- a/src/PhpWord/Reader/HTML.php
+++ b/src/PhpWord/Reader/HTML.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index e5fd3ca3..79731cfd 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\Common\Drawing;
diff --git a/src/PhpWord/Reader/ODText.php b/src/PhpWord/Reader/ODText.php
index 6fd135cd..1d2577c8 100644
--- a/src/PhpWord/Reader/ODText.php
+++ b/src/PhpWord/Reader/ODText.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\Common\XMLReader;
@@ -57,7 +58,6 @@ class ODText extends AbstractReader implements ReaderInterface
      * @param string $partName
      * @param string $docFile
      * @param string $xmlFile
-     * @return void
      */
     private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
     {
diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php
index f38eff7c..c48b4ade 100644
--- a/src/PhpWord/Reader/ODText/AbstractPart.php
+++ b/src/PhpWord/Reader/ODText/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\ODText;
 
 use PhpOffice\PhpWord\Reader\Word2007\AbstractPart as Word2007AbstractPart;
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index bc699abe..5e3d8ca6 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\ODText;
 
 use PhpOffice\Common\XMLReader;
@@ -30,7 +31,6 @@ class Content extends AbstractPart
      * Read content.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/ODText/Meta.php b/src/PhpWord/Reader/ODText/Meta.php
index 6bd490a7..6f8f813f 100644
--- a/src/PhpWord/Reader/ODText/Meta.php
+++ b/src/PhpWord/Reader/ODText/Meta.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\ODText;
 
 use PhpOffice\Common\XMLReader;
@@ -30,7 +31,6 @@ class Meta extends AbstractPart
      * Read meta.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      * @todo Process property type
      */
     public function read(PhpWord $phpWord)
diff --git a/src/PhpWord/Reader/RTF.php b/src/PhpWord/Reader/RTF.php
index 982e1d1a..dafd5b3c 100644
--- a/src/PhpWord/Reader/RTF.php
+++ b/src/PhpWord/Reader/RTF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/src/PhpWord/Reader/RTF/Document.php b/src/PhpWord/Reader/RTF/Document.php
index e41caba5..6f39abe9 100644
--- a/src/PhpWord/Reader/RTF/Document.php
+++ b/src/PhpWord/Reader/RTF/Document.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\RTF;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -130,7 +131,6 @@ class Document
      * - Pushes every other character into the text queue
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      * @todo Use `fread` stream for scalability
      */
     public function read(PhpWord $phpWord)
@@ -183,8 +183,6 @@ class Document
 
     /**
      * Mark opening braket `{` character.
-     *
-     * @return void
      */
     private function markOpening()
     {
@@ -194,8 +192,6 @@ class Document
 
     /**
      * Mark closing braket `}` character.
-     *
-     * @return void
      */
     private function markClosing()
     {
@@ -205,8 +201,6 @@ class Document
 
     /**
      * Mark backslash `\` character.
-     *
-     * @return void
      */
     private function markBackslash()
     {
@@ -222,8 +216,6 @@ class Document
 
     /**
      * Mark newline character: Flush control word because it's not possible to span multiline.
-     *
-     * @return void
      */
     private function markNewline()
     {
@@ -236,7 +228,6 @@ class Document
      * Flush control word or text.
      *
      * @param bool $isControl
-     * @return void
      */
     private function flush($isControl = false)
     {
@@ -251,7 +242,6 @@ class Document
      * Flush control word.
      *
      * @param bool $isControl
-     * @return void
      */
     private function flushControl($isControl = false)
     {
@@ -267,8 +257,6 @@ class Document
 
     /**
      * Flush text in queue.
-     *
-     * @return void
      */
     private function flushText()
     {
@@ -295,7 +283,6 @@ class Document
      * Reset control word and first char state.
      *
      * @param bool $value
-     * @return void
      */
     private function setControl($value)
     {
@@ -307,7 +294,6 @@ class Document
      * Push text into queue.
      *
      * @param string $char
-     * @return void
      */
     private function pushText($char)
     {
@@ -325,7 +311,6 @@ class Document
      *
      * @param string $control
      * @param string $parameter
-     * @return void
      */
     private function parseControl($control, $parameter)
     {
@@ -365,7 +350,6 @@ class Document
      * Read paragraph.
      *
      * @param array $directives
-     * @return void
      */
     private function readParagraph($directives)
     {
@@ -378,7 +362,6 @@ class Document
      * Read style.
      *
      * @param array $directives
-     * @return void
      */
     private function readStyle($directives)
     {
@@ -390,7 +373,6 @@ class Document
      * Read skip.
      *
      * @param array $directives
-     * @return void
      */
     private function readSkip($directives)
     {
@@ -401,8 +383,6 @@ class Document
 
     /**
      * Read text.
-     *
-     * @return void
      */
     private function readText()
     {
diff --git a/src/PhpWord/Reader/ReaderInterface.php b/src/PhpWord/Reader/ReaderInterface.php
index b1c3535a..5f52ad19 100644
--- a/src/PhpWord/Reader/ReaderInterface.php
+++ b/src/PhpWord/Reader/ReaderInterface.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 /**
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index 14ce3242..cacefb55 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\Common\XMLReader;
@@ -82,7 +83,6 @@ class Word2007 extends AbstractReader implements ReaderInterface
      * @param string $partName
      * @param string $docFile
      * @param string $xmlFile
-     * @return void
      */
     private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
     {
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 93bf8a01..a420d45a 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
@@ -81,7 +82,6 @@ abstract class AbstractPart
      * Set relationships.
      *
      * @param array $value
-     * @return void
      */
     public function setRels($value)
     {
@@ -95,7 +95,6 @@ abstract class AbstractPart
      * @param \DOMElement $domNode
      * @param mixed $parent
      * @param string $docPart
-     * @return void
      *
      * @todo Get font style for preserve text
      */
@@ -181,7 +180,6 @@ abstract class AbstractPart
      * @param mixed $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
-     * @return void
      *
      * @todo Footnote paragraph style
      */
@@ -239,7 +237,6 @@ abstract class AbstractPart
      * @param \DOMElement $domNode
      * @param mixed $parent
      * @param string $docPart
-     * @return void
      */
     protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart = 'document')
     {
diff --git a/src/PhpWord/Reader/Word2007/DocPropsApp.php b/src/PhpWord/Reader/Word2007/DocPropsApp.php
index 679abbcf..72ad3da5 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsApp.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsApp.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 /**
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php
index 4261ce79..aa02f155 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCore.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
@@ -54,7 +55,6 @@ class DocPropsCore extends AbstractPart
      * Read core/extended document properties.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
index 9b44cd51..90580c17 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCustom.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
@@ -31,7 +32,6 @@ class DocPropsCustom extends AbstractPart
      * Read custom document properties.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index 5a8f091b..be9263d5 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
diff --git a/src/PhpWord/Reader/Word2007/Endnotes.php b/src/PhpWord/Reader/Word2007/Endnotes.php
index 010591c3..5b753473 100644
--- a/src/PhpWord/Reader/Word2007/Endnotes.php
+++ b/src/PhpWord/Reader/Word2007/Endnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 /**
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index ba1e2c69..6de107a4 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
@@ -44,7 +45,6 @@ class Footnotes extends AbstractPart
      * Read (footnotes|endnotes).xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/Numbering.php b/src/PhpWord/Reader/Word2007/Numbering.php
index c16af7b2..9669f4e0 100644
--- a/src/PhpWord/Reader/Word2007/Numbering.php
+++ b/src/PhpWord/Reader/Word2007/Numbering.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 58f32ec6..e5519a78 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index 6e90360e..93bf2132 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 38965e35..7a336f3b 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**
@@ -289,8 +290,6 @@ class Settings
      * @since 0.12.0
      *
      * @param string $tempDir The user defined path to temporary directory
-     *
-     * @return void
      */
     public static function setTempDir($tempDir)
     {
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index 19615286..64126a6f 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 /**
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index b3c38f00..53fcc329 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
@@ -33,7 +34,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element Where the parts need to be added
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
-     * @return void
      */
     public static function addHtml($element, $html, $fullHTML = false)
     {
@@ -94,7 +94,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element object to add an element corresponding with the node
      * @param array $styles Array with all styles
      * @param array $data Array to transport data to a next level in the DOM tree, for example level of listitems
-     * @return void
      */
     protected static function parseNode($node, $element, $styles = array(), $data = array())
     {
@@ -168,7 +167,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array $styles
      * @param array $data
-     * @return void
      */
     private static function parseChildNodes($node, $element, $styles, $data)
     {
@@ -225,7 +223,6 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
-     * @return null
      */
     private static function parseText($node, $element, &$styles)
     {
@@ -246,7 +243,6 @@ class Html
      * @param array &$styles
      * @param string $argument1 Style name
      * @param string $argument2 Style value
-     * @return null
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
@@ -293,7 +289,6 @@ class Html
      * @param array &$styles
      * @param array &$data
      * @param string $argument1 List type
-     * @return null
      */
     private static function parseList(&$styles, &$data, $argument1)
     {
@@ -314,7 +309,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param array $data
-     * @return null
      *
      * @todo This function is almost the same like `parseChildNodes`. Merged?
      * @todo As soon as ListItem inherits from AbstractContainer or TextRun delete parsing part of childNodes
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index 1bd8f2b0..c8cf36cf 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index ad035518..5c4ba2fa 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\SimpleType;
 
 use PhpOffice\PhpWord\Shared\AbstractEnum;
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index f0278b4c..fc30f676 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\SimpleType;
 
 use PhpOffice\PhpWord\Shared\AbstractEnum;
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
index 8e4ccb9e..06f2df21 100644
--- a/src/PhpWord/SimpleType/NumberFormat.php
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\SimpleType;
 
 use PhpOffice\PhpWord\Shared\AbstractEnum;
diff --git a/src/PhpWord/SimpleType/Zoom.php b/src/PhpWord/SimpleType/Zoom.php
index 679632c3..987026b5 100644
--- a/src/PhpWord/SimpleType/Zoom.php
+++ b/src/PhpWord/SimpleType/Zoom.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\SimpleType;
 
 use PhpOffice\PhpWord\Shared\AbstractEnum;
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 31324564..4d82a7af 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Style\AbstractStyle;
diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php
index e42c8ca6..8bfb3a09 100644
--- a/src/PhpWord/Style/AbstractStyle.php
+++ b/src/PhpWord/Style/AbstractStyle.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\Common\Text;
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index a4fc3312..23add07f 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index 4bcf6104..ecd4fc61 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 8e4b79b4..6a0e2c14 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Extrusion.php b/src/PhpWord/Style/Extrusion.php
index 6537b0da..e2cf76e5 100644
--- a/src/PhpWord/Style/Extrusion.php
+++ b/src/PhpWord/Style/Extrusion.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Fill.php b/src/PhpWord/Style/Fill.php
index 432604d8..184e6970 100644
--- a/src/PhpWord/Style/Fill.php
+++ b/src/PhpWord/Style/Fill.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 36020625..fa54e5e2 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index deb9234b..35f5ad00 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/src/PhpWord/Style/Image.php b/src/PhpWord/Style/Image.php
index ed80fe21..b9ce2acc 100644
--- a/src/PhpWord/Style/Image.php
+++ b/src/PhpWord/Style/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Indentation.php b/src/PhpWord/Style/Indentation.php
index c0ac025f..ab5b8bb2 100644
--- a/src/PhpWord/Style/Indentation.php
+++ b/src/PhpWord/Style/Indentation.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Line.php b/src/PhpWord/Style/Line.php
index aa211692..49530f24 100644
--- a/src/PhpWord/Style/Line.php
+++ b/src/PhpWord/Style/Line.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/LineNumbering.php b/src/PhpWord/Style/LineNumbering.php
index 70a44d59..7e293bf0 100644
--- a/src/PhpWord/Style/LineNumbering.php
+++ b/src/PhpWord/Style/LineNumbering.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php
index cad78080..7a252e5d 100644
--- a/src/PhpWord/Style/ListItem.php
+++ b/src/PhpWord/Style/ListItem.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\Style;
diff --git a/src/PhpWord/Style/Numbering.php b/src/PhpWord/Style/Numbering.php
index 2d0e01a2..2d490a06 100644
--- a/src/PhpWord/Style/Numbering.php
+++ b/src/PhpWord/Style/Numbering.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 0e4cd10a..8406218c 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/src/PhpWord/Style/Outline.php b/src/PhpWord/Style/Outline.php
index cc9c4e03..82e906a2 100644
--- a/src/PhpWord/Style/Outline.php
+++ b/src/PhpWord/Style/Outline.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index 44a4efd5..891d4068 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\Shared\Converter;
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index c7a22b39..6ed83758 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\Common\Text;
diff --git a/src/PhpWord/Style/Row.php b/src/PhpWord/Style/Row.php
index 8a5db99f..444f7f28 100644
--- a/src/PhpWord/Style/Row.php
+++ b/src/PhpWord/Style/Row.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index d0945c88..64403663 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Shading.php b/src/PhpWord/Style/Shading.php
index 125ba89c..5d0c51e9 100644
--- a/src/PhpWord/Style/Shading.php
+++ b/src/PhpWord/Style/Shading.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Shadow.php b/src/PhpWord/Style/Shadow.php
index add319e7..f71bc3f9 100644
--- a/src/PhpWord/Style/Shadow.php
+++ b/src/PhpWord/Style/Shadow.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Shape.php b/src/PhpWord/Style/Shape.php
index cdc2f033..586a15c8 100644
--- a/src/PhpWord/Style/Shape.php
+++ b/src/PhpWord/Style/Shape.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index cb52d54b..35ea88d6 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/TOC.php b/src/PhpWord/Style/TOC.php
index 786d1e48..ccce2b38 100644
--- a/src/PhpWord/Style/TOC.php
+++ b/src/PhpWord/Style/TOC.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Tab.php b/src/PhpWord/Style/Tab.php
index 053436ea..3a892523 100644
--- a/src/PhpWord/Style/Tab.php
+++ b/src/PhpWord/Style/Tab.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 3523122f..6d5e1b22 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/src/PhpWord/Style/TextBox.php b/src/PhpWord/Style/TextBox.php
index 744d3979..7a8b6efb 100644
--- a/src/PhpWord/Style/TextBox.php
+++ b/src/PhpWord/Style/TextBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
@@ -69,7 +70,6 @@ class TextBox extends Image
      * Set margin top.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginTop($value = null)
     {
@@ -90,7 +90,6 @@ class TextBox extends Image
      * Set margin left.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginLeft($value = null)
     {
@@ -111,7 +110,6 @@ class TextBox extends Image
      * Set margin right.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginRight($value = null)
     {
@@ -132,7 +130,6 @@ class TextBox extends Image
      * Set margin bottom.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginBottom($value = null)
     {
@@ -153,7 +150,6 @@ class TextBox extends Image
      * Set TLRB cell margin.
      *
      * @param int $value Margin in twips
-     * @return void
      */
     public function setInnerMargin($value = null)
     {
@@ -195,7 +191,6 @@ class TextBox extends Image
      * Set border size.
      *
      * @param int $value Size in points
-     * @return void
      */
     public function setBorderSize($value = null)
     {
@@ -216,7 +211,6 @@ class TextBox extends Image
      * Set border color.
      *
      * @param string $value
-     * @return void
      */
     public function setBorderColor($value = null)
     {
diff --git a/src/PhpWord/Template.php b/src/PhpWord/Template.php
index 3825a3bd..96962b8e 100644
--- a/src/PhpWord/Template.php
+++ b/src/PhpWord/Template.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 2b294950..85a809cc 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Escaper\RegExp;
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index fc560d4d..bf9a52f4 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\Exception\CopyFileException;
diff --git a/src/PhpWord/Writer/HTML.php b/src/PhpWord/Writer/HTML.php
index f20f4824..cb48cf10 100644
--- a/src/PhpWord/Writer/HTML.php
+++ b/src/PhpWord/Writer/HTML.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index 283c87b9..65429db5 100644
--- a/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Element\AbstractElement as Element;
@@ -77,7 +78,6 @@ abstract class AbstractElement
      * Set without paragraph.
      *
      * @param bool $value
-     * @return void
      */
     public function setWithoutP($value)
     {
diff --git a/src/PhpWord/Writer/HTML/Element/Container.php b/src/PhpWord/Writer/HTML/Element/Container.php
index acd5bcb3..78c6d8ed 100644
--- a/src/PhpWord/Writer/HTML/Element/Container.php
+++ b/src/PhpWord/Writer/HTML/Element/Container.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Element\AbstractContainer as ContainerElement;
diff --git a/src/PhpWord/Writer/HTML/Element/Endnote.php b/src/PhpWord/Writer/HTML/Element/Endnote.php
index 0b7f0f23..f387669c 100644
--- a/src/PhpWord/Writer/HTML/Element/Endnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Endnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/Footnote.php b/src/PhpWord/Writer/HTML/Element/Footnote.php
index 2da0bec3..179384af 100644
--- a/src/PhpWord/Writer/HTML/Element/Footnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Footnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index a0dbc6c7..fbc14e42 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Element\Image as ImageElement;
diff --git a/src/PhpWord/Writer/HTML/Element/Link.php b/src/PhpWord/Writer/HTML/Element/Link.php
index 302f0a20..25dafca1 100644
--- a/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/src/PhpWord/Writer/HTML/Element/Link.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/HTML/Element/ListItem.php b/src/PhpWord/Writer/HTML/Element/ListItem.php
index bf5ec9ae..ae8ee340 100644
--- a/src/PhpWord/Writer/HTML/Element/ListItem.php
+++ b/src/PhpWord/Writer/HTML/Element/ListItem.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/HTML/Element/PageBreak.php b/src/PhpWord/Writer/HTML/Element/PageBreak.php
index 6e955f85..2bb008df 100644
--- a/src/PhpWord/Writer/HTML/Element/PageBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/PageBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 33d6a18d..4e4a1149 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index e318d883..e8cd4a7c 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/HTML/Element/TextBreak.php b/src/PhpWord/Writer/HTML/Element/TextBreak.php
index ce8a5e1b..b4b13788 100644
--- a/src/PhpWord/Writer/HTML/Element/TextBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/TextBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/TextRun.php b/src/PhpWord/Writer/HTML/Element/TextRun.php
index 63d73cfe..321c3146 100644
--- a/src/PhpWord/Writer/HTML/Element/TextRun.php
+++ b/src/PhpWord/Writer/HTML/Element/TextRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index 9d8f7842..289a9e43 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 2c2ea35e..6d3fff3d 100644
--- a/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Part;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
index c7ba00a9..d9f28bca 100644
--- a/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Part;
 
 use PhpOffice\PhpWord\Writer\HTML\Element\Container;
diff --git a/src/PhpWord/Writer/HTML/Part/Head.php b/src/PhpWord/Writer/HTML/Part/Head.php
index 3bcbd5a5..695a1c0c 100644
--- a/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/src/PhpWord/Writer/HTML/Part/Head.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Part;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
index 5fdb7cb3..26153b31 100644
--- a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 use PhpOffice\PhpWord\Style\AbstractStyle as Style;
@@ -58,7 +59,6 @@ abstract class AbstractStyle
      * Set parent writer.
      *
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     * @return void
      */
     public function setParentWriter($writer)
     {
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
index 2cb374bc..aa86d46a 100644
--- a/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 use PhpOffice\PhpWord\Style\Font as FontStyle;
diff --git a/src/PhpWord/Writer/HTML/Style/Generic.php b/src/PhpWord/Writer/HTML/Style/Generic.php
index 80a5da53..1e812518 100644
--- a/src/PhpWord/Writer/HTML/Style/Generic.php
+++ b/src/PhpWord/Writer/HTML/Style/Generic.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Style/Image.php b/src/PhpWord/Writer/HTML/Style/Image.php
index 73580a55..74843603 100644
--- a/src/PhpWord/Writer/HTML/Style/Image.php
+++ b/src/PhpWord/Writer/HTML/Style/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 /**
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index f0bcf224..4e7ab1fd 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/src/PhpWord/Writer/ODText.php b/src/PhpWord/Writer/ODText.php
index ff6e567a..f280f241 100644
--- a/src/PhpWord/Writer/ODText.php
+++ b/src/PhpWord/Writer/ODText.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\Media;
@@ -62,7 +63,6 @@ class ODText extends AbstractWriter implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename
-     * @return void
      */
     public function save($filename = null)
     {
diff --git a/src/PhpWord/Writer/ODText/Element/AbstractElement.php b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
index 7ec2254b..cfa5b2f5 100644
--- a/src/PhpWord/Writer/ODText/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement as Word2007AbstractElement;
diff --git a/src/PhpWord/Writer/ODText/Element/Container.php b/src/PhpWord/Writer/ODText/Element/Container.php
index 7f0ad990..c2a5e016 100644
--- a/src/PhpWord/Writer/ODText/Element/Container.php
+++ b/src/PhpWord/Writer/ODText/Element/Container.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container as Word2007Container;
diff --git a/src/PhpWord/Writer/ODText/Element/Image.php b/src/PhpWord/Writer/ODText/Element/Image.php
index 0dccdf0f..23dc0ac1 100644
--- a/src/PhpWord/Writer/ODText/Element/Image.php
+++ b/src/PhpWord/Writer/ODText/Element/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Shared\Converter;
diff --git a/src/PhpWord/Writer/ODText/Element/Link.php b/src/PhpWord/Writer/ODText/Element/Link.php
index c1f3df35..91a1962e 100644
--- a/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/src/PhpWord/Writer/ODText/Element/Link.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index 86e41582..73f18926 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index bbd27e69..699510b2 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Writer/ODText/Element/TextBreak.php b/src/PhpWord/Writer/ODText/Element/TextBreak.php
index fc002ed5..7106797d 100644
--- a/src/PhpWord/Writer/ODText/Element/TextBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/TextBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
diff --git a/src/PhpWord/Writer/ODText/Element/TextRun.php b/src/PhpWord/Writer/ODText/Element/TextRun.php
index c2ade20a..e202eccf 100644
--- a/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 /**
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index 20f5009c..737afd18 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/ODText/Part/AbstractPart.php b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
index e6782d51..abe0a7b9 100644
--- a/src/PhpWord/Writer/ODText/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -36,7 +37,6 @@ abstract class AbstractPart extends Word2007AbstractPart
      * Write common root attributes.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     protected function writeCommonRootAttributes(XMLWriter $xmlWriter)
     {
@@ -73,7 +73,6 @@ abstract class AbstractPart extends Word2007AbstractPart
      * Write font faces declaration.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     protected function writeFontFaces(XMLWriter $xmlWriter)
     {
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index cde079bf..d08eb217 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -110,7 +111,6 @@ class Content extends AbstractPart
      * @since 0.11.0
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeAutoStyles(XMLWriter $xmlWriter)
     {
@@ -133,7 +133,6 @@ class Content extends AbstractPart
      * Write automatic styles.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeTextStyles(XMLWriter $xmlWriter)
     {
@@ -167,7 +166,6 @@ class Content extends AbstractPart
      * Get automatic styles.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     private function getAutoStyles(PhpWord $phpWord)
     {
@@ -190,7 +188,6 @@ class Content extends AbstractPart
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $container
      * @param int &$paragraphStyleCount
      * @param int &$fontStyleCount
-     * @return void
      * @todo Simplify the logic
      */
     private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyleCount)
@@ -224,7 +221,6 @@ class Content extends AbstractPart
      * @param \PhpOffice\PhpWord\Element\Text &$element
      * @param int &$paragraphStyleCount
      * @param int &$fontStyleCount
-     * @return void
      */
     private function getElementStyle(&$element, &$paragraphStyleCount, &$fontStyleCount)
     {
diff --git a/src/PhpWord/Writer/ODText/Part/Manifest.php b/src/PhpWord/Writer/ODText/Part/Manifest.php
index b0bc280c..f706cbff 100644
--- a/src/PhpWord/Writer/ODText/Part/Manifest.php
+++ b/src/PhpWord/Writer/ODText/Part/Manifest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\PhpWord\Media;
diff --git a/src/PhpWord/Writer/ODText/Part/Meta.php b/src/PhpWord/Writer/ODText/Part/Meta.php
index 67e26bbb..d637fef1 100644
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -89,7 +90,6 @@ class Meta extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $property
      * @param string $value
-     * @return void
      *
      * @todo Handle other `$type`: double|date|dateTime|duration|boolean (4th arguments)
      */
diff --git a/src/PhpWord/Writer/ODText/Part/Mimetype.php b/src/PhpWord/Writer/ODText/Part/Mimetype.php
index c29ea9a0..aab88e4d 100644
--- a/src/PhpWord/Writer/ODText/Part/Mimetype.php
+++ b/src/PhpWord/Writer/ODText/Part/Mimetype.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 /**
diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index f656c148..043fe0f6 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
index 072e1d37..050abe02 100644
--- a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 use PhpOffice\PhpWord\Writer\Word2007\Style\AbstractStyle as Word2007AbstractStyle;
diff --git a/src/PhpWord/Writer/ODText/Style/Font.php b/src/PhpWord/Writer/ODText/Style/Font.php
index e5ac2419..b31dadae 100644
--- a/src/PhpWord/Writer/ODText/Style/Font.php
+++ b/src/PhpWord/Writer/ODText/Style/Font.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
@@ -25,8 +26,6 @@ class Font extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Image.php b/src/PhpWord/Writer/ODText/Style/Image.php
index 983bf06c..3efc945c 100644
--- a/src/PhpWord/Writer/ODText/Style/Image.php
+++ b/src/PhpWord/Writer/ODText/Style/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
@@ -25,8 +26,6 @@ class Image extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 9a452477..d0670c42 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
@@ -25,8 +26,6 @@ class Paragraph extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Section.php b/src/PhpWord/Writer/ODText/Style/Section.php
index ec5fcfb1..24766278 100644
--- a/src/PhpWord/Writer/ODText/Style/Section.php
+++ b/src/PhpWord/Writer/ODText/Style/Section.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index 2b387dc3..0144391a 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Style;
 
 /**
@@ -25,8 +26,6 @@ class Table extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/PDF.php b/src/PhpWord/Writer/PDF.php
index ac3d4795..4f29bb63 100644
--- a/src/PhpWord/Writer/PDF.php
+++ b/src/PhpWord/Writer/PDF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Writer/PDF/AbstractRenderer.php b/src/PhpWord/Writer/PDF/AbstractRenderer.php
index a486276c..3b5e3a08 100644
--- a/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Writer/PDF/DomPDF.php b/src/PhpWord/Writer/PDF/DomPDF.php
index 4875d052..8825d4c3 100644
--- a/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/src/PhpWord/Writer/PDF/DomPDF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use Dompdf\Dompdf as DompdfLib;
@@ -38,7 +39,6 @@ class DomPDF extends AbstractRenderer implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename Name of the file to save as
-     * @return void
      */
     public function save($filename = null)
     {
diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index 84ad47dc..764a38d4 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\Writer\WriterInterface;
@@ -37,7 +38,6 @@ class MPDF extends AbstractRenderer implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename Name of the file to save as
-     * @return void
      */
     public function save($filename = null)
     {
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index 01bb9898..4991cee8 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\Writer\WriterInterface;
diff --git a/src/PhpWord/Writer/RTF.php b/src/PhpWord/Writer/RTF.php
index c95881f7..4c33b733 100644
--- a/src/PhpWord/Writer/RTF.php
+++ b/src/PhpWord/Writer/RTF.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/src/PhpWord/Writer/RTF/Element/AbstractElement.php b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
index 97585bdb..83ccd14e 100644
--- a/src/PhpWord/Writer/RTF/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Writer/RTF/Element/Container.php b/src/PhpWord/Writer/RTF/Element/Container.php
index a07c62fd..32be7d7f 100644
--- a/src/PhpWord/Writer/RTF/Element/Container.php
+++ b/src/PhpWord/Writer/RTF/Element/Container.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 use PhpOffice\PhpWord\Writer\HTML\Element\Container as HTMLContainer;
diff --git a/src/PhpWord/Writer/RTF/Element/Image.php b/src/PhpWord/Writer/RTF/Element/Image.php
index 8251e9e6..bf90bf66 100644
--- a/src/PhpWord/Writer/RTF/Element/Image.php
+++ b/src/PhpWord/Writer/RTF/Element/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 use PhpOffice\PhpWord\Element\Image as ImageElement;
diff --git a/src/PhpWord/Writer/RTF/Element/Link.php b/src/PhpWord/Writer/RTF/Element/Link.php
index 120cf230..ef11eb10 100644
--- a/src/PhpWord/Writer/RTF/Element/Link.php
+++ b/src/PhpWord/Writer/RTF/Element/Link.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/ListItem.php b/src/PhpWord/Writer/RTF/Element/ListItem.php
index 379d4660..f80ef5d1 100644
--- a/src/PhpWord/Writer/RTF/Element/ListItem.php
+++ b/src/PhpWord/Writer/RTF/Element/ListItem.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/PageBreak.php b/src/PhpWord/Writer/RTF/Element/PageBreak.php
index 903cb015..8ea86e0f 100644
--- a/src/PhpWord/Writer/RTF/Element/PageBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/PageBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/Table.php b/src/PhpWord/Writer/RTF/Element/Table.php
index 7c552d41..20ee26c1 100644
--- a/src/PhpWord/Writer/RTF/Element/Table.php
+++ b/src/PhpWord/Writer/RTF/Element/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 use PhpOffice\PhpWord\Element\Cell as CellElement;
diff --git a/src/PhpWord/Writer/RTF/Element/Text.php b/src/PhpWord/Writer/RTF/Element/Text.php
index e6e5071d..7b7de882 100644
--- a/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/src/PhpWord/Writer/RTF/Element/Text.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/TextBreak.php b/src/PhpWord/Writer/RTF/Element/TextBreak.php
index ae6836cb..480f9d15 100644
--- a/src/PhpWord/Writer/RTF/Element/TextBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/TextBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/TextRun.php b/src/PhpWord/Writer/RTF/Element/TextRun.php
index f7af2792..2d9081a7 100644
--- a/src/PhpWord/Writer/RTF/Element/TextRun.php
+++ b/src/PhpWord/Writer/RTF/Element/TextRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Element/Title.php b/src/PhpWord/Writer/RTF/Element/Title.php
index 28b0ccbf..8c18d972 100644
--- a/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/src/PhpWord/Writer/RTF/Element/Title.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Element;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 688c9bf4..7c8c93ba 100644
--- a/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Part;
 
 use PhpOffice\PhpWord\Escaper\Rtf;
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
index ac24bcd6..7ed7ea27 100644
--- a/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Part;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/RTF/Part/Header.php b/src/PhpWord/Writer/RTF/Part/Header.php
index 18e674f1..a399ccdc 100644
--- a/src/PhpWord/Writer/RTF/Part/Header.php
+++ b/src/PhpWord/Writer/RTF/Part/Header.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Part;
 
 use PhpOffice\PhpWord\Settings;
@@ -180,8 +181,6 @@ class Header extends AbstractPart
 
     /**
      * Register all fonts and colors in both named and inline styles to appropriate header table.
-     *
-     * @return void
      */
     private function registerFont()
     {
@@ -212,7 +211,6 @@ class Header extends AbstractPart
      * Register border colors.
      *
      * @param \PhpOffice\PhpWord\Style\Border $style
-     * @return void
      */
     private function registerBorderColor($style)
     {
@@ -228,7 +226,6 @@ class Header extends AbstractPart
      * Register fonts and colors.
      *
      * @param \PhpOffice\PhpWord\Style\AbstractStyle $style
-     * @return void
      */
     private function registerFontItems($style)
     {
@@ -248,7 +245,6 @@ class Header extends AbstractPart
      * @param array &$table
      * @param string $value
      * @param string $default
-     * @return void
      */
     private function registerTableItem(&$table, $value, $default = null)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
index 1eaf370a..fa7351e9 100644
--- a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 use PhpOffice\PhpWord\Writer\HTML\Style\AbstractStyle as HTMLAbstractStyle;
diff --git a/src/PhpWord/Writer/RTF/Style/Border.php b/src/PhpWord/Writer/RTF/Style/Border.php
index f0a8fa5e..2913a18c 100644
--- a/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/src/PhpWord/Writer/RTF/Style/Border.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 /**
diff --git a/src/PhpWord/Writer/RTF/Style/Font.php b/src/PhpWord/Writer/RTF/Style/Font.php
index 50a41747..4f78719f 100644
--- a/src/PhpWord/Writer/RTF/Style/Font.php
+++ b/src/PhpWord/Writer/RTF/Style/Font.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 use PhpOffice\PhpWord\Style\Font as FontStyle;
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index 73dbe962..a758a488 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
@@ -73,7 +74,6 @@ class Paragraph extends AbstractStyle
      * Set nested level.
      *
      * @param int $value
-     * @return void
      */
     public function setNestedLevel($value)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index ce3faa68..b64e17d9 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF\Style;
 
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index 577ac76a..0a25c12c 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\Element\Section;
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 7cebd160..2f44c704 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\Text as CommonText;
diff --git a/src/PhpWord/Writer/Word2007/Element/Bookmark.php b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
index 6deb1a24..8ecb1e99 100644
--- a/src/PhpWord/Writer/Word2007/Element/Bookmark.php
+++ b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index 32bf576e..284b6bc1 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Element\Chart as ChartElement;
@@ -27,8 +28,6 @@ class Chart extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index aa0e6b41..ce2ebb3e 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
index 22701d02..7b40e199 100644
--- a/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
@@ -37,8 +38,6 @@ class Container extends AbstractElement
 
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Endnote.php b/src/PhpWord/Writer/Word2007/Element/Endnote.php
index bdd53501..946c1419 100644
--- a/src/PhpWord/Writer/Word2007/Element/Endnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Endnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 34f62d54..a0db34f7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Footnote.php b/src/PhpWord/Writer/Word2007/Element/Footnote.php
index 2564c46a..ee844534 100644
--- a/src/PhpWord/Writer/Word2007/Element/Footnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
@@ -32,8 +33,6 @@ class Footnote extends Text
 
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index bdc9ac7f..db7ebaa4 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 59e7125e..dd0f7756 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
@@ -29,8 +30,6 @@ class Image extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -49,8 +48,6 @@ class Image extends AbstractElement
 
     /**
      * Write image element.
-     *
-     * @return void
      */
     private function writeImage(XMLWriter $xmlWriter, ImageElement $element)
     {
@@ -85,8 +82,6 @@ class Image extends AbstractElement
 
     /**
      * Write watermark element.
-     *
-     * @return void
      */
     private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index 384f53f7..1f853a20 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Element\Line as LineElement;
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index d06e7643..6edc4f2c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Settings;
@@ -27,8 +28,6 @@ class Link extends Text
 {
     /**
      * Write link element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItem.php b/src/PhpWord/Writer/Word2007/Element/ListItem.php
index 01ca2397..2584fff1 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItem.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItem.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
@@ -27,8 +28,6 @@ class ListItem extends AbstractElement
 {
     /**
      * Write list item element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
index 986c3e9f..c0e34093 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
@@ -27,8 +28,6 @@ class ListItemRun extends AbstractElement
 {
     /**
      * Write list item element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/Object.php
index 41fc70e3..54d1869b 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/Object.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Style\Image as ImageStyleWriter;
@@ -27,8 +28,6 @@ class Object extends AbstractElement
 {
     /**
      * Write object element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/PageBreak.php b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
index 96592441..a7087fd2 100644
--- a/src/PhpWord/Writer/Word2007/Element/PageBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
@@ -27,7 +28,6 @@ class PageBreak extends AbstractElement
      * Write element.
      *
      * @usedby \PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement::startElementP()
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
index 6aba9de6..2f67ffb1 100644
--- a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 2afabbdb..dba02197 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Settings;
@@ -27,8 +28,6 @@ class PreserveText extends Text
 {
     /**
      * Write preserve text element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index ea2a1328..2badb761 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
@@ -30,8 +31,6 @@ class SDT extends Text
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -72,7 +71,6 @@ class SDT extends Text
      * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeComboBox(XMLWriter $xmlWriter, SDTElement $element)
     {
@@ -92,7 +90,6 @@ class SDT extends Text
      * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element)
     {
@@ -105,7 +102,6 @@ class SDT extends Text
      * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeDate(XMLWriter $xmlWriter, SDTElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index 0307a2e3..8f5bf651 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
@@ -31,8 +32,6 @@ class Shape extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -80,7 +79,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeArc(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -95,7 +93,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeCurve(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -111,7 +108,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeLine(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -126,7 +122,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writePolyline(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -138,7 +133,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeRoundRect(XMLWriter $xmlWriter, ShapeStyle $style)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index 93ba8a6c..fd33f268 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
@@ -33,8 +34,6 @@ class TOC extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -70,7 +69,6 @@ class TOC extends AbstractElement
      * @param \PhpOffice\PhpWord\Element\TOC $element
      * @param \PhpOffice\PhpWord\Element\Title $title
      * @param bool $writeFieldMark
-     * @return void
      */
     private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $writeFieldMark)
     {
@@ -142,7 +140,6 @@ class TOC extends AbstractElement
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\TOC $element
      * @param int $indent
-     * @return void
      */
     private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, $indent)
     {
@@ -188,7 +185,6 @@ class TOC extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\TOC $element
-     * @return void
      */
     private function writeFieldMark(XMLWriter $xmlWriter, TOCElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index 5ebca13b..40d4cb64 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
index fccc3f53..926f6840 100644
--- a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index a24dc2e0..6b85c566 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Settings;
@@ -27,8 +28,6 @@ class Text extends AbstractElement
 {
     /**
      * Write text element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 4e2a79e8..57273094 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Writer\Word2007\Style\TextBox as TextBoxStyleWriter;
@@ -27,8 +28,6 @@ class TextBox extends Image
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBreak.php b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
index 221e1b95..474f42cc 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
@@ -25,8 +26,6 @@ class TextBreak extends Text
 {
     /**
      * Write text break element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextRun.php b/src/PhpWord/Writer/Word2007/Element/TextRun.php
index 1a684089..8f359021 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextRun.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 /**
@@ -25,8 +26,6 @@ class TextRun extends Text
 {
     /**
      * Write textrun element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 7c6e496e..479bdd40 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\Settings;
@@ -27,8 +28,6 @@ class Title extends AbstractElement
 {
     /**
      * Write title element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 4a617b42..a78a9bc3 100644
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 417d7001..eec09e9d 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index 58b874af..30374a84 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -71,7 +72,6 @@ class Comments extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Comment $comment
-     * @return void
      */
     protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 174a793d..b2f55d32 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
index 29c8d961..eb397a2a 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
index 1c5440b2..0ce58337 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index e1f331da..bb5c3b2a 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index 29268faa..a8318f5c 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -81,7 +82,6 @@ class Document extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Section $section
-     * @return void
      */
     private function writeSection(XMLWriter $xmlWriter, Section $section)
     {
@@ -97,7 +97,6 @@ class Document extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Section $section
-     * @return void
      */
     private function writeSectionSettings(XMLWriter $xmlWriter, Section $section)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Endnotes.php b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
index 898d8c31..d975354e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Endnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/FontTable.php b/src/PhpWord/Writer/Word2007/Part/FontTable.php
index fde8db8e..85da0324 100644
--- a/src/PhpWord/Writer/Word2007/Part/FontTable.php
+++ b/src/PhpWord/Writer/Word2007/Part/FontTable.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/Footer.php b/src/PhpWord/Writer/Word2007/Part/Footer.php
index c405f653..ce3a8b9c 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footer.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footer.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007\Element\Container;
diff --git a/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
index c854e7f3..61145be0 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -136,7 +137,6 @@ class Footnotes extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Footnote|\PhpOffice\PhpWord\Element\Endnote $element
-     * @return void
      */
     protected function writeNote(XMLWriter $xmlWriter, $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Header.php b/src/PhpWord/Writer/Word2007/Part/Header.php
index 01e7c60b..784f1801 100644
--- a/src/PhpWord/Writer/Word2007/Part/Header.php
+++ b/src/PhpWord/Writer/Word2007/Part/Header.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/Numbering.php b/src/PhpWord/Writer/Word2007/Part/Numbering.php
index f6553d30..bb8ae59d 100644
--- a/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
@@ -98,7 +99,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      */
     private function writeLevel(XMLWriter $xmlWriter, NumberingLevel $level)
     {
@@ -139,7 +139,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      * @todo Use paragraph style writer
      */
     private function writeParagraph(XMLWriter $xmlWriter, NumberingLevel $level)
@@ -172,7 +171,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      * @todo Use font style writer
      */
     private function writeFont(XMLWriter $xmlWriter, NumberingLevel $level)
diff --git a/src/PhpWord/Writer/Word2007/Part/Rels.php b/src/PhpWord/Writer/Word2007/Part/Rels.php
index b12933db..4eb687c6 100644
--- a/src/PhpWord/Writer/Word2007/Part/Rels.php
+++ b/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
index 3f750168..eca3686e 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsPart.php b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
index ecf1805a..348558c5 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 3160de11..f6ea65c5 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\ProofState;
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index cc06ef02..36bd095e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Part/Theme.php b/src/PhpWord/Writer/Word2007/Part/Theme.php
index d616ff39..ee3e1f45 100644
--- a/src/PhpWord/Writer/Word2007/Part/Theme.php
+++ b/src/PhpWord/Writer/Word2007/Part/Theme.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index 834347e7..f0a9fa86 100644
--- a/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index 55dc8065..26eb62b1 100644
--- a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
@@ -108,7 +109,6 @@ abstract class AbstractStyle
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $name
      * @param mixed $value
-     * @return void
      */
     protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index 790c42fb..256bf45b 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\Style\Cell as CellStyle;
@@ -32,8 +33,6 @@ class Cell extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -92,7 +91,6 @@ class Cell extends AbstractStyle
      * Set width.
      *
      * @param int $value
-     * @return void
      */
     public function setWidth($value = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index 1d616445..ac81bed6 100644
--- a/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Fill.php b/src/PhpWord/Writer/Word2007/Style/Fill.php
index bf48325c..6edd3847 100644
--- a/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
@@ -25,8 +26,6 @@ class Fill extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index cfb42fa5..193f3ba8 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 33d0d375..e88334cf 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
index 315b4ac4..8bed7c0b 100644
--- a/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Indentation.php b/src/PhpWord/Writer/Word2007/Style/Indentation.php
index 194c7d4f..6cf82f88 100644
--- a/src/PhpWord/Writer/Word2007/Style/Indentation.php
+++ b/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
@@ -25,8 +26,6 @@ class Indentation extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
index 8fff76b3..d3001f0d 100644
--- a/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\Style\Line as LineStyle;
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index 2003d066..a5c2c738 100644
--- a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index aadac78e..7a4ffe2f 100644
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Style/Outline.php b/src/PhpWord/Writer/Word2007/Style/Outline.php
index 2a20da75..cbb6f283 100644
--- a/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index dca4ddda..b58dc361 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/src/PhpWord/Writer/Word2007/Style/Row.php b/src/PhpWord/Writer/Word2007/Style/Row.php
index a89e6b11..1ecf6cf6 100644
--- a/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
index 55aed399..64c8dc71 100644
--- a/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\Style\Section as SectionStyle;
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index 0c9dc3ac..3a260def 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Shadow.php b/src/PhpWord/Writer/Word2007/Style/Shadow.php
index 4b38ba34..a9159ecc 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Shape.php b/src/PhpWord/Writer/Word2007/Style/Shape.php
index 15adda3d..faae22bf 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
@@ -25,8 +26,6 @@ class Shape extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
index 60b7f178..d225ef56 100644
--- a/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
@@ -25,8 +26,6 @@ class Spacing extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
index ec502e1c..13a70bca 100644
--- a/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 9ab18162..ce0b0cab 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
@@ -34,8 +35,6 @@ class Table extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -61,7 +60,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -99,7 +97,6 @@ class Table extends AbstractStyle
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param int $width
      * @param string $unit
-     * @return void
      */
     private function writeWidth(XMLWriter $xmlWriter, $width, $unit)
     {
@@ -114,7 +111,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeMargin(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -134,7 +130,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeBorder(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -155,7 +150,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -175,7 +169,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -193,7 +186,6 @@ class Table extends AbstractStyle
      * Set width.
      *
      * @param int $value
-     * @return void
      */
     public function setWidth($value = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
index 975fd926..6e94cb0f 100644
--- a/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\Style\TextBox as TextBoxStyle;
diff --git a/src/PhpWord/Writer/WriterInterface.php b/src/PhpWord/Writer/WriterInterface.php
index bc1c21e0..09f87617 100644
--- a/src/PhpWord/Writer/WriterInterface.php
+++ b/src/PhpWord/Writer/WriterInterface.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 /**
diff --git a/tests/PhpWord/Collection/CollectionTest.php b/tests/PhpWord/Collection/CollectionTest.php
index 59dd162c..18dfeb70 100644
--- a/tests/PhpWord/Collection/CollectionTest.php
+++ b/tests/PhpWord/Collection/CollectionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Collection;
 
 use PhpOffice\PhpWord\Element\Footnote;
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index 8d0eac5d..003f22e4 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
diff --git a/tests/PhpWord/Element/AbstractElementTest.php b/tests/PhpWord/Element/AbstractElementTest.php
index be0aff7c..80de38bf 100644
--- a/tests/PhpWord/Element/AbstractElementTest.php
+++ b/tests/PhpWord/Element/AbstractElementTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index ca58d8c8..3b8d84a9 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index 6431d145..630fc77f 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index 13d0c330..08783e99 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index a4e95dc6..e3494004 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/FooterTest.php b/tests/PhpWord/Element/FooterTest.php
index 69ee3b5b..c30103c0 100644
--- a/tests/PhpWord/Element/FooterTest.php
+++ b/tests/PhpWord/Element/FooterTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/FootnoteTest.php b/tests/PhpWord/Element/FootnoteTest.php
index aad9d99f..a5f233d6 100644
--- a/tests/PhpWord/Element/FootnoteTest.php
+++ b/tests/PhpWord/Element/FootnoteTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index fdc77607..8f5f1fea 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 0be6bd6b..df2aad98 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index f0fdb9b7..c7e52f83 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index d3f97d5e..793e4c9b 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Font;
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 8ba5308d..fe9f5bbe 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index 9c92ec61..9e5beb4b 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index ba081bff..4c50f6ad 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index d86e8841..66b10a6f 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/PreserveTextTest.php b/tests/PhpWord/Element/PreserveTextTest.php
index 9252c733..37979cad 100644
--- a/tests/PhpWord/Element/PreserveTextTest.php
+++ b/tests/PhpWord/Element/PreserveTextTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index 03863f5d..6625e61a 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index e1032b8d..40da2cf3 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 39b37683..fbdf2fa8 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index 1ac57b7b..4a4d253c 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 0b428ea4..e23427eb 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index be28e7b3..b616ae16 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index 3e84add6..cc760877 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Font;
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index c4364423..d8a68eca 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index a2ab6df4..0ce7c474 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 426fa6d8..2e7ebe40 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Element;
 
 /**
diff --git a/tests/PhpWord/Exception/CopyFileExceptionTest.php b/tests/PhpWord/Exception/CopyFileExceptionTest.php
index 490dfe1a..11d88f0a 100644
--- a/tests/PhpWord/Exception/CopyFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CopyFileExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
index 68941506..e0823a85 100644
--- a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/Exception/ExceptionTest.php b/tests/PhpWord/Exception/ExceptionTest.php
index c0e96e21..c620c7e8 100644
--- a/tests/PhpWord/Exception/ExceptionTest.php
+++ b/tests/PhpWord/Exception/ExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/Exception/InvalidImageExceptionTest.php b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
index 42f9206d..d6efe909 100644
--- a/tests/PhpWord/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
index 6c1f8482..e9d79b05 100644
--- a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
index 553a2e89..c52d3766 100644
--- a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Exception;
 
 /**
diff --git a/tests/PhpWord/IOFactoryTest.php b/tests/PhpWord/IOFactoryTest.php
index 666854cc..7a711734 100644
--- a/tests/PhpWord/IOFactoryTest.php
+++ b/tests/PhpWord/IOFactoryTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**
diff --git a/tests/PhpWord/MediaTest.php b/tests/PhpWord/MediaTest.php
index 8755f31b..e2262352 100644
--- a/tests/PhpWord/MediaTest.php
+++ b/tests/PhpWord/MediaTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Element\Image;
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index da1a9f1b..a1ea7a0e 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 /**
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 37e2cc12..b726a49a 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 use PhpOffice\PhpWord\ComplexType\ProofState;
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index 23a29f89..c44b7926 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Metadata\DocInfo;
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index 67342dc2..50510232 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index 86e42c87..ad2afb56 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
diff --git a/tests/PhpWord/Reader/ODTextTest.php b/tests/PhpWord/Reader/ODTextTest.php
index 09b1adda..63a1c149 100644
--- a/tests/PhpWord/Reader/ODTextTest.php
+++ b/tests/PhpWord/Reader/ODTextTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
diff --git a/tests/PhpWord/Reader/RTFTest.php b/tests/PhpWord/Reader/RTFTest.php
index 027e7c73..aab4072c 100644
--- a/tests/PhpWord/Reader/RTFTest.php
+++ b/tests/PhpWord/Reader/RTFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 8766730a..5421cf98 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index 7699a843..0d32eab3 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 9f256e07..6f2e63c8 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 /**
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index eb39d3b7..9e40cfc9 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\Section;
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index 94dc33b2..156c016c 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Settings;
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index 86efdb68..39d55fbd 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index 198386fe..d531f506 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index e2f1fd02..cc25fa66 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index cf4a35b0..6543a2b3 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index 419780ca..01ba2aae 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index 06b1a70a..9e7d6e71 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index a07c5ac3..1cb30b38 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index 2ac453b4..d99cb475 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/NumberingLevelTest.php b/tests/PhpWord/Style/NumberingLevelTest.php
index 1af7a77c..9d7a0748 100644
--- a/tests/PhpWord/Style/NumberingLevelTest.php
+++ b/tests/PhpWord/Style/NumberingLevelTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index 1158e0e8..41933531 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index 437fdde8..d5dfab05 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index 28530d6e..a403dc00 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index d5a31c49..972c6340 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index 2ec08d4d..830423ac 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index 0dd82fa3..82522384 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index 4c846ce1..6307a53f 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index 15fbd546..ce5484cc 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index 7ef53c60..49a7192f 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 863e05eb..ee2a9c7f 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\JcTable;
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index d59fd426..9e25b8cd 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index 242af07e..48b3c3cd 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 7da6a2c4..0cac9931 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index b39de48b..f92eacd6 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Element\Text as TextElement;
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index 26894a5e..544c6708 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Writer\HTML\Part\Body;
diff --git a/tests/PhpWord/Writer/HTML/StyleTest.php b/tests/PhpWord/Writer/HTML/StyleTest.php
index 54f3779e..ddb7cdd3 100644
--- a/tests/PhpWord/Writer/HTML/StyleTest.php
+++ b/tests/PhpWord/Writer/HTML/StyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 /**
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index 36f346d9..a2fe8395 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index 0c2425e7..5b5f7363 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
index 724a4b5f..14f4cb1a 100644
--- a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\PhpWord\Writer\ODText;
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index e9fd994b..9d0daedf 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index 6369a09b..e086ea0f 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index 9877b700..ec36b4e8 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index 93189e49..e4c4ee52 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index c77e785f..e829e68f 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/PDF/TCPDFTest.php b/tests/PhpWord/Writer/PDF/TCPDFTest.php
index a92fea19..a7bb2a31 100644
--- a/tests/PhpWord/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/TCPDFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/PDFTest.php b/tests/PhpWord/Writer/PDFTest.php
index 3a3ecdff..eb763f79 100644
--- a/tests/PhpWord/Writer/PDFTest.php
+++ b/tests/PhpWord/Writer/PDFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index ba0b34b4..31998350 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF;
 
 use PhpOffice\PhpWord\Writer\RTF;
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index 1c94604e..bd48814c 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF;
 
 /**
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index d2bd60e3..c2b30920 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index a85cd628..4730ebfc 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index 85d8b139..e231f1c8 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
index 34213a01..8e3be114 100644
--- a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 3dbc465d..6103d4c8 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 6833b29e..1fb81e8d 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index ae104a1c..0ecea19e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
index 342e0d70..0418ccec 100644
--- a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index 54abcd96..3eeb37cf 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 9ff5c638..f88ebe2e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 827f633b..0478d0e4 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index da836396..0c8568aa 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\PhpWord\Writer\Word2007\Part\RelsPart;
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index 764388dc..32a0c923 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\TestHelperDOCX;
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index 7273dc33..474d2410 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index c17cb81d..e7708961 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/_includes/TestHelperDOCX.php b/tests/PhpWord/_includes/TestHelperDOCX.php
index 1acf3561..d33b78c9 100644
--- a/tests/PhpWord/_includes/TestHelperDOCX.php
+++ b/tests/PhpWord/_includes/TestHelperDOCX.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Exception\CreateTemporaryFileException;
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 2c2f5c5f..353d3132 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -14,6 +14,7 @@
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord;
 
 /**

From 7e3d9fb89a397182ddd29e0d9a01e6803c5b603b Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 26 Sep 2017 22:00:02 +0200
Subject: [PATCH 100/370] replace @link with @see

---
 .php_cs.dist                                  |  4 +-
 bootstrap.php                                 |  2 +-
 src/PhpWord/Collection/AbstractCollection.php |  2 +-
 src/PhpWord/Collection/Bookmarks.php          |  2 +-
 src/PhpWord/Collection/Charts.php             |  2 +-
 src/PhpWord/Collection/Comments.php           |  2 +-
 src/PhpWord/Collection/Endnotes.php           |  2 +-
 src/PhpWord/Collection/Footnotes.php          |  2 +-
 src/PhpWord/Collection/Titles.php             |  2 +-
 .../ComplexType/FootnoteProperties.php        |  2 +-
 src/PhpWord/ComplexType/ProofState.php        |  2 +-
 src/PhpWord/ComplexType/TrackChangesView.php  |  2 +-
 src/PhpWord/Element/AbstractContainer.php     |  2 +-
 src/PhpWord/Element/AbstractElement.php       |  2 +-
 src/PhpWord/Element/Bookmark.php              |  2 +-
 src/PhpWord/Element/Cell.php                  |  2 +-
 src/PhpWord/Element/Chart.php                 |  2 +-
 src/PhpWord/Element/CheckBox.php              |  2 +-
 src/PhpWord/Element/Comment.php               |  2 +-
 src/PhpWord/Element/Endnote.php               |  2 +-
 src/PhpWord/Element/Field.php                 |  4 +-
 src/PhpWord/Element/Footer.php                |  4 +-
 src/PhpWord/Element/Footnote.php              |  2 +-
 src/PhpWord/Element/FormField.php             |  4 +-
 src/PhpWord/Element/Header.php                |  2 +-
 src/PhpWord/Element/Image.php                 |  2 +-
 src/PhpWord/Element/Line.php                  |  2 +-
 src/PhpWord/Element/Link.php                  |  2 +-
 src/PhpWord/Element/ListItem.php              |  2 +-
 src/PhpWord/Element/ListItemRun.php           |  2 +-
 src/PhpWord/Element/Object.php                |  2 +-
 src/PhpWord/Element/PageBreak.php             |  2 +-
 src/PhpWord/Element/PreserveText.php          |  2 +-
 src/PhpWord/Element/Row.php                   |  2 +-
 src/PhpWord/Element/SDT.php                   |  2 +-
 src/PhpWord/Element/Section.php               |  2 +-
 src/PhpWord/Element/Shape.php                 |  2 +-
 src/PhpWord/Element/TOC.php                   |  2 +-
 src/PhpWord/Element/Table.php                 |  2 +-
 src/PhpWord/Element/Text.php                  |  2 +-
 src/PhpWord/Element/TextBox.php               |  2 +-
 src/PhpWord/Element/TextBreak.php             |  2 +-
 src/PhpWord/Element/TextRun.php               |  2 +-
 src/PhpWord/Element/Title.php                 |  2 +-
 src/PhpWord/Element/TrackChange.php           |  2 +-
 src/PhpWord/Escaper/AbstractEscaper.php       |  2 +-
 src/PhpWord/Escaper/EscaperInterface.php      |  2 +-
 src/PhpWord/Escaper/RegExp.php                |  2 +-
 src/PhpWord/Escaper/Rtf.php                   |  2 +-
 src/PhpWord/Escaper/Xml.php                   |  2 +-
 src/PhpWord/Exception/CopyFileException.php   |  2 +-
 .../CreateTemporaryFileException.php          |  2 +-
 src/PhpWord/Exception/Exception.php           |  2 +-
 .../Exception/InvalidImageException.php       |  2 +-
 .../Exception/InvalidObjectException.php      |  2 +-
 .../Exception/InvalidStyleException.php       |  2 +-
 .../UnsupportedImageTypeException.php         |  2 +-
 src/PhpWord/IOFactory.php                     |  2 +-
 src/PhpWord/Media.php                         |  2 +-
 src/PhpWord/Metadata/Compatibility.php        |  6 +--
 src/PhpWord/Metadata/DocInfo.php              |  2 +-
 src/PhpWord/Metadata/Protection.php           |  6 +--
 src/PhpWord/Metadata/Settings.php             |  6 +--
 src/PhpWord/PhpWord.php                       |  2 +-
 src/PhpWord/Reader/AbstractReader.php         |  2 +-
 src/PhpWord/Reader/HTML.php                   |  2 +-
 src/PhpWord/Reader/MsDoc.php                  | 48 +++++++++----------
 src/PhpWord/Reader/ODText.php                 |  2 +-
 src/PhpWord/Reader/ODText/AbstractPart.php    |  2 +-
 src/PhpWord/Reader/ODText/Content.php         |  2 +-
 src/PhpWord/Reader/ODText/Meta.php            |  2 +-
 src/PhpWord/Reader/RTF.php                    |  2 +-
 src/PhpWord/Reader/RTF/Document.php           |  2 +-
 src/PhpWord/Reader/ReaderInterface.php        |  2 +-
 src/PhpWord/Reader/Word2007.php               |  2 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  2 +-
 src/PhpWord/Reader/Word2007/DocPropsApp.php   |  2 +-
 src/PhpWord/Reader/Word2007/DocPropsCore.php  |  2 +-
 .../Reader/Word2007/DocPropsCustom.php        |  2 +-
 src/PhpWord/Reader/Word2007/Document.php      |  2 +-
 src/PhpWord/Reader/Word2007/Endnotes.php      |  2 +-
 src/PhpWord/Reader/Word2007/Footnotes.php     |  2 +-
 src/PhpWord/Reader/Word2007/Numbering.php     |  2 +-
 src/PhpWord/Reader/Word2007/Settings.php      |  2 +-
 src/PhpWord/Reader/Word2007/Styles.php        |  2 +-
 src/PhpWord/Settings.php                      |  2 +-
 src/PhpWord/Shared/Converter.php              |  2 +-
 src/PhpWord/Shared/Html.php                   |  2 +-
 src/PhpWord/Shared/OLERead.php                |  2 +-
 src/PhpWord/Shared/ZipArchive.php             |  2 +-
 src/PhpWord/SimpleType/Jc.php                 |  4 +-
 src/PhpWord/SimpleType/JcTable.php            |  2 +-
 src/PhpWord/SimpleType/NumberFormat.php       |  2 +-
 src/PhpWord/SimpleType/Zoom.php               |  2 +-
 src/PhpWord/Style.php                         |  2 +-
 src/PhpWord/Style/AbstractStyle.php           |  2 +-
 src/PhpWord/Style/Border.php                  |  2 +-
 src/PhpWord/Style/Cell.php                    |  2 +-
 src/PhpWord/Style/Chart.php                   |  2 +-
 src/PhpWord/Style/Extrusion.php               |  4 +-
 src/PhpWord/Style/Fill.php                    |  6 +--
 src/PhpWord/Style/Font.php                    | 12 ++---
 src/PhpWord/Style/Frame.php                   |  2 +-
 src/PhpWord/Style/Image.php                   |  2 +-
 src/PhpWord/Style/Indentation.php             |  4 +-
 src/PhpWord/Style/Line.php                    |  2 +-
 src/PhpWord/Style/LineNumbering.php           |  6 +--
 src/PhpWord/Style/ListItem.php                |  2 +-
 src/PhpWord/Style/Numbering.php               | 12 ++---
 src/PhpWord/Style/NumberingLevel.php          | 18 +++----
 src/PhpWord/Style/Outline.php                 | 14 +++---
 src/PhpWord/Style/Paper.php                   |  2 +-
 src/PhpWord/Style/Paragraph.php               |  4 +-
 src/PhpWord/Style/Row.php                     |  2 +-
 src/PhpWord/Style/Section.php                 |  8 ++--
 src/PhpWord/Style/Shading.php                 |  8 ++--
 src/PhpWord/Style/Shadow.php                  |  4 +-
 src/PhpWord/Style/Shape.php                   |  2 +-
 src/PhpWord/Style/Spacing.php                 |  4 +-
 src/PhpWord/Style/TOC.php                     |  2 +-
 src/PhpWord/Style/Tab.php                     |  2 +-
 src/PhpWord/Style/Table.php                   |  2 +-
 src/PhpWord/Style/TextBox.php                 |  2 +-
 src/PhpWord/Template.php                      |  2 +-
 src/PhpWord/TemplateProcessor.php             |  2 +-
 src/PhpWord/Writer/AbstractWriter.php         |  2 +-
 src/PhpWord/Writer/HTML.php                   |  2 +-
 .../Writer/HTML/Element/AbstractElement.php   |  2 +-
 src/PhpWord/Writer/HTML/Element/Container.php |  2 +-
 src/PhpWord/Writer/HTML/Element/Endnote.php   |  2 +-
 src/PhpWord/Writer/HTML/Element/Footnote.php  |  2 +-
 src/PhpWord/Writer/HTML/Element/Image.php     |  2 +-
 src/PhpWord/Writer/HTML/Element/Link.php      |  2 +-
 src/PhpWord/Writer/HTML/Element/ListItem.php  |  2 +-
 src/PhpWord/Writer/HTML/Element/PageBreak.php |  2 +-
 src/PhpWord/Writer/HTML/Element/Table.php     |  2 +-
 src/PhpWord/Writer/HTML/Element/Text.php      |  2 +-
 src/PhpWord/Writer/HTML/Element/TextBreak.php |  2 +-
 src/PhpWord/Writer/HTML/Element/TextRun.php   |  2 +-
 src/PhpWord/Writer/HTML/Element/Title.php     |  2 +-
 src/PhpWord/Writer/HTML/Part/AbstractPart.php |  2 +-
 src/PhpWord/Writer/HTML/Part/Body.php         |  2 +-
 src/PhpWord/Writer/HTML/Part/Head.php         |  2 +-
 .../Writer/HTML/Style/AbstractStyle.php       |  2 +-
 src/PhpWord/Writer/HTML/Style/Font.php        |  2 +-
 src/PhpWord/Writer/HTML/Style/Generic.php     |  2 +-
 src/PhpWord/Writer/HTML/Style/Image.php       |  2 +-
 src/PhpWord/Writer/HTML/Style/Paragraph.php   |  2 +-
 src/PhpWord/Writer/ODText.php                 |  2 +-
 .../Writer/ODText/Element/AbstractElement.php |  2 +-
 .../Writer/ODText/Element/Container.php       |  2 +-
 src/PhpWord/Writer/ODText/Element/Image.php   |  2 +-
 src/PhpWord/Writer/ODText/Element/Link.php    |  2 +-
 src/PhpWord/Writer/ODText/Element/Table.php   |  2 +-
 src/PhpWord/Writer/ODText/Element/Text.php    |  2 +-
 .../Writer/ODText/Element/TextBreak.php       |  2 +-
 src/PhpWord/Writer/ODText/Element/TextRun.php |  2 +-
 src/PhpWord/Writer/ODText/Element/Title.php   |  2 +-
 .../Writer/ODText/Part/AbstractPart.php       |  2 +-
 src/PhpWord/Writer/ODText/Part/Content.php    |  2 +-
 src/PhpWord/Writer/ODText/Part/Manifest.php   |  2 +-
 src/PhpWord/Writer/ODText/Part/Meta.php       |  2 +-
 src/PhpWord/Writer/ODText/Part/Mimetype.php   |  2 +-
 src/PhpWord/Writer/ODText/Part/Styles.php     |  2 +-
 .../Writer/ODText/Style/AbstractStyle.php     |  2 +-
 src/PhpWord/Writer/ODText/Style/Font.php      |  2 +-
 src/PhpWord/Writer/ODText/Style/Image.php     |  2 +-
 src/PhpWord/Writer/ODText/Style/Paragraph.php |  2 +-
 src/PhpWord/Writer/ODText/Style/Section.php   |  2 +-
 src/PhpWord/Writer/ODText/Style/Table.php     |  2 +-
 src/PhpWord/Writer/PDF.php                    |  2 +-
 src/PhpWord/Writer/PDF/AbstractRenderer.php   |  2 +-
 src/PhpWord/Writer/PDF/DomPDF.php             |  4 +-
 src/PhpWord/Writer/PDF/MPDF.php               |  4 +-
 src/PhpWord/Writer/PDF/TCPDF.php              |  4 +-
 src/PhpWord/Writer/RTF.php                    |  2 +-
 .../Writer/RTF/Element/AbstractElement.php    |  2 +-
 src/PhpWord/Writer/RTF/Element/Container.php  |  2 +-
 src/PhpWord/Writer/RTF/Element/Image.php      |  2 +-
 src/PhpWord/Writer/RTF/Element/Link.php       |  2 +-
 src/PhpWord/Writer/RTF/Element/ListItem.php   |  2 +-
 src/PhpWord/Writer/RTF/Element/PageBreak.php  |  2 +-
 src/PhpWord/Writer/RTF/Element/Table.php      |  2 +-
 src/PhpWord/Writer/RTF/Element/Text.php       |  2 +-
 src/PhpWord/Writer/RTF/Element/TextBreak.php  |  2 +-
 src/PhpWord/Writer/RTF/Element/TextRun.php    |  2 +-
 src/PhpWord/Writer/RTF/Element/Title.php      |  2 +-
 src/PhpWord/Writer/RTF/Part/AbstractPart.php  |  2 +-
 src/PhpWord/Writer/RTF/Part/Document.php      |  4 +-
 src/PhpWord/Writer/RTF/Part/Header.php        |  4 +-
 .../Writer/RTF/Style/AbstractStyle.php        |  2 +-
 src/PhpWord/Writer/RTF/Style/Border.php       |  2 +-
 src/PhpWord/Writer/RTF/Style/Font.php         |  2 +-
 src/PhpWord/Writer/RTF/Style/Paragraph.php    |  2 +-
 src/PhpWord/Writer/RTF/Style/Section.php      |  2 +-
 src/PhpWord/Writer/Word2007.php               |  2 +-
 .../Word2007/Element/AbstractElement.php      |  2 +-
 .../Writer/Word2007/Element/Bookmark.php      |  2 +-
 src/PhpWord/Writer/Word2007/Element/Chart.php |  2 +-
 .../Writer/Word2007/Element/CheckBox.php      |  2 +-
 .../Writer/Word2007/Element/Container.php     |  2 +-
 .../Writer/Word2007/Element/Endnote.php       |  2 +-
 src/PhpWord/Writer/Word2007/Element/Field.php |  2 +-
 .../Writer/Word2007/Element/Footnote.php      |  2 +-
 .../Writer/Word2007/Element/FormField.php     | 10 ++--
 src/PhpWord/Writer/Word2007/Element/Image.php |  2 +-
 src/PhpWord/Writer/Word2007/Element/Line.php  |  2 +-
 src/PhpWord/Writer/Word2007/Element/Link.php  |  2 +-
 .../Writer/Word2007/Element/ListItem.php      |  2 +-
 .../Writer/Word2007/Element/ListItemRun.php   |  2 +-
 .../Writer/Word2007/Element/Object.php        |  2 +-
 .../Writer/Word2007/Element/PageBreak.php     |  2 +-
 .../Word2007/Element/ParagraphAlignment.php   |  2 +-
 .../Writer/Word2007/Element/PreserveText.php  |  2 +-
 src/PhpWord/Writer/Word2007/Element/SDT.php   | 10 ++--
 src/PhpWord/Writer/Word2007/Element/Shape.php |  2 +-
 src/PhpWord/Writer/Word2007/Element/TOC.php   |  2 +-
 src/PhpWord/Writer/Word2007/Element/Table.php |  2 +-
 .../Word2007/Element/TableAlignment.php       |  2 +-
 src/PhpWord/Writer/Word2007/Element/Text.php  |  2 +-
 .../Writer/Word2007/Element/TextBox.php       |  2 +-
 .../Writer/Word2007/Element/TextBreak.php     |  2 +-
 .../Writer/Word2007/Element/TextRun.php       |  2 +-
 src/PhpWord/Writer/Word2007/Element/Title.php |  2 +-
 .../Writer/Word2007/Part/AbstractPart.php     |  2 +-
 src/PhpWord/Writer/Word2007/Part/Chart.php    | 26 +++++-----
 src/PhpWord/Writer/Word2007/Part/Comments.php |  2 +-
 .../Writer/Word2007/Part/ContentTypes.php     |  2 +-
 .../Writer/Word2007/Part/DocPropsApp.php      |  2 +-
 .../Writer/Word2007/Part/DocPropsCore.php     |  2 +-
 .../Writer/Word2007/Part/DocPropsCustom.php   |  2 +-
 src/PhpWord/Writer/Word2007/Part/Document.php |  2 +-
 src/PhpWord/Writer/Word2007/Part/Endnotes.php |  2 +-
 .../Writer/Word2007/Part/FontTable.php        |  2 +-
 src/PhpWord/Writer/Word2007/Part/Footer.php   |  2 +-
 .../Writer/Word2007/Part/Footnotes.php        |  2 +-
 src/PhpWord/Writer/Word2007/Part/Header.php   |  2 +-
 .../Writer/Word2007/Part/Numbering.php        |  2 +-
 src/PhpWord/Writer/Word2007/Part/Rels.php     |  2 +-
 .../Writer/Word2007/Part/RelsDocument.php     |  2 +-
 src/PhpWord/Writer/Word2007/Part/RelsPart.php |  2 +-
 src/PhpWord/Writer/Word2007/Part/Settings.php |  4 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  2 +-
 src/PhpWord/Writer/Word2007/Part/Theme.php    |  2 +-
 .../Writer/Word2007/Part/WebSettings.php      |  2 +-
 .../Writer/Word2007/Style/AbstractStyle.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/Cell.php    |  2 +-
 .../Writer/Word2007/Style/Extrusion.php       |  2 +-
 src/PhpWord/Writer/Word2007/Style/Fill.php    |  2 +-
 src/PhpWord/Writer/Word2007/Style/Font.php    |  2 +-
 src/PhpWord/Writer/Word2007/Style/Frame.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/Image.php   |  2 +-
 .../Writer/Word2007/Style/Indentation.php     |  2 +-
 src/PhpWord/Writer/Word2007/Style/Line.php    |  2 +-
 .../Writer/Word2007/Style/LineNumbering.php   |  2 +-
 .../Writer/Word2007/Style/MarginBorder.php    |  2 +-
 src/PhpWord/Writer/Word2007/Style/Outline.php |  2 +-
 .../Writer/Word2007/Style/Paragraph.php       |  2 +-
 src/PhpWord/Writer/Word2007/Style/Row.php     |  2 +-
 src/PhpWord/Writer/Word2007/Style/Section.php |  2 +-
 src/PhpWord/Writer/Word2007/Style/Shading.php |  2 +-
 src/PhpWord/Writer/Word2007/Style/Shadow.php  |  2 +-
 src/PhpWord/Writer/Word2007/Style/Shape.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/Spacing.php |  2 +-
 src/PhpWord/Writer/Word2007/Style/Tab.php     |  2 +-
 src/PhpWord/Writer/Word2007/Style/Table.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/TextBox.php |  2 +-
 src/PhpWord/Writer/WriterInterface.php        |  2 +-
 tests/PhpWord/Collection/CollectionTest.php   |  2 +-
 .../ComplexType/FootnotePropertiesTest.php    |  2 +-
 tests/PhpWord/Element/AbstractElementTest.php |  2 +-
 tests/PhpWord/Element/CellTest.php            |  2 +-
 tests/PhpWord/Element/CheckBoxTest.php        |  2 +-
 tests/PhpWord/Element/CommentTest.php         |  2 +-
 tests/PhpWord/Element/FieldTest.php           |  2 +-
 tests/PhpWord/Element/FooterTest.php          |  2 +-
 tests/PhpWord/Element/FootnoteTest.php        |  2 +-
 tests/PhpWord/Element/HeaderTest.php          |  2 +-
 tests/PhpWord/Element/ImageTest.php           |  2 +-
 tests/PhpWord/Element/LineTest.php            |  2 +-
 tests/PhpWord/Element/LinkTest.php            |  2 +-
 tests/PhpWord/Element/ListItemRunTest.php     |  2 +-
 tests/PhpWord/Element/ListItemTest.php        |  2 +-
 tests/PhpWord/Element/ObjectTest.php          |  2 +-
 tests/PhpWord/Element/PageBreakTest.php       |  2 +-
 tests/PhpWord/Element/PreserveTextTest.php    |  2 +-
 tests/PhpWord/Element/RowTest.php             |  2 +-
 tests/PhpWord/Element/SDTTest.php             |  2 +-
 tests/PhpWord/Element/SectionTest.php         |  2 +-
 tests/PhpWord/Element/TOCTest.php             |  2 +-
 tests/PhpWord/Element/TableTest.php           |  2 +-
 tests/PhpWord/Element/TextBoxTest.php         |  2 +-
 tests/PhpWord/Element/TextBreakTest.php       |  2 +-
 tests/PhpWord/Element/TextRunTest.php         |  2 +-
 tests/PhpWord/Element/TextTest.php            |  2 +-
 tests/PhpWord/Element/TitleTest.php           |  2 +-
 .../Exception/CopyFileExceptionTest.php       |  2 +-
 .../CreateTemporaryFileExceptionTest.php      |  2 +-
 tests/PhpWord/Exception/ExceptionTest.php     |  2 +-
 .../Exception/InvalidImageExceptionTest.php   |  2 +-
 .../Exception/InvalidStyleExceptionTest.php   |  2 +-
 .../UnsupportedImageTypeExceptionTest.php     |  2 +-
 tests/PhpWord/IOFactoryTest.php               |  2 +-
 tests/PhpWord/MediaTest.php                   |  2 +-
 tests/PhpWord/Metadata/DocInfoTest.php        |  2 +-
 tests/PhpWord/Metadata/SettingsTest.php       |  2 +-
 tests/PhpWord/PhpWordTest.php                 |  2 +-
 tests/PhpWord/Reader/HTMLTest.php             |  2 +-
 tests/PhpWord/Reader/MsDocTest.php            |  2 +-
 tests/PhpWord/Reader/ODTextTest.php           |  2 +-
 tests/PhpWord/Reader/RTFTest.php              |  2 +-
 tests/PhpWord/Reader/Word2007Test.php         |  2 +-
 tests/PhpWord/SettingsTest.php                |  2 +-
 tests/PhpWord/Shared/ConverterTest.php        |  2 +-
 tests/PhpWord/Shared/HtmlTest.php             |  2 +-
 tests/PhpWord/Shared/ZipArchiveTest.php       |  2 +-
 tests/PhpWord/Style/AbstractStyleTest.php     |  2 +-
 tests/PhpWord/Style/CellTest.php              |  2 +-
 tests/PhpWord/Style/FontTest.php              |  2 +-
 tests/PhpWord/Style/ImageTest.php             |  2 +-
 tests/PhpWord/Style/IndentationTest.php       |  2 +-
 tests/PhpWord/Style/LineNumberingTest.php     |  2 +-
 tests/PhpWord/Style/LineTest.php              |  2 +-
 tests/PhpWord/Style/ListItemTest.php          |  2 +-
 tests/PhpWord/Style/NumberingLevelTest.php    |  2 +-
 tests/PhpWord/Style/NumberingTest.php         |  2 +-
 tests/PhpWord/Style/PaperTest.php             |  2 +-
 tests/PhpWord/Style/ParagraphTest.php         |  2 +-
 tests/PhpWord/Style/RowTest.php               |  2 +-
 tests/PhpWord/Style/SectionTest.php           |  2 +-
 tests/PhpWord/Style/ShadingTest.php           |  2 +-
 tests/PhpWord/Style/SpacingTest.php           |  2 +-
 tests/PhpWord/Style/TOCTest.php               |  2 +-
 tests/PhpWord/Style/TabTest.php               |  2 +-
 tests/PhpWord/Style/TableTest.php             |  2 +-
 tests/PhpWord/Style/TextBoxTest.php           |  2 +-
 tests/PhpWord/StyleTest.php                   |  2 +-
 tests/PhpWord/TemplateProcessorTest.php       |  2 +-
 tests/PhpWord/Writer/HTML/ElementTest.php     |  2 +-
 tests/PhpWord/Writer/HTML/PartTest.php        |  2 +-
 tests/PhpWord/Writer/HTML/StyleTest.php       |  2 +-
 tests/PhpWord/Writer/HTMLTest.php             |  2 +-
 tests/PhpWord/Writer/ODText/ElementTest.php   |  2 +-
 .../Writer/ODText/Part/AbstractPartTest.php   |  2 +-
 .../Writer/ODText/Part/ContentTest.php        |  2 +-
 tests/PhpWord/Writer/ODText/StyleTest.php     |  2 +-
 tests/PhpWord/Writer/ODTextTest.php           |  2 +-
 tests/PhpWord/Writer/PDF/DomPDFTest.php       |  2 +-
 tests/PhpWord/Writer/PDF/MPDFTest.php         |  2 +-
 tests/PhpWord/Writer/PDF/TCPDFTest.php        |  2 +-
 tests/PhpWord/Writer/PDFTest.php              |  2 +-
 tests/PhpWord/Writer/RTF/ElementTest.php      |  2 +-
 tests/PhpWord/Writer/RTF/StyleTest.php        |  2 +-
 tests/PhpWord/Writer/RTFTest.php              |  2 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |  2 +-
 .../Writer/Word2007/Part/AbstractPartTest.php |  2 +-
 .../Writer/Word2007/Part/CommentsTest.php     |  2 +-
 .../Writer/Word2007/Part/DocumentTest.php     |  2 +-
 .../Writer/Word2007/Part/FooterTest.php       |  2 +-
 .../Writer/Word2007/Part/FootnotesTest.php    |  2 +-
 .../Writer/Word2007/Part/HeaderTest.php       |  2 +-
 .../Writer/Word2007/Part/NumberingTest.php    |  2 +-
 .../Writer/Word2007/Part/SettingsTest.php     |  2 +-
 .../Writer/Word2007/Part/StylesTest.php       |  2 +-
 tests/PhpWord/Writer/Word2007/PartTest.php    |  2 +-
 .../Writer/Word2007/Style/FontTest.php        |  2 +-
 tests/PhpWord/Writer/Word2007/StyleTest.php   |  2 +-
 tests/PhpWord/Writer/Word2007Test.php         |  2 +-
 tests/PhpWord/_includes/TestHelperDOCX.php    |  2 +-
 tests/PhpWord/_includes/XmlDocument.php       |  2 +-
 tests/bootstrap.php                           |  2 +-
 371 files changed, 470 insertions(+), 470 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 51a6117a..895ed80f 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -98,14 +98,14 @@ return PhpCsFixer\Config::create()
             'phpdoc_indent' => true,
             'phpdoc_inline_tag' => true,
             'phpdoc_no_access' => true,
-            'phpdoc_no_alias_tag' => false, //@see instead of @link
+            'phpdoc_no_alias_tag' => true,
             'phpdoc_no_empty_return' => true,
             'phpdoc_no_package' => true,
             'phpdoc_no_useless_inheritdoc' => true,
             'phpdoc_order' => true,
             'phpdoc_return_self_reference' => true,
             'phpdoc_scalar' => true,
-            'phpdoc_separation' => false, //TODO
+            'phpdoc_separation' => false,
             'phpdoc_single_line_var_spacing' => true,
             'phpdoc_summary' => false,
             'phpdoc_to_comment' => true,
diff --git a/bootstrap.php b/bootstrap.php
index 4bef8451..362e8b74 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/AbstractCollection.php b/src/PhpWord/Collection/AbstractCollection.php
index f7f29785..61709a50 100644
--- a/src/PhpWord/Collection/AbstractCollection.php
+++ b/src/PhpWord/Collection/AbstractCollection.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Bookmarks.php b/src/PhpWord/Collection/Bookmarks.php
index c7bcc34f..7210fb03 100644
--- a/src/PhpWord/Collection/Bookmarks.php
+++ b/src/PhpWord/Collection/Bookmarks.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Charts.php b/src/PhpWord/Collection/Charts.php
index ad550a2c..56d92c94 100644
--- a/src/PhpWord/Collection/Charts.php
+++ b/src/PhpWord/Collection/Charts.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
index 828c56b7..f2fe82d9 100644
--- a/src/PhpWord/Collection/Comments.php
+++ b/src/PhpWord/Collection/Comments.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Endnotes.php b/src/PhpWord/Collection/Endnotes.php
index f30f638f..52a56d31 100644
--- a/src/PhpWord/Collection/Endnotes.php
+++ b/src/PhpWord/Collection/Endnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Footnotes.php b/src/PhpWord/Collection/Footnotes.php
index bb09e3ec..63989f53 100644
--- a/src/PhpWord/Collection/Footnotes.php
+++ b/src/PhpWord/Collection/Footnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Collection/Titles.php b/src/PhpWord/Collection/Titles.php
index b2a81065..9e4f12cd 100644
--- a/src/PhpWord/Collection/Titles.php
+++ b/src/PhpWord/Collection/Titles.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
index 6d0e45c1..8cb3a869 100644
--- a/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
index b41e2441..6a915da1 100644
--- a/src/PhpWord/ComplexType/ProofState.php
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
index b74e5e3c..51364b4a 100644
--- a/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 75fb38b2..75153499 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 00130170..792a340f 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index 5bb93f65..f4c1a684 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Cell.php b/src/PhpWord/Element/Cell.php
index 18f698c6..b5250cd6 100644
--- a/src/PhpWord/Element/Cell.php
+++ b/src/PhpWord/Element/Cell.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Chart.php b/src/PhpWord/Element/Chart.php
index 0453bd95..c340da40 100644
--- a/src/PhpWord/Element/Chart.php
+++ b/src/PhpWord/Element/Chart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
index cf55166a..11f71ee2 100644
--- a/src/PhpWord/Element/CheckBox.php
+++ b/src/PhpWord/Element/CheckBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 6189afd9..8f76c471 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php
index 36ae66f3..6565c039 100644
--- a/src/PhpWord/Element/Endnote.php
+++ b/src/PhpWord/Element/Endnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index c9f50357..726938b5 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Element;
  * Field element
  *
  * @since 0.11.0
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_SimpleField.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_SimpleField.html
  */
 class Field extends AbstractElement
 {
diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php
index fa668dd7..08ff525a 100644
--- a/src/PhpWord/Element/Footer.php
+++ b/src/PhpWord/Element/Footer.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -26,7 +26,7 @@ class Footer extends AbstractContainer
      * Header/footer types constants
      *
      * @var string
-     * @link http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
+     * @see  http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
      */
     const AUTO = 'default';  // default and odd pages
     const FIRST = 'first';
diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php
index 7789b2db..9acdc4c3 100644
--- a/src/PhpWord/Element/Footnote.php
+++ b/src/PhpWord/Element/Footnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index 19955416..61eb4301 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Element;
  * Form field element
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
  */
 class FormField extends Text
 {
diff --git a/src/PhpWord/Element/Header.php b/src/PhpWord/Element/Header.php
index 2e2612b6..ee820877 100644
--- a/src/PhpWord/Element/Header.php
+++ b/src/PhpWord/Element/Header.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 46fb60a0..c9620b6b 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Line.php b/src/PhpWord/Element/Line.php
index e94a5791..eba66473 100644
--- a/src/PhpWord/Element/Line.php
+++ b/src/PhpWord/Element/Line.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Link.php b/src/PhpWord/Element/Link.php
index d884fc71..05ae0137 100644
--- a/src/PhpWord/Element/Link.php
+++ b/src/PhpWord/Element/Link.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php
index c1294908..7f665b1b 100644
--- a/src/PhpWord/Element/ListItem.php
+++ b/src/PhpWord/Element/ListItem.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
index 9a44dd50..5286f662 100644
--- a/src/PhpWord/Element/ListItemRun.php
+++ b/src/PhpWord/Element/ListItemRun.php
@@ -10,7 +10,7 @@
 * file that was distributed with this source code. For the full list of
 * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
 *
-* @link        https://github.com/PHPOffice/PHPWord
+* @see         https://github.com/PHPOffice/PHPWord
 * @copyright   2010-2017 PHPWord contributors
 * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
diff --git a/src/PhpWord/Element/Object.php b/src/PhpWord/Element/Object.php
index 891b7d53..8fe83224 100644
--- a/src/PhpWord/Element/Object.php
+++ b/src/PhpWord/Element/Object.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/PageBreak.php b/src/PhpWord/Element/PageBreak.php
index a2debaf6..e41e807b 100644
--- a/src/PhpWord/Element/PageBreak.php
+++ b/src/PhpWord/Element/PageBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index e9fa4839..c0a4a84d 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Row.php b/src/PhpWord/Element/Row.php
index f3d26ef5..2e89b354 100644
--- a/src/PhpWord/Element/Row.php
+++ b/src/PhpWord/Element/Row.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 2efefc1e..f65b5b26 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index eb562586..ffc98435 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Shape.php b/src/PhpWord/Element/Shape.php
index a2412ce9..b553a4ac 100644
--- a/src/PhpWord/Element/Shape.php
+++ b/src/PhpWord/Element/Shape.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/TOC.php b/src/PhpWord/Element/TOC.php
index e01aec84..900198d0 100644
--- a/src/PhpWord/Element/TOC.php
+++ b/src/PhpWord/Element/TOC.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 777b84e2..3a045031 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Text.php b/src/PhpWord/Element/Text.php
index f50f3366..4de12176 100644
--- a/src/PhpWord/Element/Text.php
+++ b/src/PhpWord/Element/Text.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/TextBox.php b/src/PhpWord/Element/TextBox.php
index b97a46d1..8058d0c9 100644
--- a/src/PhpWord/Element/TextBox.php
+++ b/src/PhpWord/Element/TextBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/TextBreak.php b/src/PhpWord/Element/TextBreak.php
index da986f74..4cf65f35 100644
--- a/src/PhpWord/Element/TextBreak.php
+++ b/src/PhpWord/Element/TextBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
index 9a23470f..d8a898b4 100644
--- a/src/PhpWord/Element/TextRun.php
+++ b/src/PhpWord/Element/TextRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index 40be3a2b..808af55e 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 721c372a..deaf0055 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index cb3fdfeb..8207e2c6 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
index 45f7f301..1ef35c1b 100644
--- a/src/PhpWord/Escaper/EscaperInterface.php
+++ b/src/PhpWord/Escaper/EscaperInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
index 18279eb8..2f4e12ec 100644
--- a/src/PhpWord/Escaper/RegExp.php
+++ b/src/PhpWord/Escaper/RegExp.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
index 9663c6fc..35f91ada 100644
--- a/src/PhpWord/Escaper/Rtf.php
+++ b/src/PhpWord/Escaper/Rtf.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
index 7b092aac..81cedaa9 100644
--- a/src/PhpWord/Escaper/Xml.php
+++ b/src/PhpWord/Escaper/Xml.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/CopyFileException.php b/src/PhpWord/Exception/CopyFileException.php
index 97e68112..a5c1da6a 100644
--- a/src/PhpWord/Exception/CopyFileException.php
+++ b/src/PhpWord/Exception/CopyFileException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/CreateTemporaryFileException.php b/src/PhpWord/Exception/CreateTemporaryFileException.php
index 16a9baa0..fafc8dac 100644
--- a/src/PhpWord/Exception/CreateTemporaryFileException.php
+++ b/src/PhpWord/Exception/CreateTemporaryFileException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/Exception.php b/src/PhpWord/Exception/Exception.php
index 498ef38c..b94ed1be 100644
--- a/src/PhpWord/Exception/Exception.php
+++ b/src/PhpWord/Exception/Exception.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/InvalidImageException.php b/src/PhpWord/Exception/InvalidImageException.php
index 4d863545..0a7b8fed 100644
--- a/src/PhpWord/Exception/InvalidImageException.php
+++ b/src/PhpWord/Exception/InvalidImageException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/InvalidObjectException.php b/src/PhpWord/Exception/InvalidObjectException.php
index 61e933f3..54015506 100644
--- a/src/PhpWord/Exception/InvalidObjectException.php
+++ b/src/PhpWord/Exception/InvalidObjectException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/InvalidStyleException.php b/src/PhpWord/Exception/InvalidStyleException.php
index 4110e55e..e697f6cf 100644
--- a/src/PhpWord/Exception/InvalidStyleException.php
+++ b/src/PhpWord/Exception/InvalidStyleException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Exception/UnsupportedImageTypeException.php b/src/PhpWord/Exception/UnsupportedImageTypeException.php
index d2d2b360..73b41d04 100644
--- a/src/PhpWord/Exception/UnsupportedImageTypeException.php
+++ b/src/PhpWord/Exception/UnsupportedImageTypeException.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/IOFactory.php b/src/PhpWord/IOFactory.php
index b523480c..eed1f163 100644
--- a/src/PhpWord/IOFactory.php
+++ b/src/PhpWord/IOFactory.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
index c358f2a0..d9879010 100644
--- a/src/PhpWord/Media.php
+++ b/src/PhpWord/Media.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Metadata/Compatibility.php b/src/PhpWord/Metadata/Compatibility.php
index d990b095..69f6f98a 100644
--- a/src/PhpWord/Metadata/Compatibility.php
+++ b/src/PhpWord/Metadata/Compatibility.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Metadata;
  * Compatibility setting class
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_Compat.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Compat.html
  */
 class Compatibility
 {
@@ -33,7 +33,7 @@ class Compatibility
      * 15 = 2013
      *
      * @var int
-     * @link http://msdn.microsoft.com/en-us/library/dd909048%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd909048%28v=office.12%29.aspx
      */
     private $ooxmlVersion = 12;
 
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index 37a5ff92..0508dcd0 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 448b1063..ef5063f8 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Metadata;
  * Document protection class
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
  * @todo Password!
  */
 class Protection
@@ -30,7 +30,7 @@ class Protection
      * Editing restriction readOnly|comments|trackedChanges|forms
      *
      * @var string
-     * @link http://www.datypic.com/sc/ooxml/a-w_edit-1.html
+     * @see  http://www.datypic.com/sc/ooxml/a-w_edit-1.html
      */
     private $editing;
 
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 418c044d..d5652640 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -25,14 +25,14 @@ use PhpOffice\PhpWord\SimpleType\Zoom;
  * Setting class
  *
  * @since 0.14.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
  */
 class Settings
 {
     /**
      * Magnification Setting
      *
-     * @link http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
+     * @see  http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
      * @var mixed either integer, in which case it treated as a percent, or one of PhpOffice\PhpWord\SimpleType\Zoom
      */
     private $zoom = 100;
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 6f524350..d7c2348a 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
diff --git a/src/PhpWord/Reader/AbstractReader.php b/src/PhpWord/Reader/AbstractReader.php
index 7779226f..f59a9556 100644
--- a/src/PhpWord/Reader/AbstractReader.php
+++ b/src/PhpWord/Reader/AbstractReader.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/HTML.php b/src/PhpWord/Reader/HTML.php
index 46ea4abc..4e8b5e82 100644
--- a/src/PhpWord/Reader/HTML.php
+++ b/src/PhpWord/Reader/HTML.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index 79731cfd..9baacb51 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -169,8 +169,8 @@ class MsDoc extends AbstractReader implements ReaderInterface
     }
 
     /**
-     * @link http://msdn.microsoft.com/en-us/library/dd949344%28v=office.12%29.aspx
-     * @link https://igor.io/2012/09/24/binary-parsing.html
+     * @see  http://msdn.microsoft.com/en-us/library/dd949344%28v=office.12%29.aspx
+     * @see  https://igor.io/2012/09/24/binary-parsing.html
      * @param string $data
      */
     private function readFib($data)
@@ -1109,11 +1109,11 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $this->readRecordPlcfSed();
 
         // reading paragraphs
-        //@link https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L86
+        //@see  https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L86
         $this->readRecordPlcfBtePapx();
 
         // reading character formattings
-        //@link https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L94
+        //@see  https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L94
         $this->readRecordPlcfBteChpx();
 
         $this->generatePhpWord();
@@ -1121,7 +1121,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Section and information about them
-     * @link : http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
+     * @see  : http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
      */
     private function readRecordPlcfSed()
     {
@@ -1135,7 +1135,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $posMem += 4;
 
         // PlcfSed : aSed
-        //@link : http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
+        //@see  : http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
         $numSed = $this->getNumInLcb($this->arrayFib['lcbPlcfSed'], 12);
 
         $aSed = array();
@@ -1166,7 +1166,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Specifies the fonts that are used in the document
-     * @link : http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
+     * @see  : http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
      */
     private function readRecordSttbfFfn()
     {
@@ -1225,7 +1225,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Paragraph and information about them
-     * @link http://msdn.microsoft.com/en-us/library/dd908569%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd908569%28v=office.12%29.aspx
      */
     private function readRecordPlcfBtePapx()
     {
@@ -1249,7 +1249,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
             }
             $arrayRGB = array();
             for ($inc = 1; $inc <= $numRun; $inc++) {
-                // @link http://msdn.microsoft.com/en-us/library/dd925804(v=office.12).aspx
+                // @see  http://msdn.microsoft.com/en-us/library/dd925804(v=office.12).aspx
                 $arrayRGB[$inc] = self::getInt1d($this->dataWorkDocument, $offset);
                 $offset += 1;
                 // reserved
@@ -1428,7 +1428,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 } else {
                     if ($istd > 0) {
                         // @todo : Determining Properties of a Paragraph Style
-                        # @link http://msdn.microsoft.com/en-us/library/dd948631%28v=office.12%29.aspx
+                        # @see  http://msdn.microsoft.com/en-us/library/dd948631%28v=office.12%29.aspx
                     }
                 }
             }*/
@@ -1437,7 +1437,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Character formatting properties to text in a document
-     * @link http://msdn.microsoft.com/en-us/library/dd907108%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd907108%28v=office.12%29.aspx
      */
     private function readRecordPlcfBteChpx()
     {
@@ -1455,7 +1455,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $offset = $offsetBase;
 
         // ChpxFkp
-        // @link : http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
+        // @see  : http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
         $numRGFC = self::getInt1d($this->dataWorkDocument, $offset + 511);
         $arrayRGFC = array();
         for ($inc = 0; $inc <= $numRGFC; $inc++) {
@@ -1478,7 +1478,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
             if ($rgb > 0) {
                 // Chp Structure
-                // @link : http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
+                // @see  : http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
                 $posRGB = $offsetBase + $rgb * 2;
 
                 $cb = self::getInt1d($this->dataWorkDocument, $posRGB);
@@ -1571,7 +1571,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
      * @param $pos int
      * @param $cbNum int
      * @return \stdClass
-     * @link http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
      */
     private function readPrl($data, $pos, $cbNum)
     {
@@ -1736,7 +1736,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             }
                             break;
                         // sprmCIco
-                        //@link http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
+                        //@see  http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
                         case 0x42:
                             switch (dechex($operand)) {
                                 case 0x00:
@@ -1842,7 +1842,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         case 0x61:
                             break;
                         // sprmCShd80
-                        //@link http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
+                        //@see  http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
                         case 0x66:
                             // $operand = self::getInt2d($data, $pos);
                             $pos += 2;
@@ -1852,7 +1852,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             // $icoFore = ($operand >> 11) && bindec('11111');
                             break;
                         // sprmCCv
-                        //@link : http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
+                        //@see  : http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
                         case 0x70:
                             $red = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
                             $pos += 1;
@@ -1954,7 +1954,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 // HFD > clsid
                 $sprmCPicLocation += 16;
                 // HFD > hyperlink
-                //@link : http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
                 $streamVersion = self::getInt4d($this->dataData, $sprmCPicLocation);
                 $sprmCPicLocation += 4;
                 $data = self::getInt4d($this->dataData, $sprmCPicLocation);
@@ -2022,8 +2022,8 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 }*/
             } else {
                 // Pictures
-                //@link : http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
-                //@link : http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
                 // PICF : lcb
                 $sprmCPicLocation += 4;
                 // PICF : cbHeader
@@ -2110,13 +2110,13 @@ class MsDoc extends AbstractReader implements ReaderInterface
                     $sprmCPicLocation += $shapeRH['recLen'];
                 }
                 // picture : rgfb
-                //@link : http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
                 $fileBlockRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                 while ($fileBlockRH['recType'] == 0xF007 || ($fileBlockRH['recType'] >= 0xF018 && $fileBlockRH['recType'] <= 0xF117)) {
                     $sprmCPicLocation += 8;
                     switch ($fileBlockRH['recType']) {
                         // OfficeArtFBSE
-                        //@link : http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
+                        //@see  : http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
                         case 0xF007:
                             // btWin32
                             $sprmCPicLocation += 1;
@@ -2151,7 +2151,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                 }
                             }
                             // embeddedBlip
-                            //@link : http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
+                            //@see  : http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
                             $embeddedBlipRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                             switch ($embeddedBlipRH['recType']) {
                                 case self::OFFICEARTBLIPJPG:
diff --git a/src/PhpWord/Reader/ODText.php b/src/PhpWord/Reader/ODText.php
index 1d2577c8..5a22b4ba 100644
--- a/src/PhpWord/Reader/ODText.php
+++ b/src/PhpWord/Reader/ODText.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php
index c48b4ade..bdac3b6f 100644
--- a/src/PhpWord/Reader/ODText/AbstractPart.php
+++ b/src/PhpWord/Reader/ODText/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index 5e3d8ca6..8843d8a2 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/ODText/Meta.php b/src/PhpWord/Reader/ODText/Meta.php
index 6f8f813f..98832d17 100644
--- a/src/PhpWord/Reader/ODText/Meta.php
+++ b/src/PhpWord/Reader/ODText/Meta.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/RTF.php b/src/PhpWord/Reader/RTF.php
index dafd5b3c..2d09a04d 100644
--- a/src/PhpWord/Reader/RTF.php
+++ b/src/PhpWord/Reader/RTF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/RTF/Document.php b/src/PhpWord/Reader/RTF/Document.php
index 6f39abe9..be16d707 100644
--- a/src/PhpWord/Reader/RTF/Document.php
+++ b/src/PhpWord/Reader/RTF/Document.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/ReaderInterface.php b/src/PhpWord/Reader/ReaderInterface.php
index 5f52ad19..3b2e357b 100644
--- a/src/PhpWord/Reader/ReaderInterface.php
+++ b/src/PhpWord/Reader/ReaderInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index cacefb55..9f9fce08 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index a420d45a..0cc8b114 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/DocPropsApp.php b/src/PhpWord/Reader/Word2007/DocPropsApp.php
index 72ad3da5..df34c9c3 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsApp.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsApp.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php
index aa02f155..f82c6b4b 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCore.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
index 90580c17..a3d6b90b 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCustom.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index be9263d5..ff094bcc 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Endnotes.php b/src/PhpWord/Reader/Word2007/Endnotes.php
index 5b753473..0f46cb2f 100644
--- a/src/PhpWord/Reader/Word2007/Endnotes.php
+++ b/src/PhpWord/Reader/Word2007/Endnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index 6de107a4..61988723 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Numbering.php b/src/PhpWord/Reader/Word2007/Numbering.php
index 9669f4e0..c2a81dd5 100644
--- a/src/PhpWord/Reader/Word2007/Numbering.php
+++ b/src/PhpWord/Reader/Word2007/Numbering.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index e5519a78..450870e7 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index 93bf2132..b8e6f22b 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 7a336f3b..91efa1a6 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index 64126a6f..6ba2b567 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 53fcc329..670ba6e5 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index 398f28b3..e4efd7da 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index c8cf36cf..d73f6c33 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index 5c4ba2fa..1a5d33ad 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -28,7 +28,7 @@ use PhpOffice\PhpWord\Shared\AbstractEnum;
  * @since 0.13.0
  *
  * @see \PhpOffice\PhpWord\SimpleType\JcTable For table alignment modes available since ISO/IEC-29500:2008.
- * @link http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
  *
  * @codeCoverageIgnore
  */
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index fc30f676..e1af89ad 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
index 06f2df21..480d8539 100644
--- a/src/PhpWord/SimpleType/NumberFormat.php
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/SimpleType/Zoom.php b/src/PhpWord/SimpleType/Zoom.php
index 987026b5..111e4ea1 100644
--- a/src/PhpWord/SimpleType/Zoom.php
+++ b/src/PhpWord/SimpleType/Zoom.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 4d82a7af..1939aaba 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php
index 8bfb3a09..fb62922c 100644
--- a/src/PhpWord/Style/AbstractStyle.php
+++ b/src/PhpWord/Style/AbstractStyle.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index 23add07f..5c62afcd 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index ecd4fc61..0c4ca2e1 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 6a0e2c14..694fcddc 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Extrusion.php b/src/PhpWord/Style/Extrusion.php
index e2cf76e5..11c03eda 100644
--- a/src/PhpWord/Style/Extrusion.php
+++ b/src/PhpWord/Style/Extrusion.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * 3D extrusion style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-o_CT_Extrusion.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-o_CT_Extrusion.html
  * @since 0.12.0
  */
 class Extrusion extends AbstractStyle
diff --git a/src/PhpWord/Style/Fill.php b/src/PhpWord/Style/Fill.php
index 184e6970..9b473009 100644
--- a/src/PhpWord/Style/Fill.php
+++ b/src/PhpWord/Style/Fill.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,9 +20,9 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Fill style
  *
- * There are still lot of interesting things for this style that can be added, including gradient. See @link.
+ * There are still lot of interesting things for this style that can be added, including gradient. See @see .
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Fill.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Fill.html
  * @since 0.12.0
  */
 class Fill extends AbstractStyle
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index fa54e5e2..b5d57c02 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -162,7 +162,7 @@ class Font extends AbstractStyle
      * Small caps
      *
      * @var bool
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_smallCaps-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_smallCaps-1.html
      */
     private $smallCaps = false;
 
@@ -170,7 +170,7 @@ class Font extends AbstractStyle
      * All caps
      *
      * @var bool
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_caps-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_caps-1.html
      */
     private $allCaps = false;
 
@@ -186,7 +186,7 @@ class Font extends AbstractStyle
      *
      * @var int
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_w-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_w-1.html
      */
     private $scale;
 
@@ -195,7 +195,7 @@ class Font extends AbstractStyle
      *
      * @var int|float
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_spacing-2.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_spacing-2.html
      */
     private $spacing;
 
@@ -204,7 +204,7 @@ class Font extends AbstractStyle
      *
      * @var int|float
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_kern-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_kern-1.html
      */
     private $kerning;
 
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index 35f5ad00..a8e1c69d 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Image.php b/src/PhpWord/Style/Image.php
index b9ce2acc..c3f1863c 100644
--- a/src/PhpWord/Style/Image.php
+++ b/src/PhpWord/Style/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Indentation.php b/src/PhpWord/Style/Indentation.php
index ab5b8bb2..9621714c 100644
--- a/src/PhpWord/Style/Indentation.php
+++ b/src/PhpWord/Style/Indentation.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Paragraph indentation style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Ind.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Ind.html
  * @since 0.10.0
  */
 class Indentation extends AbstractStyle
diff --git a/src/PhpWord/Style/Line.php b/src/PhpWord/Style/Line.php
index 49530f24..16d15950 100644
--- a/src/PhpWord/Style/Line.php
+++ b/src/PhpWord/Style/Line.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/LineNumbering.php b/src/PhpWord/Style/LineNumbering.php
index 7e293bf0..b5f3c263 100644
--- a/src/PhpWord/Style/LineNumbering.php
+++ b/src/PhpWord/Style/LineNumbering.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Line numbering style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_LineNumber.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_LineNumber.html
  * @since 0.10.0
  */
 class LineNumbering extends AbstractStyle
@@ -55,7 +55,7 @@ class LineNumbering extends AbstractStyle
      * Line numbering restart setting continuous|newPage|newSection
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html
      */
     private $restart;
 
diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php
index 7a252e5d..8eaf11b3 100644
--- a/src/PhpWord/Style/ListItem.php
+++ b/src/PhpWord/Style/ListItem.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Numbering.php b/src/PhpWord/Style/Numbering.php
index 2d490a06..80ed5dca 100644
--- a/src/PhpWord/Style/Numbering.php
+++ b/src/PhpWord/Style/Numbering.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,9 +20,9 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Numbering style
  *
- * @link http://www.schemacentral.com/sc/ooxml/e-w_numbering.html
- * @link http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html
- * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_numbering.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
  * @since 0.10.0
  */
 class Numbering extends AbstractStyle
@@ -31,7 +31,7 @@ class Numbering extends AbstractStyle
      * Numbering definition instance ID
      *
      * @var int
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
      */
     private $numId;
 
@@ -39,7 +39,7 @@ class Numbering extends AbstractStyle
      * Multilevel type singleLevel|multilevel|hybridMultilevel
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_val-67.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_val-67.html
      */
     private $type;
 
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 8406218c..33c151e4 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -23,7 +23,7 @@ use PhpOffice\PhpWord\SimpleType\NumberFormat;
 /**
  * Numbering level definition
  *
- * @link http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html
  * @since 0.10.0
  */
 class NumberingLevel extends AbstractStyle
@@ -39,7 +39,7 @@ class NumberingLevel extends AbstractStyle
      * Starting value w:start
      *
      * @var int
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_start-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_start-1.html
      */
     private $start = 1;
 
@@ -47,7 +47,7 @@ class NumberingLevel extends AbstractStyle
      * Numbering format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
      */
     private $format;
 
@@ -55,7 +55,7 @@ class NumberingLevel extends AbstractStyle
      * Restart numbering level symbol w:lvlRestart
      *
      * @var int
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lvlRestart-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlRestart-1.html
      */
     private $restart;
 
@@ -63,7 +63,7 @@ class NumberingLevel extends AbstractStyle
      * Related paragraph style
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_pStyle-2.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_pStyle-2.html
      */
     private $pStyle;
 
@@ -71,7 +71,7 @@ class NumberingLevel extends AbstractStyle
      * Content between numbering symbol and paragraph text w:suff
      *
      * @var string tab|space|nothing
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
      */
     private $suffix = 'tab';
 
@@ -79,7 +79,7 @@ class NumberingLevel extends AbstractStyle
      * Numbering level text e.g. %1 for nonbullet or bullet character
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lvlText-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlText-1.html
      */
     private $text;
 
@@ -122,7 +122,7 @@ class NumberingLevel extends AbstractStyle
      * Hint default|eastAsia|cs
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_hint-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_hint-1.html
      */
     private $hint;
 
diff --git a/src/PhpWord/Style/Outline.php b/src/PhpWord/Style/Outline.php
index 82e906a2..fb7e028a 100644
--- a/src/PhpWord/Style/Outline.php
+++ b/src/PhpWord/Style/Outline.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,8 +20,8 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Outline defines the line/border of the object
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Stroke.html
- * @link http://www.w3.org/TR/1998/NOTE-VML-19980513#_Toc416858395
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Stroke.html
+ * @see  http://www.w3.org/TR/1998/NOTE-VML-19980513#_Toc416858395
  * @since 0.12.0
  */
 class Outline extends AbstractStyle
@@ -29,7 +29,7 @@ class Outline extends AbstractStyle
     /**
      * Line style constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeLineStyle.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeLineStyle.html
      * @const string
      */
     const LINE_SINGLE = 'single';
@@ -41,7 +41,7 @@ class Outline extends AbstractStyle
     /**
      * Line style constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
      * @const string
      */
     const ENDCAP_FLAT = 'flat';
@@ -51,7 +51,7 @@ class Outline extends AbstractStyle
     /**
      * Arrowhead type constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeArrowType.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeArrowType.html
      * @const string
      */
     const ARROW_NONE = 'none';
@@ -100,7 +100,7 @@ class Outline extends AbstractStyle
      * End cap
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
      */
     private $endCap;
 
diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index 891d4068..2fbf59d2 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 6ed83758..8b44ad8b 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -46,7 +46,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  * - Borders
  * - Background
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_PPr.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_PPr.html
  */
 class Paragraph extends Border
 {
diff --git a/src/PhpWord/Style/Row.php b/src/PhpWord/Style/Row.php
index 444f7f28..b56c6f5f 100644
--- a/src/PhpWord/Style/Row.php
+++ b/src/PhpWord/Style/Row.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index 64403663..476846f5 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -48,7 +48,7 @@ class Section extends Border
      * Page Orientation
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_orient-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_orient-1.html
      */
     private $orientation = self::ORIENTATION_PORTRAIT;
 
@@ -105,7 +105,7 @@ class Section extends Border
      * Page gutter spacing
      *
      * @var int|float
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_pgMar-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_pgMar-1.html
      */
     private $gutter = self::DEFAULT_GUTTER;
 
@@ -162,7 +162,7 @@ class Section extends Border
      * Line numbering
      *
      * @var \PhpOffice\PhpWord\Style\LineNumbering
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lnNumType-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lnNumType-1.html
      */
     private $lineNumbering;
 
diff --git a/src/PhpWord/Style/Shading.php b/src/PhpWord/Style/Shading.php
index 5d0c51e9..eeb055b2 100644
--- a/src/PhpWord/Style/Shading.php
+++ b/src/PhpWord/Style/Shading.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Shading style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Shd.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Shd.html
  * @since 0.10.0
  */
 class Shading extends AbstractStyle
@@ -29,7 +29,7 @@ class Shading extends AbstractStyle
      * Pattern constants (partly)
      *
      * @const string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     const PATTERN_CLEAR = 'clear'; // No pattern
     const PATTERN_SOLID = 'solid'; // 100% fill pattern
@@ -43,7 +43,7 @@ class Shading extends AbstractStyle
      * Shading pattern
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     private $pattern = self::PATTERN_CLEAR;
 
diff --git a/src/PhpWord/Style/Shadow.php b/src/PhpWord/Style/Shadow.php
index f71bc3f9..71d1e3e0 100644
--- a/src/PhpWord/Style/Shadow.php
+++ b/src/PhpWord/Style/Shadow.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Shadow style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Shadow.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Shadow.html
  * @since 0.12.0
  */
 class Shadow extends AbstractStyle
diff --git a/src/PhpWord/Style/Shape.php b/src/PhpWord/Style/Shape.php
index 586a15c8..fc84241d 100644
--- a/src/PhpWord/Style/Shape.php
+++ b/src/PhpWord/Style/Shape.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index 35ea88d6..e0eee374 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Spacing between lines and above/below paragraph style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Spacing.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Spacing.html
  * @since 0.10.0
  */
 class Spacing extends AbstractStyle
diff --git a/src/PhpWord/Style/TOC.php b/src/PhpWord/Style/TOC.php
index ccce2b38..938e6de1 100644
--- a/src/PhpWord/Style/TOC.php
+++ b/src/PhpWord/Style/TOC.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Tab.php b/src/PhpWord/Style/Tab.php
index 3a892523..09e49e02 100644
--- a/src/PhpWord/Style/Tab.php
+++ b/src/PhpWord/Style/Tab.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 6d5e1b22..a3d454f3 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Style/TextBox.php b/src/PhpWord/Style/TextBox.php
index 7a8b6efb..093e1f3f 100644
--- a/src/PhpWord/Style/TextBox.php
+++ b/src/PhpWord/Style/TextBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Template.php b/src/PhpWord/Template.php
index 96962b8e..a4769927 100644
--- a/src/PhpWord/Template.php
+++ b/src/PhpWord/Template.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 85a809cc..c46038ee 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index bf9a52f4..09a00990 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML.php b/src/PhpWord/Writer/HTML.php
index cb48cf10..9b098dd8 100644
--- a/src/PhpWord/Writer/HTML.php
+++ b/src/PhpWord/Writer/HTML.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index 65429db5..f6e06258 100644
--- a/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Container.php b/src/PhpWord/Writer/HTML/Element/Container.php
index 78c6d8ed..677b6173 100644
--- a/src/PhpWord/Writer/HTML/Element/Container.php
+++ b/src/PhpWord/Writer/HTML/Element/Container.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Endnote.php b/src/PhpWord/Writer/HTML/Element/Endnote.php
index f387669c..c4a3e436 100644
--- a/src/PhpWord/Writer/HTML/Element/Endnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Endnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Footnote.php b/src/PhpWord/Writer/HTML/Element/Footnote.php
index 179384af..60b246f8 100644
--- a/src/PhpWord/Writer/HTML/Element/Footnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Footnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index fbc14e42..3e516b53 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Link.php b/src/PhpWord/Writer/HTML/Element/Link.php
index 25dafca1..bdea985a 100644
--- a/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/src/PhpWord/Writer/HTML/Element/Link.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/ListItem.php b/src/PhpWord/Writer/HTML/Element/ListItem.php
index ae8ee340..02b25eb9 100644
--- a/src/PhpWord/Writer/HTML/Element/ListItem.php
+++ b/src/PhpWord/Writer/HTML/Element/ListItem.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/PageBreak.php b/src/PhpWord/Writer/HTML/Element/PageBreak.php
index 2bb008df..5cab2724 100644
--- a/src/PhpWord/Writer/HTML/Element/PageBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/PageBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 4e4a1149..c7d8670b 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index e8cd4a7c..ed1ba4a3 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/TextBreak.php b/src/PhpWord/Writer/HTML/Element/TextBreak.php
index b4b13788..93ab924a 100644
--- a/src/PhpWord/Writer/HTML/Element/TextBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/TextBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/TextRun.php b/src/PhpWord/Writer/HTML/Element/TextRun.php
index 321c3146..d7461539 100644
--- a/src/PhpWord/Writer/HTML/Element/TextRun.php
+++ b/src/PhpWord/Writer/HTML/Element/TextRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index 289a9e43..ee8f271b 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 6d3fff3d..7b6e0c3e 100644
--- a/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
index d9f28bca..eea17350 100644
--- a/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Part/Head.php b/src/PhpWord/Writer/HTML/Part/Head.php
index 695a1c0c..f4d63014 100644
--- a/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/src/PhpWord/Writer/HTML/Part/Head.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
index 26153b31..fa27c085 100644
--- a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
index aa86d46a..cb96cf64 100644
--- a/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Style/Generic.php b/src/PhpWord/Writer/HTML/Style/Generic.php
index 1e812518..73830707 100644
--- a/src/PhpWord/Writer/HTML/Style/Generic.php
+++ b/src/PhpWord/Writer/HTML/Style/Generic.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Style/Image.php b/src/PhpWord/Writer/HTML/Style/Image.php
index 74843603..178b1434 100644
--- a/src/PhpWord/Writer/HTML/Style/Image.php
+++ b/src/PhpWord/Writer/HTML/Style/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index 4e7ab1fd..e264ead0 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText.php b/src/PhpWord/Writer/ODText.php
index f280f241..7158874c 100644
--- a/src/PhpWord/Writer/ODText.php
+++ b/src/PhpWord/Writer/ODText.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/AbstractElement.php b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
index cfa5b2f5..481995ff 100644
--- a/src/PhpWord/Writer/ODText/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Container.php b/src/PhpWord/Writer/ODText/Element/Container.php
index c2a5e016..112e71e8 100644
--- a/src/PhpWord/Writer/ODText/Element/Container.php
+++ b/src/PhpWord/Writer/ODText/Element/Container.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Image.php b/src/PhpWord/Writer/ODText/Element/Image.php
index 23dc0ac1..2c0b4727 100644
--- a/src/PhpWord/Writer/ODText/Element/Image.php
+++ b/src/PhpWord/Writer/ODText/Element/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Link.php b/src/PhpWord/Writer/ODText/Element/Link.php
index 91a1962e..c996ab59 100644
--- a/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/src/PhpWord/Writer/ODText/Element/Link.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index 73f18926..cdc2a0e3 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index 699510b2..3b06217d 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/TextBreak.php b/src/PhpWord/Writer/ODText/Element/TextBreak.php
index 7106797d..f7642e3b 100644
--- a/src/PhpWord/Writer/ODText/Element/TextBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/TextBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/TextRun.php b/src/PhpWord/Writer/ODText/Element/TextRun.php
index e202eccf..f5c855fe 100644
--- a/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index 737afd18..bf9bf9d6 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/AbstractPart.php b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
index abe0a7b9..74412fd4 100644
--- a/src/PhpWord/Writer/ODText/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index d08eb217..8ae4dca9 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/Manifest.php b/src/PhpWord/Writer/ODText/Part/Manifest.php
index f706cbff..d916ccdf 100644
--- a/src/PhpWord/Writer/ODText/Part/Manifest.php
+++ b/src/PhpWord/Writer/ODText/Part/Manifest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/Meta.php b/src/PhpWord/Writer/ODText/Part/Meta.php
index d637fef1..72d03ae6 100644
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/Mimetype.php b/src/PhpWord/Writer/ODText/Part/Mimetype.php
index aab88e4d..6e45b848 100644
--- a/src/PhpWord/Writer/ODText/Part/Mimetype.php
+++ b/src/PhpWord/Writer/ODText/Part/Mimetype.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index 043fe0f6..138f6f10 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
index 050abe02..26b9905b 100644
--- a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/Font.php b/src/PhpWord/Writer/ODText/Style/Font.php
index b31dadae..50de32ad 100644
--- a/src/PhpWord/Writer/ODText/Style/Font.php
+++ b/src/PhpWord/Writer/ODText/Style/Font.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/Image.php b/src/PhpWord/Writer/ODText/Style/Image.php
index 3efc945c..b85d4d70 100644
--- a/src/PhpWord/Writer/ODText/Style/Image.php
+++ b/src/PhpWord/Writer/ODText/Style/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index d0670c42..a047ad32 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/Section.php b/src/PhpWord/Writer/ODText/Style/Section.php
index 24766278..bef023e9 100644
--- a/src/PhpWord/Writer/ODText/Style/Section.php
+++ b/src/PhpWord/Writer/ODText/Style/Section.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index 0144391a..7d66899a 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/PDF.php b/src/PhpWord/Writer/PDF.php
index 4f29bb63..45fe8f35 100644
--- a/src/PhpWord/Writer/PDF.php
+++ b/src/PhpWord/Writer/PDF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
+ * @see         https://github.com/PHPOffice/PhpWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/PDF/AbstractRenderer.php b/src/PhpWord/Writer/PDF/AbstractRenderer.php
index 3b5e3a08..7b668e0b 100644
--- a/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
+ * @see         https://github.com/PHPOffice/PhpWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/PDF/DomPDF.php b/src/PhpWord/Writer/PDF/DomPDF.php
index 8825d4c3..be282d20 100644
--- a/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/src/PhpWord/Writer/PDF/DomPDF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
+ * @see         https://github.com/PHPOffice/PhpWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -23,7 +23,7 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
 /**
  * DomPDF writer
  *
- * @link https://github.com/dompdf/dompdf
+ * @see  https://github.com/dompdf/dompdf
  * @since 0.10.0
  */
 class DomPDF extends AbstractRenderer implements WriterInterface
diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index 764a38d4..80c2eccf 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
+ * @see         https://github.com/PHPOffice/PhpWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -22,7 +22,7 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
 /**
  * MPDF writer
  *
- * @link http://www.mpdf1.com/
+ * @see  http://www.mpdf1.com/
  * @since 0.11.0
  */
 class MPDF extends AbstractRenderer implements WriterInterface
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index 4991cee8..3b82511a 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
+ * @see         https://github.com/PHPOffice/PhpWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
  *
  * @deprecated 0.13.0 Use `DomPDF` or `MPDF` instead.
  *
- * @link http://www.tcpdf.org/
+ * @see  http://www.tcpdf.org/
  * @since 0.11.0
  */
 class TCPDF extends AbstractRenderer implements WriterInterface
diff --git a/src/PhpWord/Writer/RTF.php b/src/PhpWord/Writer/RTF.php
index 4c33b733..7756253a 100644
--- a/src/PhpWord/Writer/RTF.php
+++ b/src/PhpWord/Writer/RTF.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/AbstractElement.php b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
index 83ccd14e..1013ee36 100644
--- a/src/PhpWord/Writer/RTF/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Container.php b/src/PhpWord/Writer/RTF/Element/Container.php
index 32be7d7f..4850c8bf 100644
--- a/src/PhpWord/Writer/RTF/Element/Container.php
+++ b/src/PhpWord/Writer/RTF/Element/Container.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Image.php b/src/PhpWord/Writer/RTF/Element/Image.php
index bf90bf66..fb96baff 100644
--- a/src/PhpWord/Writer/RTF/Element/Image.php
+++ b/src/PhpWord/Writer/RTF/Element/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Link.php b/src/PhpWord/Writer/RTF/Element/Link.php
index ef11eb10..91a75720 100644
--- a/src/PhpWord/Writer/RTF/Element/Link.php
+++ b/src/PhpWord/Writer/RTF/Element/Link.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/ListItem.php b/src/PhpWord/Writer/RTF/Element/ListItem.php
index f80ef5d1..e628bffd 100644
--- a/src/PhpWord/Writer/RTF/Element/ListItem.php
+++ b/src/PhpWord/Writer/RTF/Element/ListItem.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/PageBreak.php b/src/PhpWord/Writer/RTF/Element/PageBreak.php
index 8ea86e0f..0adbe06e 100644
--- a/src/PhpWord/Writer/RTF/Element/PageBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/PageBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Table.php b/src/PhpWord/Writer/RTF/Element/Table.php
index 20ee26c1..d0bc0845 100644
--- a/src/PhpWord/Writer/RTF/Element/Table.php
+++ b/src/PhpWord/Writer/RTF/Element/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Text.php b/src/PhpWord/Writer/RTF/Element/Text.php
index 7b7de882..2fac0520 100644
--- a/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/src/PhpWord/Writer/RTF/Element/Text.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/TextBreak.php b/src/PhpWord/Writer/RTF/Element/TextBreak.php
index 480f9d15..2009fcff 100644
--- a/src/PhpWord/Writer/RTF/Element/TextBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/TextBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/TextRun.php b/src/PhpWord/Writer/RTF/Element/TextRun.php
index 2d9081a7..d4e56765 100644
--- a/src/PhpWord/Writer/RTF/Element/TextRun.php
+++ b/src/PhpWord/Writer/RTF/Element/TextRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Element/Title.php b/src/PhpWord/Writer/RTF/Element/Title.php
index 8c18d972..18bad9fd 100644
--- a/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/src/PhpWord/Writer/RTF/Element/Title.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 7c8c93ba..7569a105 100644
--- a/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
index 7ed7ea27..a0a49406 100644
--- a/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Writer\RTF\Style\Section as SectionStyleWriter;
  * RTF document part writer
  *
  * @since 0.11.0
- * @link http://www.biblioscape.com/rtf15_spec.htm#Heading24
+ * @see  http://www.biblioscape.com/rtf15_spec.htm#Heading24
  */
 class Document extends AbstractPart
 {
diff --git a/src/PhpWord/Writer/RTF/Part/Header.php b/src/PhpWord/Writer/RTF/Part/Header.php
index a399ccdc..73f1351f 100644
--- a/src/PhpWord/Writer/RTF/Part/Header.php
+++ b/src/PhpWord/Writer/RTF/Part/Header.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -33,7 +33,7 @@ use PhpOffice\PhpWord\Style\Font;
  * - List table (not supported yet)
  *
  * @since 0.11.0
- * @link http://www.biblioscape.com/rtf15_spec.htm#Heading6
+ * @see  http://www.biblioscape.com/rtf15_spec.htm#Heading6
  */
 class Header extends AbstractPart
 {
diff --git a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
index fa7351e9..80523610 100644
--- a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Style/Border.php b/src/PhpWord/Writer/RTF/Style/Border.php
index 2913a18c..e63d767f 100644
--- a/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/src/PhpWord/Writer/RTF/Style/Border.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Style/Font.php b/src/PhpWord/Writer/RTF/Style/Font.php
index 4f78719f..3338368a 100644
--- a/src/PhpWord/Writer/RTF/Style/Font.php
+++ b/src/PhpWord/Writer/RTF/Style/Font.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index a758a488..61b61fd7 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index b64e17d9..8f073716 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index 0a25c12c..fcef982f 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 2f44c704..07ffc286 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Bookmark.php b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
index 8ecb1e99..4b0b78a7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Bookmark.php
+++ b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index 284b6bc1..591799ab 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index ce2ebb3e..31dcb867 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
index 7b40e199..47dae29b 100644
--- a/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Endnote.php b/src/PhpWord/Writer/Word2007/Element/Endnote.php
index 946c1419..ebfe35c1 100644
--- a/src/PhpWord/Writer/Word2007/Element/Endnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Endnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index a0db34f7..75d4983f 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Footnote.php b/src/PhpWord/Writer/Word2007/Element/Footnote.php
index ee844534..65ef40c7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Footnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index db7ebaa4..91fb28ab 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -27,7 +27,7 @@ use PhpOffice\PhpWord\Settings;
  * Note: DropDown is active when document protection is set to `forms`
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class FormField extends Text
@@ -109,7 +109,7 @@ class FormField extends Text
     /**
      * Write textinput.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFTextInput.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFTextInput.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
      */
@@ -125,7 +125,7 @@ class FormField extends Text
     /**
      * Write checkbox.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFCheckBox.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFCheckBox.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
      */
@@ -148,7 +148,7 @@ class FormField extends Text
     /**
      * Write dropdown.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFDDList.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFDDList.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
      */
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index dd0f7756..7e33f75e 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index 1f853a20..9b1a160d 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index 6edc4f2c..8ea3f53c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItem.php b/src/PhpWord/Writer/Word2007/Element/ListItem.php
index 2584fff1..c1aa0ce3 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItem.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItem.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
index c0e34093..e6ed2b46 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/Object.php
index 54d1869b..8231ec0c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/Object.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/PageBreak.php b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
index a7087fd2..04ff29d4 100644
--- a/src/PhpWord/Writer/Word2007/Element/PageBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
index 2f67ffb1..0dafa4a0 100644
--- a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index dba02197..92b9ea40 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 2badb761..e77f87e9 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Element\SDT as SDTElement;
  * Structured document tag element writer
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtBlock.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtBlock.html
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class SDT extends Text
@@ -68,7 +68,7 @@ class SDT extends Text
     /**
      * Write combo box.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
      */
@@ -87,7 +87,7 @@ class SDT extends Text
     /**
      * Write drop down list.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
      */
@@ -99,7 +99,7 @@ class SDT extends Text
     /**
      * Write date.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
      */
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index 8f5bf651..e384db06 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index fd33f268..a679188f 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index 40d4cb64..c0590772 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
index 926f6840..44450fd6 100644
--- a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 6b85c566..694a834a 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 57273094..3780c698 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBreak.php b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
index 474f42cc..161a528e 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/TextRun.php b/src/PhpWord/Writer/Word2007/Element/TextRun.php
index 8f359021..9fd70b13 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextRun.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 479bdd40..63ed94de 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index a78a9bc3..0b9d8b88 100644
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index eec09e9d..2f162108 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Element\Chart as ChartElement;
  * Word2007 chart part writer: word/charts/chartx.xml
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/e-draw-chart_chartSpace.html
+ * @see  http://www.datypic.com/sc/ooxml/e-draw-chart_chartSpace.html
  */
 class Chart extends AbstractPart
 {
@@ -94,7 +94,7 @@ class Chart extends AbstractPart
     /**
      * Write chart
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_Chart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_Chart.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      */
     private function writeChart(XMLWriter $xmlWriter)
@@ -111,14 +111,14 @@ class Chart extends AbstractPart
     /**
      * Write plot area.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PlotArea.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PieChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_DoughnutChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_BarChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_LineChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_AreaChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_RadarChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_ScatterChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PlotArea.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PieChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_DoughnutChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_BarChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_LineChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_AreaChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_RadarChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_ScatterChart.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      */
     private function writePlotArea(XMLWriter $xmlWriter)
@@ -253,7 +253,7 @@ class Chart extends AbstractPart
     /**
      * Write axis
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_CatAx.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_CatAx.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $type
      */
@@ -295,7 +295,7 @@ class Chart extends AbstractPart
     /**
      * Write shape
      *
-     * @link http://www.datypic.com/sc/ooxml/t-a_CT_ShapeProperties.html
+     * @see  http://www.datypic.com/sc/ooxml/t-a_CT_ShapeProperties.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param bool $line
      */
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index 30374a84..b2b49864 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index b2f55d32..9be988d3 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
index eb397a2a..dbd55187 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
index 0ce58337..fdabee36 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index bb5c3b2a..212e9d27 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index a8318f5c..72e4fcd8 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Endnotes.php b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
index d975354e..289119db 100644
--- a/src/PhpWord/Writer/Word2007/Part/Endnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/FontTable.php b/src/PhpWord/Writer/Word2007/Part/FontTable.php
index 85da0324..065a318e 100644
--- a/src/PhpWord/Writer/Word2007/Part/FontTable.php
+++ b/src/PhpWord/Writer/Word2007/Part/FontTable.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Footer.php b/src/PhpWord/Writer/Word2007/Part/Footer.php
index ce3a8b9c..cfc9dd40 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footer.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footer.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
index 61145be0..c9e3bcac 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Header.php b/src/PhpWord/Writer/Word2007/Part/Header.php
index 784f1801..5853d92f 100644
--- a/src/PhpWord/Writer/Word2007/Part/Header.php
+++ b/src/PhpWord/Writer/Word2007/Part/Header.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Numbering.php b/src/PhpWord/Writer/Word2007/Part/Numbering.php
index bb8ae59d..6233a6b7 100644
--- a/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Rels.php b/src/PhpWord/Writer/Word2007/Part/Rels.php
index 4eb687c6..154c7e89 100644
--- a/src/PhpWord/Writer/Word2007/Part/Rels.php
+++ b/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
index eca3686e..505aa223 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsPart.php b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
index 348558c5..e639c041 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index f6ea65c5..fc607b49 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
@@ -23,7 +23,7 @@ use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 /**
  * Word2007 settings part writer: word/settings.xml
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Settings.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Settings.html
  */
 class Settings extends AbstractPart
 {
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 36bd095e..54930839 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/Theme.php b/src/PhpWord/Writer/Word2007/Part/Theme.php
index ee3e1f45..c264140e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Theme.php
+++ b/src/PhpWord/Writer/Word2007/Part/Theme.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index f0a9fa86..9f18e356 100644
--- a/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index 26eb62b1..5b707ead 100644
--- a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index 256bf45b..c2cf1c7c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index ac81bed6..e3a86a58 100644
--- a/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Fill.php b/src/PhpWord/Writer/Word2007/Style/Fill.php
index 6edd3847..de64313b 100644
--- a/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 193f3ba8..edd1df82 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index e88334cf..da5aee1e 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
index 8bed7c0b..271b99df 100644
--- a/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Indentation.php b/src/PhpWord/Writer/Word2007/Style/Indentation.php
index 6cf82f88..c5a598ff 100644
--- a/src/PhpWord/Writer/Word2007/Style/Indentation.php
+++ b/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
index d3001f0d..f065e521 100644
--- a/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index a5c2c738..3ed577c6 100644
--- a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index 7a4ffe2f..3d877384 100644
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Outline.php b/src/PhpWord/Writer/Word2007/Style/Outline.php
index cbb6f283..9ae61f39 100644
--- a/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index b58dc361..ad3ab27a 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Row.php b/src/PhpWord/Writer/Word2007/Style/Row.php
index 1ecf6cf6..f57094db 100644
--- a/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
index 64c8dc71..ef50c111 100644
--- a/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index 3a260def..a8e6592a 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Shadow.php b/src/PhpWord/Writer/Word2007/Style/Shadow.php
index a9159ecc..5efc38c4 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Shape.php b/src/PhpWord/Writer/Word2007/Style/Shape.php
index faae22bf..aad42ae7 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
index d225ef56..8db78161 100644
--- a/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
index 13a70bca..7b0a0ab5 100644
--- a/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index ce0b0cab..620e4fbf 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
index 6e94cb0f..cd92f845 100644
--- a/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/src/PhpWord/Writer/WriterInterface.php b/src/PhpWord/Writer/WriterInterface.php
index 09f87617..b5f08199 100644
--- a/src/PhpWord/Writer/WriterInterface.php
+++ b/src/PhpWord/Writer/WriterInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Collection/CollectionTest.php b/tests/PhpWord/Collection/CollectionTest.php
index 18dfeb70..22f89b72 100644
--- a/tests/PhpWord/Collection/CollectionTest.php
+++ b/tests/PhpWord/Collection/CollectionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index 003f22e4..ed68821f 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/AbstractElementTest.php b/tests/PhpWord/Element/AbstractElementTest.php
index 80de38bf..458b94c8 100644
--- a/tests/PhpWord/Element/AbstractElementTest.php
+++ b/tests/PhpWord/Element/AbstractElementTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index 3b8d84a9..aff208c4 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index 630fc77f..fb71b8c2 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index 08783e99..a6388588 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index e3494004..1bd0c216 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/FooterTest.php b/tests/PhpWord/Element/FooterTest.php
index c30103c0..2938ae5e 100644
--- a/tests/PhpWord/Element/FooterTest.php
+++ b/tests/PhpWord/Element/FooterTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/FootnoteTest.php b/tests/PhpWord/Element/FootnoteTest.php
index a5f233d6..b02ab5c6 100644
--- a/tests/PhpWord/Element/FootnoteTest.php
+++ b/tests/PhpWord/Element/FootnoteTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index 8f5f1fea..13ace285 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index df2aad98..80e0bcfc 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index c7e52f83..a6e3f79b 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index 793e4c9b..48b576c3 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index fe9f5bbe..0c4c1ac9 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index 9e5beb4b..775a97d4 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index 4c50f6ad..87af5c5c 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index 66b10a6f..69a71204 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/PreserveTextTest.php b/tests/PhpWord/Element/PreserveTextTest.php
index 37979cad..a47cc77c 100644
--- a/tests/PhpWord/Element/PreserveTextTest.php
+++ b/tests/PhpWord/Element/PreserveTextTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index 6625e61a..cb365dad 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index 40da2cf3..fc3682b6 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index fbdf2fa8..8cd2961f 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index 4a4d253c..655d567c 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index e23427eb..3085aee2 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index b616ae16..cc61e20d 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index cc760877..62186244 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index d8a68eca..59db597c 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index 0ce7c474..9723a2e1 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 2e7ebe40..500de133 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/CopyFileExceptionTest.php b/tests/PhpWord/Exception/CopyFileExceptionTest.php
index 11d88f0a..9d921740 100644
--- a/tests/PhpWord/Exception/CopyFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CopyFileExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
index e0823a85..91c7012f 100644
--- a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/ExceptionTest.php b/tests/PhpWord/Exception/ExceptionTest.php
index c620c7e8..28b15702 100644
--- a/tests/PhpWord/Exception/ExceptionTest.php
+++ b/tests/PhpWord/Exception/ExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/InvalidImageExceptionTest.php b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
index d6efe909..dfaadbd7 100644
--- a/tests/PhpWord/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
index e9d79b05..77ee8571 100644
--- a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
index c52d3766..50b4806d 100644
--- a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/IOFactoryTest.php b/tests/PhpWord/IOFactoryTest.php
index 7a711734..6dbb006e 100644
--- a/tests/PhpWord/IOFactoryTest.php
+++ b/tests/PhpWord/IOFactoryTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/MediaTest.php b/tests/PhpWord/MediaTest.php
index e2262352..d045abcd 100644
--- a/tests/PhpWord/MediaTest.php
+++ b/tests/PhpWord/MediaTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index a1ea7a0e..5443f0b2 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index b726a49a..6f7ad9b6 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index c44b7926..01d7342e 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index 50510232..24751cac 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index ad2afb56..ed16e64b 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Reader/ODTextTest.php b/tests/PhpWord/Reader/ODTextTest.php
index 63a1c149..d00657de 100644
--- a/tests/PhpWord/Reader/ODTextTest.php
+++ b/tests/PhpWord/Reader/ODTextTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Reader/RTFTest.php b/tests/PhpWord/Reader/RTFTest.php
index aab4072c..58154ee3 100644
--- a/tests/PhpWord/Reader/RTFTest.php
+++ b/tests/PhpWord/Reader/RTFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 5421cf98..627bc66e 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index 0d32eab3..6fd2f52b 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 6f2e63c8..a2031787 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 9e40cfc9..602b644d 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index 156c016c..689f122b 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index 39d55fbd..ab3ea14e 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index d531f506..71b32a65 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index cc25fa66..ce7be26d 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index 6543a2b3..decc13b1 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index 01ba2aae..db079704 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index 9e7d6e71..56440529 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index 1cb30b38..21489caf 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index d99cb475..a2e4eb74 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/NumberingLevelTest.php b/tests/PhpWord/Style/NumberingLevelTest.php
index 9d7a0748..402d936b 100644
--- a/tests/PhpWord/Style/NumberingLevelTest.php
+++ b/tests/PhpWord/Style/NumberingLevelTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index 41933531..ad57ebff 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index d5dfab05..7d12410c 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index a403dc00..e77aa894 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index 972c6340..db98d0a9 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index 830423ac..89c4640a 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index 82522384..fd0aaf5e 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index 6307a53f..f147ae61 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index ce5484cc..ec01acd9 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index 49a7192f..8102369d 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index ee2a9c7f..ee020dd9 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index 9e25b8cd..a91b5b28 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index 48b3c3cd..aa46c6b1 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 0cac9931..4bf69f5a 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index f92eacd6..0778650e 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index 544c6708..a4a6264e 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/HTML/StyleTest.php b/tests/PhpWord/Writer/HTML/StyleTest.php
index ddb7cdd3..7548ff02 100644
--- a/tests/PhpWord/Writer/HTML/StyleTest.php
+++ b/tests/PhpWord/Writer/HTML/StyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index a2fe8395..69cd5a97 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index 5b5f7363..ef4e68b0 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
index 14f4cb1a..5ca980f2 100644
--- a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index 9d0daedf..048c5242 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index e086ea0f..1a0c3ccd 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index ec36b4e8..d35a4ec7 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index e4c4ee52..7831f472 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index e829e68f..62411b97 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/PDF/TCPDFTest.php b/tests/PhpWord/Writer/PDF/TCPDFTest.php
index a7bb2a31..d5bd534b 100644
--- a/tests/PhpWord/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/TCPDFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/PDFTest.php b/tests/PhpWord/Writer/PDFTest.php
index eb763f79..f1a908a9 100644
--- a/tests/PhpWord/Writer/PDFTest.php
+++ b/tests/PhpWord/Writer/PDFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index 31998350..17a9c22f 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index bd48814c..4e3a0eed 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index c2b30920..ec83f7b1 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 4730ebfc..6186695b 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index e231f1c8..47f65861 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
index 8e3be114..4a4fd308 100644
--- a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 6103d4c8..d194814c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 1fb81e8d..98fb003e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index 0ecea19e..e557d9c2 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
index 0418ccec..7830469c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index 3eeb37cf..0f1ae523 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index f88ebe2e..fcb4ccc6 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 0478d0e4..cba0bfb3 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index 0c8568aa..3261db4f 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index 32a0c923..f406bc05 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index 474d2410..05785b0c 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index e7708961..88a522a9 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/_includes/TestHelperDOCX.php b/tests/PhpWord/_includes/TestHelperDOCX.php
index d33b78c9..bef060ee 100644
--- a/tests/PhpWord/_includes/TestHelperDOCX.php
+++ b/tests/PhpWord/_includes/TestHelperDOCX.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 353d3132..ef56ed15 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1fcdbc40..7126c204 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
- * @link        https://github.com/PHPOffice/PHPWord
+ * @see         https://github.com/PHPOffice/PHPWord
  * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */

From 6657f0eec3236c0e201782b70cd84522bc7b5bfe Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 26 Sep 2017 22:46:46 +0200
Subject: [PATCH 101/370] fix doc

---
 docs/elements.rst                       | 6 +++---
 src/PhpWord/Element/AbstractElement.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index a35eb654..848e3f98 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -135,12 +135,12 @@ Text breaks are empty new lines. To add text breaks, use the following syntax. A
 Page breaks
 ~~~~~~~~~~~
 
-There are two ways to insert a page breaks, using the ``addPageBreak``
+There are two ways to insert a page break, using the ``addPageBreak``
 method or using the ``pageBreakBefore`` style of paragraph.
 
-:: code-block:: php
+.. code-block:: php
 
-    \\$section->addPageBreak();
+    $section->addPageBreak();
 
 Lists
 -----
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 792a340f..93e0b09e 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -73,7 +73,7 @@ abstract class AbstractElement
     /**
      * Unique Id for element
      *
-     * @var int
+     * @var string
      */
     protected $elementId;
 

From 75a3fb8e4081ec3b164d2ebef52fc8512b8d9eb2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 27 Sep 2017 00:27:33 +0200
Subject: [PATCH 102/370] Improve code coverage

---
 tests/PhpWord/Element/BookmarkTest.php  | 38 +++++++++++++++++++++++++
 tests/PhpWord/Element/CommentTest.php   | 20 +++++++++++++
 tests/PhpWord/Element/ObjectTest.php    | 15 +++++++++-
 tests/PhpWord/Element/SectionTest.php   | 11 +++++++
 tests/PhpWord/Metadata/SettingsTest.php | 18 ++++++++++++
 5 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpWord/Element/BookmarkTest.php

diff --git a/tests/PhpWord/Element/BookmarkTest.php b/tests/PhpWord/Element/BookmarkTest.php
new file mode 100644
index 00000000..da86a62e
--- /dev/null
+++ b/tests/PhpWord/Element/BookmarkTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Test class for PhpOffice\PhpWord\Element\Footer
+ *
+ * @runTestsInSeparateProcesses
+ */
+class BookmarkTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * New instance
+     */
+    public function testConstruct()
+    {
+        $bookmarkName = 'test';
+        $oBookmark = new Bookmark($bookmarkName);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Bookmark', $oBookmark);
+        $this->assertEquals($bookmarkName, $oBookmark->getName());
+    }
+}
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index a6388588..fd2c814d 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -80,4 +80,24 @@ class CommentTest extends \PHPUnit_Framework_TestCase
         $oComment->setRelationId($iVal);
         $this->assertEquals($iVal, $oComment->getRelationId());
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExceptionOnCommentStartOnComment()
+    {
+        $dummyComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment->setCommentRangeStart($dummyComment);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExceptionOnCommentEndOnComment()
+    {
+        $dummyComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment->setCommentRangeEnd($dummyComment);
+    }
 }
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index 87af5c5c..51ed19b5 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -26,9 +26,22 @@ namespace PhpOffice\PhpWord\Element;
 class ObjectTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Create new instance with supported files
+     * Create new instance with supported files, 4 character extention
      */
     public function testConstructWithSupportedFiles()
+    {
+        $src = __DIR__ . '/../_files/documents/reader.docx';
+        $oObject = new Object($src);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
+        $this->assertEquals($src, $oObject->getSource());
+    }
+
+    /**
+     * Create new instance with supported files
+     */
+    public function testConstructWithSupportedFilesLong()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
         $oObject = new Object($src);
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 8cd2961f..aebfc9b7 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -129,6 +129,17 @@ class SectionTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($object->hasDifferentFirstPage());
     }
 
+    /**
+     * @covers ::addHeader
+     * @covers ::hasDifferentFirstPage
+     */
+    public function testHasDifferentFirstPageFooter()
+    {
+        $object = new Section(1);
+        $object->addFooter(Header::FIRST);
+        $this->assertTrue($object->hasDifferentFirstPage());
+    }
+
     /**
      * @covers ::addHeader
      * @covers ::hasDifferentFirstPage
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 6f7ad9b6..6f493d04 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -116,6 +116,24 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(ProofState::DIRTY, $oSettings->getProofState()->getSpelling());
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongProofStateGrammar()
+    {
+        $proofState = new ProofState();
+        $proofState->setGrammar('wrong');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongProofStateSpelling()
+    {
+        $proofState = new ProofState();
+        $proofState->setSpelling('wrong');
+    }
+
     /**
      * Zoom as percentage
      */

From 0beeb275fec44b0db8caaf54e13e1aa612f544e4 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 27 Sep 2017 00:40:08 +0200
Subject: [PATCH 103/370] Add support for changing the document language
 (#1108)

---
 CHANGELOG.md                                  |   2 +-
 docs/general.rst                              |  19 ++
 docs/styles.rst                               |  11 +-
 samples/Sample_01_SimpleText.php              |  11 +
 samples/Sample_10_EastAsianFontStyle.php      |   2 +-
 src/PhpWord/ComplexType/TrackChangesView.php  |   4 +-
 src/PhpWord/Element/AbstractElement.php       |   2 +-
 src/PhpWord/Element/Bookmark.php              |   2 -
 src/PhpWord/Element/CheckBox.php              |   1 -
 src/PhpWord/Element/Comment.php               |   1 -
 src/PhpWord/Element/FormField.php             |   3 +-
 src/PhpWord/Element/Link.php                  |   1 -
 src/PhpWord/Element/PreserveText.php          |   1 -
 src/PhpWord/Element/SDT.php                   |   1 -
 src/PhpWord/Element/TOC.php                   |   4 +-
 src/PhpWord/Element/TrackChange.php           |   2 +-
 src/PhpWord/Metadata/Settings.php             |  28 +++
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  29 ++-
 src/PhpWord/Reader/Word2007/Settings.php      |  41 +++-
 src/PhpWord/Style/AbstractStyle.php           |   2 +-
 src/PhpWord/Style/Font.php                    |  33 +++
 src/PhpWord/Style/Language.php                | 218 ++++++++++++++++++
 src/PhpWord/Style/ListItem.php                |   3 +-
 src/PhpWord/Style/Paragraph.php               |  34 ++-
 src/PhpWord/Style/TextBox.php                 |   3 +-
 src/PhpWord/Writer/ODText/Part/Styles.php     |  17 +-
 src/PhpWord/Writer/RTF/Part/Document.php      |   6 +-
 src/PhpWord/Writer/Word2007/Part/Settings.php |  27 ++-
 src/PhpWord/Writer/Word2007/Part/Styles.php   |   9 +
 .../Writer/Word2007/Style/AbstractStyle.php   |   2 +-
 src/PhpWord/Writer/Word2007/Style/Font.php    |  10 +
 .../Writer/Word2007/Style/Paragraph.php       |   5 +-
 .../ComplexType/FootnotePropertiesTest.php    |   4 +-
 tests/PhpWord/ComplexType/ProofStateTest.php  |  61 +++++
 tests/PhpWord/Style/FontTest.php              |   1 +
 tests/PhpWord/Style/LanguageTest.php          |  62 +++++
 tests/PhpWord/Style/ParagraphTest.php         |   1 +
 .../Writer/Word2007/Part/SettingsTest.php     |  27 ++-
 38 files changed, 625 insertions(+), 65 deletions(-)
 create mode 100644 src/PhpWord/Style/Language.php
 create mode 100644 tests/PhpWord/ComplexType/ProofStateTest.php
 create mode 100644 tests/PhpWord/Style/LanguageTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52bd6aac..f963a3cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,8 @@ This is the last version to support PHP 5.3
 - Introduced the `\PhpOffice\PhpWord\SimpleType\NumberFormat` simple type. - @troosan
 - Support for ContextualSpacing - @postHawk #1088
 - Possiblity to hide spelling and/or grammatical errors - @troosan #542
+- Possiblity to set default document language as well as changing the language for each text element - @troosan #1108
 - Support for Comments - @troosan #1067
-- Add support for changing the document language - @troosan #1108
 
 ### Fixed
 - Loosen dependency to Zend
diff --git a/docs/general.rst b/docs/general.rst
index 87fecb77..5b5c5d9e 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -201,6 +201,25 @@ The default symbol to represent a decimal figure is the ``.`` in english. In fre
 
     $phpWord->getSettings()->setDecimalSymbol(',');
 
+Document Language
+~~~~~~~~~~~~~~~~~
+The default language of the document can be change with the following.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setThemeFontLang(new Language(Language::FR_BE));
+
+``Languge`` has 3 parameters, one for Latin languages, one for East Asian languages and one for Complex (Bi-Directional) languages.
+A couple of language codes are provided in the ``PhpOffice\PhpWord\ComplexType\Language`` class but any valid code/ID can be used.
+
+In case you are generating an RTF document the Language need to be set differently.
+
+.. code-block:: php
+
+    $lang = new Language();
+    $lang->setLangId(Language::EN_GB_ID);
+    $phpWord->getSettings()->setThemeFontLang($lang);
+
 Document information
 --------------------
 
diff --git a/docs/styles.rst b/docs/styles.rst
index 4f8a53fe..e8d2aec8 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -55,6 +55,8 @@ Available Font style options:
 - ``subScript``. Subscript, *true* or *false*.
 - ``superScript``. Superscript, *true* or *false*.
 - ``underline``. Underline, *dash*, *dotted*, etc.
+- ``lang``. Language, either a language code like *en-US*, *fr-BE*, etc. or an object (or as an array) if you need to set eastAsian or bidirectional languages
+   See ``\PhpOffice\PhpWord\Style\Language`` class for some language codes.
 
 .. _paragraph-style:
 
@@ -64,7 +66,7 @@ Paragraph
 Available Paragraph style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
 - ``basedOn``. Parent style.
 - ``hanging``. Hanging by how much.
 - ``indent``. Indent by how much.
@@ -87,7 +89,7 @@ Table
 Available Table style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` classes for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` classes for the details.
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Size``. Border size in twips.
@@ -106,7 +108,8 @@ Available Cell style options:
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Size``. Border size in twips.
 - ``gridSpan``. Number of columns spanned.
-- ``textDirection(btLr|tbRl)``. Direction of text. You can use constants ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_BTLR`` and ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_TBRL``
+- ``textDirection(btLr|tbRl)``. Direction of text.
+   You can use constants ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_BTLR`` and ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_TBRL``
 - ``valign``. Vertical alignment, *top*, *center*, *both*, *bottom*.
 - ``vMerge``. *restart* or *continue*.
 - ``width``. Cell width in twips.
@@ -133,7 +136,7 @@ Numbering level
 Available NumberingLevel style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
 - ``font``. Font name.
 - ``format``. Numbering format bullet\|decimal\|upperRoman\|lowerRoman\|upperLetter\|lowerLetter.
 - ``hanging``. See paragraph style.
diff --git a/samples/Sample_01_SimpleText.php b/samples/Sample_01_SimpleText.php
index 1e51b2c0..fae6c210 100644
--- a/samples/Sample_01_SimpleText.php
+++ b/samples/Sample_01_SimpleText.php
@@ -1,9 +1,16 @@
 <?php
+use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\Style\Font;
+
 include_once 'Sample_Header.php';
 
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+
+$languageEnGb = new \PhpOffice\PhpWord\Style\Language(\PhpOffice\PhpWord\Style\Language::EN_GB);
+
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
+$phpWord->getSettings()->setThemeFontLang($languageEnGb);
 
 $fontStyleName = 'rStyle';
 $phpWord->addFontStyle($fontStyleName, array('bold' => true, 'italic' => true, 'size' => 16, 'allCaps' => true, 'doubleStrikethrough' => true));
@@ -20,6 +27,10 @@ $section = $phpWord->addSection();
 $section->addTitle('Welcome to PhpWord', 1);
 $section->addText('Hello World!');
 
+// $pStyle = new Font();
+// $pStyle->setLang()
+$section->addText('Ce texte-ci est en français.', array('lang' => \PhpOffice\PhpWord\Style\Language::FR_BE));
+
 // Two text break
 $section->addTextBreak(2);
 
diff --git a/samples/Sample_10_EastAsianFontStyle.php b/samples/Sample_10_EastAsianFontStyle.php
index 2541af86..87345ae0 100644
--- a/samples/Sample_10_EastAsianFontStyle.php
+++ b/samples/Sample_10_EastAsianFontStyle.php
@@ -7,7 +7,7 @@ $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->addSection();
 $header = array('size' => 16, 'bold' => true);
 //1.Use EastAisa FontStyle
-$section->addText('中文楷体样式测试', array('name' => '楷体', 'size' => 16, 'color' => '1B2232'));
+$section->addText('中文楷体样式测试', array('name' => '楷体', 'size' => 16, 'color' => '1B2232', 'lang' => array('latin' => 'en-US', 'eastAsia' => 'zh-CN')));
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
index ea26bc3c..9c8948ae 100644
--- a/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -135,10 +135,10 @@ final class TrackChangesView
     /**
      * Set Display Formatting Revisions
      *
-     * @param boolean $insDel
+     * @param boolean|null $formatting
      *            Set to true to show formatting revisions
      */
-    public function setFormatting($formatting)
+    public function setFormatting($formatting = null)
     {
         $this->formatting = $formatting === null ? true : $formatting;
     }
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index f657dd1b..4ff4978a 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -231,7 +231,7 @@ abstract class AbstractElement
     /**
      * Get element unique ID
      *
-     * @return string
+     * @return integer
      */
     public function getElementId()
     {
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index c865893f..4df06afb 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -45,9 +45,7 @@ class Bookmark extends AbstractElement
      */
     public function __construct($name)
     {
-
         $this->name = CommonText::toUTF8($name);
-        return $this;
     }
 
     /**
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
index 3fc578ef..b049c7f1 100644
--- a/src/PhpWord/Element/CheckBox.php
+++ b/src/PhpWord/Element/CheckBox.php
@@ -40,7 +40,6 @@ class CheckBox extends Text
      * @param string $text
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
-     * @return self
      */
     public function __construct($name = null, $text = null, $fontStyle = null, $paragraphStyle = null)
     {
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 685ed296..5e0ebe63 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -61,7 +61,6 @@ class Comment extends TrackChange
     {
         parent::__construct($author, $date);
         $this->initials = $initials;
-        return $this;
     }
 
     /**
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index c7cb44d2..414714a8 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -35,7 +35,7 @@ class FormField extends Text
     /**
      * Form field name
      *
-     * @var string
+     * @var string|bool|int
      */
     private $name;
 
@@ -70,7 +70,6 @@ class FormField extends Text
      * @param string $type
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
-     * @return self
      */
     public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     {
diff --git a/src/PhpWord/Element/Link.php b/src/PhpWord/Element/Link.php
index 4a72e167..6641b46d 100644
--- a/src/PhpWord/Element/Link.php
+++ b/src/PhpWord/Element/Link.php
@@ -83,7 +83,6 @@ class Link extends AbstractElement
         $this->fontStyle = $this->setNewStyle(new Font('text'), $fontStyle);
         $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
         $this->internal = $internal;
-        return $this;
     }
 
     /**
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index 65e17e35..813c1396 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -54,7 +54,6 @@ class PreserveText extends AbstractElement
      * @param string $text
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
-     * @return self
      */
     public function __construct($text = null, $fontStyle = null, $paragraphStyle = null)
     {
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 58a477d9..b0c68b0f 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -51,7 +51,6 @@ class SDT extends Text
      * @param string $type
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
-     * @return self
      */
     public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     {
diff --git a/src/PhpWord/Element/TOC.php b/src/PhpWord/Element/TOC.php
index 54ae3844..d3ab2be1 100644
--- a/src/PhpWord/Element/TOC.php
+++ b/src/PhpWord/Element/TOC.php
@@ -36,7 +36,7 @@ class TOC extends AbstractElement
     /**
      * Font style
      *
-     * @var \PhpOffice\PhpWord\Style\Font|array|string
+     * @var \PhpOffice\PhpWord\Style\Font|string
      */
     private $fontStyle;
 
@@ -121,7 +121,7 @@ class TOC extends AbstractElement
     /**
      * Get Font Style
      *
-     * @return \PhpOffice\PhpWord\Style\Font
+     * @return \PhpOffice\PhpWord\Style\Font|string
      */
     public function getStyleFont()
     {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 782e6f35..1df7148d 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -45,7 +45,7 @@ class TrackChange extends AbstractContainer
      * Create a new TrackChange Element
      *
      * @param string $author
-     * @param DateTime $date
+     * @param \DateTime $date
      */
     public function __construct($author, \DateTime $date)
     {
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index cd0eaabe..64788cc3 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Metadata;
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\Style\Language;
 
 /**
  * Setting class
@@ -100,6 +101,13 @@ class Settings
      */
     private $evenAndOddHeaders = false;
 
+    /**
+     * Theme Font Languages
+     * 
+     * @var Language
+     */
+    private $themeFontLang;
+
     /**
      * Radix Point for Field Code Evaluation
      *
@@ -291,6 +299,26 @@ class Settings
         }
     }
 
+    /**
+     * Returns the Language
+     * 
+     * @return Language
+     */
+    public function getThemeFontLang()
+    {
+        return $this->themeFontLang;
+    }
+
+    /**
+     * sets the Language for this document
+     * 
+     * @param Language $themeFontLang
+     */
+    public function setThemeFontLang($themeFontLang)
+    {
+        $this->themeFontLang = $themeFontLang;
+    }
+
     /**
      * Returns the Radix Point for Field Code Evaluation
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 5aafcb0d..c94a3546 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -314,18 +314,20 @@ abstract class AbstractPart
 
         $styleNode = $xmlReader->getElement('w:pPr', $domNode);
         $styleDefs = array(
-            'styleName'       => array(self::READ_VALUE, 'w:pStyle'),
-            'alignment'       => array(self::READ_VALUE, 'w:jc'),
-            'basedOn'         => array(self::READ_VALUE, 'w:basedOn'),
-            'next'            => array(self::READ_VALUE, 'w:next'),
-            'indent'          => array(self::READ_VALUE, 'w:ind', 'w:left'),
-            'hanging'         => array(self::READ_VALUE, 'w:ind', 'w:hanging'),
-            'spaceAfter'      => array(self::READ_VALUE, 'w:spacing', 'w:after'),
-            'spaceBefore'     => array(self::READ_VALUE, 'w:spacing', 'w:before'),
-            'widowControl'    => array(self::READ_FALSE, 'w:widowControl'),
-            'keepNext'        => array(self::READ_TRUE,  'w:keepNext'),
-            'keepLines'       => array(self::READ_TRUE,  'w:keepLines'),
-            'pageBreakBefore' => array(self::READ_TRUE,  'w:pageBreakBefore'),
+            'styleName'         => array(self::READ_VALUE, 'w:pStyle'),
+            'alignment'         => array(self::READ_VALUE, 'w:jc'),
+            'basedOn'           => array(self::READ_VALUE, 'w:basedOn'),
+            'next'              => array(self::READ_VALUE, 'w:next'),
+            'indent'            => array(self::READ_VALUE, 'w:ind', 'w:left'),
+            'hanging'           => array(self::READ_VALUE, 'w:ind', 'w:hanging'),
+            'spaceAfter'        => array(self::READ_VALUE, 'w:spacing', 'w:after'),
+            'spaceBefore'       => array(self::READ_VALUE, 'w:spacing', 'w:before'),
+            'widowControl'      => array(self::READ_FALSE, 'w:widowControl'),
+            'keepNext'          => array(self::READ_TRUE,  'w:keepNext'),
+            'keepLines'         => array(self::READ_TRUE,  'w:keepLines'),
+            'pageBreakBefore'   => array(self::READ_TRUE,  'w:pageBreakBefore'),
+            'contextualSpacing' => array(self::READ_TRUE,  'w:contextualSpacing'),
+            'bidi'              => array(self::READ_TRUE,  'w:bidi'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
@@ -369,6 +371,9 @@ abstract class AbstractPart
             'subScript'           => array(self::READ_EQUAL, 'w:vertAlign', 'w:val', 'subscript'),
             'fgColor'             => array(self::READ_VALUE, 'w:highlight'),
             'rtl'                 => array(self::READ_TRUE,  'w:rtl'),
+            'font-latin'          => array(self::READ_VALUE,  'w:font', 'w:val'),
+            'font-eastAsia'       => array(self::READ_VALUE,  'w:font', 'w:eastAsia'),
+            'font-bidi'           => array(self::READ_VALUE,  'w:font', 'w:bidi'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 7ade4dc5..581d6b3d 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -18,8 +18,9 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
-use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Style\Language;
 
 /**
  * Settings reader
@@ -66,6 +67,28 @@ class Settings extends AbstractPart
         }
     }
 
+    /**
+     * Sets the document Language
+     * 
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMNode $node
+     */
+    protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    {
+
+        $val = $xmlReader->getAttribute('w:val', $node);
+        $eastAsia = $xmlReader->getAttribute('w:eastAsia', $node);
+        $bidi = $xmlReader->getAttribute('w:bidi', $node);
+
+        $themeFontLang = new Language();
+        $themeFontLang->setLatin($val);
+        $themeFontLang->setLatin($eastAsia);
+        $themeFontLang->setLatin($bidi);
+
+        $phpWord->getSettings()->setThemeFontLang($themeFontLang);
+    }
+
     /**
      * Sets the document protection
      *
@@ -73,7 +96,7 @@ class Settings extends AbstractPart
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
-    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
         $documentProtection = $phpWord->getSettings()->getDocumentProtection();
 
@@ -88,17 +111,17 @@ class Settings extends AbstractPart
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
-    protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
         $proofState = $phpWord->getSettings()->getProofState();
 
         $spelling = $xmlReader->getAttribute('w:spelling', $node);
         $grammar = $xmlReader->getAttribute('w:grammar', $node);
 
-        if ($spelling != null) {
+        if ($spelling !== null) {
             $proofState->setSpelling($spelling);
         }
-        if ($grammar != null) {
+        if ($grammar !== null) {
             $proofState->setGrammar($grammar);
         }
     }
@@ -110,13 +133,13 @@ class Settings extends AbstractPart
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
-    protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
         $percent = $xmlReader->getAttribute('w:percent', $node);
         $val = $xmlReader->getAttribute('w:val', $node);
 
-        if ($percent != null || $val != null) {
-            $phpWord->getSettings()->setZoom($percent == null ? $val : $percent);
+        if ($percent !== null || $val !== null) {
+            $phpWord->getSettings()->setZoom($percent === null ? $val : $percent);
         }
     }
 
@@ -127,7 +150,7 @@ class Settings extends AbstractPart
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
-    protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMNode $node)
+    protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
         $revisionView = new TrackChangesView();
         $revisionView->setMarkup($xmlReader->getAttribute('w:markup', $node));
diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php
index 05c79ea2..e2b6dce9 100644
--- a/src/PhpWord/Style/AbstractStyle.php
+++ b/src/PhpWord/Style/AbstractStyle.php
@@ -329,7 +329,7 @@ abstract class AbstractStyle
     protected function setPairedVal(&$property, &$pairProperty, $value)
     {
         $property = $this->setBoolVal($value, $property);
-        if ($value == true) {
+        if ($value === true) {
             $pairProperty = false;
         }
 
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 5cc80fb3..19f2758d 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -228,6 +228,12 @@ class Font extends AbstractStyle
      */
     private $rtl = false;
 
+    /**
+     * Languages 
+     * @var \PhpOffice\PhpWord\Style\Language
+     */
+    private $lang;
+
     /**
      * Create new font style
      *
@@ -276,6 +282,7 @@ class Font extends AbstractStyle
             'paragraph'     => $this->getParagraph(),
             'rtl'           => $this->isRTL(),
             'shading'       => $this->getShading(),
+            'lang'          => $this->getLang(),
         );
 
         return $styles;
@@ -783,6 +790,32 @@ class Font extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get language
+     *
+     * @return \PhpOffice\PhpWord\Style\Language
+     */
+    public function getLang()
+    {
+        return $this->lang;
+    }
+
+    /**
+     * Set language
+     *
+     * @param mixed $value
+     * @return self
+     */
+    public function setLang($value = null)
+    {
+        if (is_string($value) && $value != '') {
+            $value = new Language($value);
+        }
+        $this->setObjectVal($value, 'Language', $this->lang);
+        
+        return $this;
+    }
+
     /**
      * Get bold
      *
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
new file mode 100644
index 00000000..4e9220fd
--- /dev/null
+++ b/src/PhpWord/Style/Language.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * Language
+ * A couple of predefined values are defined here, see the websites below for more values
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_CT_Language.html
+ * @see https://technet.microsoft.com/en-us/library/cc287874(v=office.12).aspx
+ */
+final class Language extends AbstractStyle
+{
+
+    const EN_US = 'en-US';
+    const EN_US_ID = 1033;
+
+    const EN_GB = 'en-GB';
+    const EN_GB_ID = 2057;
+
+    const FR_FR = 'fr-FR';
+    const FR_FR_ID = 1036;
+
+    const FR_BE = 'fr-BE';
+    const FR_BE_ID = 2060;
+
+    const ES_ES = 'es-ES';
+    const ES_ES_ID = 3082;
+
+    const DE_DE = 'de-DE';
+    const DE_DE_ID = 1031;
+
+    const HE_IL = 'he-IL';
+    const HE_IL_ID = 1037;
+
+    const JA_JP = 'ja-JP';
+    const JA_JP_ID = 1041;
+
+    const KO_KR = 'ko-KR';
+    const KO_KR_ID = 1042;
+
+    const ZH_CN = 'zh-CN';
+    const ZH_CN_ID = 2052;
+
+    const HI_IN = 'hi-IN';
+    const HI_IN_ID = 1081;
+
+    /**
+     * Language ID, used for RTF document generation
+     *
+     * @var int
+     * @see https://technet.microsoft.com/en-us/library/cc179219.aspx
+     */
+    private $langId;
+
+    /**
+     * Latin Language
+     *
+     * @var string
+     */
+    private $latin;
+
+    /**
+     * East Asian Language
+     *
+     * @var string
+     */
+    private $eastAsia;
+
+    /**
+     * Complex Script Language
+     *
+     * @var string
+     */
+    private $bidirectional;
+
+    /**
+     * 
+     * @param string|null $latin
+     * @param string|null $eastAsia
+     * @param string|null $bidirectional
+     */
+    public function __construct($latin = null, $eastAsia = null, $bidirectional = null)
+    {
+        if (!empty($latin)) {
+            $this->setLatin($latin);
+        }
+        if (!empty($eastAsia)) {
+            $this->setEastAsia($eastAsia);
+        }
+        if (!empty($bidirectional)) {
+            $this->setBidirectional($bidirectional);
+        }
+    }
+
+    /**
+     * Set the Latin Language
+     *
+     * @param string $latin
+     *            The value for the latin language
+     * @return self
+     */
+    public function setLatin($latin)
+    {
+        $this->validateLocale($latin);
+        $this->latin = $latin;
+        return $this;
+    }
+
+    /**
+     * Get the Latin Language
+     *
+     * @return string|null
+     */
+    public function getLatin()
+    {
+        return $this->latin;
+    }
+
+    /**
+     * Set the Language ID
+     *
+     * @param int $langId
+     *            The value for the language ID
+     * @return self
+     * @see https://technet.microsoft.com/en-us/library/cc287874(v=office.12).aspx
+     */
+    public function setLangId($langId)
+    {
+        $this->langId = $langId;
+        return $this;
+    }
+
+    /**
+     * Get the Language ID
+     *
+     * @return int
+     */
+    public function getLangId()
+    {
+        return $this->langId;
+    }
+
+    /**
+     * Set the East Asian Language
+     *
+     * @param string $eastAsia
+     *            The value for the east asian language
+     * @return self
+     */
+    public function setEastAsia($eastAsia)
+    {
+        $this->validateLocale($eastAsia);
+        $this->eastAsia = $eastAsia;
+        return $this;
+    }
+
+    /**
+     * Get the East Asian Language
+     *
+     * @return string|null
+     */
+    public function getEastAsia()
+    {
+        return $this->eastAsia;
+    }
+
+    /**
+     * Set the Complex Script Language
+     *
+     * @param string $bidirectional
+     *            The value for the complex script language
+     * @return self
+     */
+    public function setBidirectional($bidirectional)
+    {
+        $this->validateLocale($bidirectional);
+        $this->bidirectional = $bidirectional;
+        return $this;
+    }
+
+    /**
+     * Get the Complex Script Language
+     *
+     * @return string|null
+     */
+    public function getBidirectional()
+    {
+        return $this->bidirectional;
+    }
+
+    /**
+     * Validates that the language passed is in the format xx-xx
+     * 
+     * @param string $locale
+     * @return boolean
+     */
+    private function validateLocale($locale)
+    {
+        if ($locale !== null && strstr($locale, '-') === false) {
+            throw new \InvalidArgumentException($locale . ' is not a valid language code');
+        }
+    }
+}
diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php
index 18ea0bf2..61a8349b 100644
--- a/src/PhpWord/Style/ListItem.php
+++ b/src/PhpWord/Style/ListItem.php
@@ -247,11 +247,12 @@ class ListItem extends AbstractStyle
 
         // Populate style and register to global Style register
         $style = $listTypeStyles[$this->listType];
+        $numProperties = count($properties);
         foreach ($style['levels'] as $key => $value) {
             $level = array();
             $levelProperties = explode(', ', $value);
             $level['level'] = $key;
-            for ($i = 0; $i < count($properties); $i++) {
+            for ($i = 0; $i < $numProperties; $i++) {
                 $property = $properties[$i];
                 $level[$property] = $levelProperties[$i];
             }
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 8d342550..169f2cda 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -165,6 +165,13 @@ class Paragraph extends Border
      */
     private $contextualSpacing = false;
 
+    /**
+     * Right to Left Paragraph Layout
+     *
+     * @var bool
+     */
+    private $bidi = false;
+
     /**
      * Set Style value
      *
@@ -216,6 +223,7 @@ class Paragraph extends Border
             'tabs'              => $this->getTabs(),
             'shading'           => $this->getShading(),
             'contextualSpacing' => $this->hasContextualSpacing(),
+            'bidi'              => $this->isBidi(),
         );
 
         return $styles;
@@ -739,7 +747,7 @@ class Paragraph extends Border
 
         return $this;
     }
-    
+
     /**
      * Get contextualSpacing
      *
@@ -762,4 +770,28 @@ class Paragraph extends Border
         
         return $this;
     }
+
+    /**
+     * Get bidirectional
+     *
+     * @return bool
+     */
+    public function isBidi()
+    {
+        return $this->bidi;
+    }
+
+    /**
+     * Set bidi
+     *
+     * @param bool $bidi
+     *            Set to true to write from right to left
+     * @return self
+     */
+    public function setBidi($bidi)
+    {
+        $this->bidi = $bidi;
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Style/TextBox.php b/src/PhpWord/Style/TextBox.php
index 600fb8ea..6783cd18 100644
--- a/src/PhpWord/Style/TextBox.php
+++ b/src/PhpWord/Style/TextBox.php
@@ -183,7 +183,8 @@ class TextBox extends Image
     {
         $hasInnerMargins = false;
         $margins = $this->getInnerMargin();
-        for ($i = 0; $i < count($margins); $i++) {
+        $numMargins = count($margins);
+        for ($i = 0; $i < $numMargins; $i++) {
             if ($margins[$i] !== null) {
                 $hasInnerMargins = true;
             }
diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index b50be0e8..ee22aaab 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -81,22 +81,27 @@ class Styles extends AbstractPart
         $xmlWriter->writeAttribute('style:writing-mode', 'page');
         $xmlWriter->endElement(); // style:paragraph-properties
 
+        $language = $this->getParentWriter()->getPhpWord()->getSettings()->getThemeFontLang();
+        $latinLang = $language != null && is_string($language->getLatin()) ? explode('-', $language->getLatin()) : array('fr', 'FR');
+        $asianLang = $language != null && is_string($language->getEastAsia()) ? explode('-', $language->getEastAsia()) : array('zh', 'CN');
+        $complexLang = $language != null && is_string($language->getBidirectional()) ? explode('-', $language->getBidirectional()) : array('hi', 'IN');
+
         // Font
         $xmlWriter->startElement('style:text-properties');
         $xmlWriter->writeAttribute('style:use-window-font-color', 'true');
         $xmlWriter->writeAttribute('style:font-name', Settings::getDefaultFontName());
         $xmlWriter->writeAttribute('fo:font-size', Settings::getDefaultFontSize() . 'pt');
-        $xmlWriter->writeAttribute('fo:language', 'fr');
-        $xmlWriter->writeAttribute('fo:country', 'FR');
+        $xmlWriter->writeAttribute('fo:language', $latinLang[0]);
+        $xmlWriter->writeAttribute('fo:country', $latinLang[1]);
         $xmlWriter->writeAttribute('style:letter-kerning', 'true');
         $xmlWriter->writeAttribute('style:font-name-asian', Settings::getDefaultFontName() . '2');
         $xmlWriter->writeAttribute('style:font-size-asian', Settings::getDefaultFontSize() . 'pt');
-        $xmlWriter->writeAttribute('style:language-asian', 'zh');
-        $xmlWriter->writeAttribute('style:country-asian', 'CN');
+        $xmlWriter->writeAttribute('style:language-asian', $asianLang[0]);
+        $xmlWriter->writeAttribute('style:country-asian', $asianLang[1]);
         $xmlWriter->writeAttribute('style:font-name-complex', Settings::getDefaultFontName() . '2');
         $xmlWriter->writeAttribute('style:font-size-complex', Settings::getDefaultFontSize() . 'pt');
-        $xmlWriter->writeAttribute('style:language-complex', 'hi');
-        $xmlWriter->writeAttribute('style:country-complex', 'IN');
+        $xmlWriter->writeAttribute('style:language-complex', $complexLang[0]);
+        $xmlWriter->writeAttribute('style:country-complex', $complexLang[1]);
         $xmlWriter->writeAttribute('fo:hyphenate', 'false');
         $xmlWriter->writeAttribute('fo:hyphenation-remain-char-count', '2');
         $xmlWriter->writeAttribute('fo:hyphenation-push-char-count', '2');
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
index 24ee7b0a..97b2f1b6 100644
--- a/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -86,6 +86,10 @@ class Document extends AbstractPart
      */
     private function writeFormatting()
     {
+        $docSettings = $this->getParentWriter()->getPhpWord()->getSettings();
+        // Applies a language to a text run (defaults to 1036 : French (France))
+        $langId = $docSettings->getThemeFontLang() != null && $docSettings->getThemeFontLang()->getLangId() != null ? $docSettings->getThemeFontLang()->getLangId() : 1036;
+
         $content = '';
 
         $content .= '\deftab720'; // Set the default tab size (720 twips)
@@ -94,7 +98,7 @@ class Document extends AbstractPart
         $content .= '\uc1'; // Set the numberof bytes that follows a unicode character
         $content .= '\pard'; // Resets to default paragraph properties.
         $content .= '\nowidctlpar'; // No widow/orphan control
-        $content .= '\lang1036'; // Applies a language to a text run (1036 : French (France))
+        $content .= '\lang' . $langId;
         $content .= '\kerning1'; // Point size (in half-points) above which to kern character pairs
         $content .= '\fs' . (Settings::getDefaultFontSize() * 2); // Set the font size in half-points
         $content .= PHP_EOL;
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index d2cb8117..eca70d29 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -17,9 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
-use PhpOffice\PhpWord\Settings as DocumentSettings;
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\Style\Language;
 
 /**
  * Word2007 settings part writer: word/settings.xml
@@ -110,7 +110,6 @@ class Settings extends AbstractPart
             'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
             'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
-            'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => $documentSettings->getDecimalSymbol())),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
             'w:compat' => array(),
@@ -152,6 +151,7 @@ class Settings extends AbstractPart
         $this->setOnOffValue('w:doNotTrackFormatting', $documentSettings->hasDoNotTrackFormatting());
         $this->setOnOffValue('w:evenAndOddHeaders', $documentSettings->hasEvenAndOddHeaders());
 
+        $this->setThemeFontLang($documentSettings->getThemeFontLang());
         $this->setRevisionView($documentSettings->getRevisionView());
         $this->setDocumentProtection($documentSettings->getDocumentProtection());
         $this->setProofState($documentSettings->getProofState());
@@ -179,7 +179,7 @@ class Settings extends AbstractPart
     /**
      * Get protection settings.
      *
-     * @param \PhpOffice\PhpWord\Metadata\Settings $documentProtection
+     * @param \PhpOffice\PhpWord\Metadata\Protection $documentProtection
      * @return void
      */
     private function setDocumentProtection($documentProtection)
@@ -212,9 +212,9 @@ class Settings extends AbstractPart
     }
 
     /**
-     * Set the Proof state
+     * Set the Revision View
      *
-     * @param ProofState $proofState
+     * @param TrackChangesView $trackChangesView
      */
     private function setRevisionView(TrackChangesView $trackChangesView = null)
     {
@@ -229,6 +229,23 @@ class Settings extends AbstractPart
         }
     }
 
+    /**
+     * Sets the language
+     * 
+     * @param Language $language
+     */
+    private function setThemeFontLang(Language $language = null)
+    {
+        $latinLanguage = ($language == null || $language->getLatin() === null) ? 'en-US' : $language->getLatin();
+        $lang = array();
+        $lang['w:val'] = $latinLanguage;
+        if ($language != null) {
+            $lang['w:eastAsia'] = $language->getEastAsia() === null ? 'x-none' : $language->getEastAsia();
+            $lang['w:bidi'] = $language->getBidirectional() === null ? 'x-none' : $language->getBidirectional();
+        }
+        $this->settings['w:themeFontLang'] = array('@attributes' => $lang);
+    }
+
     /**
      * Set the magnification
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 01b84c08..7795d56b 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -85,6 +85,8 @@ class Styles extends AbstractPart
     {
         $fontName = PhpWordSettings::getDefaultFontName();
         $fontSize = PhpWordSettings::getDefaultFontSize();
+        $language = $this->getParentWriter()->getPhpWord()->getSettings()->getThemeFontLang();
+        $latinLanguage = ($language == null || $language->getLatin() === null) ? 'en-US' : $language->getLatin();
 
         // Default font
         $xmlWriter->startElement('w:docDefaults');
@@ -102,6 +104,13 @@ class Styles extends AbstractPart
         $xmlWriter->startElement('w:szCs');
         $xmlWriter->writeAttribute('w:val', $fontSize * 2);
         $xmlWriter->endElement(); // w:szCs
+        $xmlWriter->startElement('w:lang');
+        $xmlWriter->writeAttribute('w:val', $latinLanguage);
+        if ($language != null) {
+            $xmlWriter->writeAttributeIf($language->getEastAsia() !== null, 'w:eastAsia', $language->getEastAsia());
+            $xmlWriter->writeAttributeIf($language->getBidirectional() !== null, 'w:bidi', $language->getBidirectional());
+        }
+        $xmlWriter->endElement(); // w:lang
         $xmlWriter->endElement(); // w:rPr
         $xmlWriter->endElement(); // w:rPrDefault
         $xmlWriter->endElement(); // w:docDefaults
diff --git a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index d0ee5a0d..0b8b0a52 100644
--- a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -71,7 +71,7 @@ abstract class AbstractStyle
     /**
      * Get Style
      *
-     * @return \PhpOffice\PhpWord\Style\AbstractStyle
+     * @return string|\PhpOffice\PhpWord\Style\AbstractStyle
      */
     protected function getStyle()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 97cf3088..2248a448 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -86,6 +86,16 @@ class Font extends AbstractStyle
             $xmlWriter->endElement();
         }
 
+        //Language
+        $language = $style->getLang();
+        if ($language != null && ($language->getLatin() !== null || $language->getEastAsia() !== null || $language->getBidirectional() !== null)) {
+            $xmlWriter->startElement('w:lang');
+            $xmlWriter->writeAttributeIf($language->getLatin() !== null, 'w:val', $language->getLatin());
+            $xmlWriter->writeAttributeIf($language->getEastAsia() !== null, 'w:eastAsia', $language->getEastAsia());
+            $xmlWriter->writeAttributeIf($language->getBidirectional() !== null, 'w:bidi', $language->getBidirectional());
+            $xmlWriter->endElement();
+        }
+
         // Color
         $color = $style->getColor();
         $xmlWriter->writeElementIf($color !== null, 'w:color', 'w:val', $color);
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 787f2a5f..32f8abba 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -106,7 +106,10 @@ class Paragraph extends AbstractStyle
             }
             $xmlWriter->endElement();
         }
-        
+
+        //Right to left
+        $xmlWriter->writeElementIf($styles['bidi'] === true, 'w:bidi');
+
         //Paragraph contextualSpacing
         $xmlWriter->writeElementIf($styles['contextualSpacing'] === true, 'w:contextualSpacing');
 
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index 39392fcd..aa46d89b 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -21,9 +21,9 @@ use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
- * Test class for PhpOffice\PhpWord\SimpleType\FootnoteProperties
+ * Test class for PhpOffice\PhpWord\ComplexType\FootnoteProperties
  *
- * @coversDefaultClass \PhpOffice\PhpWord\SimpleType\FootnoteProperties
+ * @coversDefaultClass \PhpOffice\PhpWord\ComplexType\FootnoteProperties
  * @runTestsInSeparateProcesses
  */
 class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/PhpWord/ComplexType/ProofStateTest.php b/tests/PhpWord/ComplexType/ProofStateTest.php
new file mode 100644
index 00000000..0b7e74ca
--- /dev/null
+++ b/tests/PhpWord/ComplexType/ProofStateTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\ComplexType;
+
+/**
+ * Test class for PhpOffice\PhpWord\ComplexType\ProofState
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\ComplexType\ProofState
+ */
+class ProofStateTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Tests the getters and setters
+     */
+    public function testGetSet()
+    {
+        $pState= new ProofState();
+        $pState->setGrammar(ProofState::CLEAN);
+        $pState->setSpelling(ProofState::DIRTY);
+
+        $this->assertEquals(ProofState::CLEAN, $pState->getGrammar());
+        $this->assertEquals(ProofState::DIRTY, $pState->getSpelling());
+    }
+
+    /**
+     * Test throws exception if wrong grammar proof state value given
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongGrammar()
+    {
+        $pState = new ProofState();
+        $pState->setGrammar('Wrong');
+    }
+
+    /**
+     * Test throws exception if wrong spelling proof state value given
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongSpelling()
+    {
+        $pState= new ProofState();
+        $pState->setSpelling('Wrong');
+    }
+}
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index 61648d4e..c8fd4dab 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -74,6 +74,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
             'scale'               => null,
             'spacing'             => null,
             'kerning'             => null,
+            'lang'                => null,
         );
         foreach ($attributes as $key => $default) {
             $get = is_bool($default) ? "is{$key}" : "get{$key}";
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
new file mode 100644
index 00000000..bd466956
--- /dev/null
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * Test class for PhpOffice\PhpWord\Style\Language
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Style\Language
+ */
+class LanguageTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test get/set
+     */
+    public function testGetSetProperties()
+    {
+        $object = new Language();
+        $properties = array(
+            'latin'          => array(null, 'fr-BE'),
+            'eastAsia'       => array(null, 'ja-JP'),
+            'bidirectional'  => array(null, 'ar-SA'),
+            'langId'         => array(null, 1036),
+        );
+        foreach ($properties as $property => $value) {
+            list($default, $expected) = $value;
+            $get = "get{$property}";
+            $set = "set{$property}";
+
+            $this->assertEquals($default, $object->$get()); // Default value
+
+            $object->$set($expected);
+
+            $this->assertEquals($expected, $object->$get()); // New value
+        }
+    }
+
+    /**
+     * Test throws exception if wrong locale is given
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongLanguage()
+    {
+        $language = new Language();
+        $language->setLatin('fr');
+    }
+}
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index 86d6e896..b78c557a 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -80,6 +80,7 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
             'keepLines'         => true,
             'pageBreakBefore'   => true,
             'contextualSpacing' => true,
+            'bidi'              => true,
         );
         foreach ($attributes as $key => $value) {
             $get = $this->findGetter($key, $value, $object);
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 828e1283..99c66680 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -16,11 +16,12 @@
  */
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\TestHelperDOCX;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Zoom;
-use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\Style\Language;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -73,7 +74,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     /**
      * Test language
      */
-    public function testLanguage()
+    public function testDefaultLanguage()
     {
         $phpWord = new PhpWord();
         
@@ -88,6 +89,26 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('en-US', $element->getAttribute('w:val'));
     }
 
+    /**
+     * Test language
+     */
+    public function testLanguage()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setThemeFontLang(new Language(Language::DE_DE, Language::KO_KR, Language::HE_IL));
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        
+        $file = 'word/settings.xml';
+        
+        $path = '/w:settings/w:themeFontLang';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+        
+        $this->assertEquals(Language::DE_DE, $element->getAttribute('w:val'));
+        $this->assertEquals(Language::KO_KR, $element->getAttribute('w:eastAsia'));
+        $this->assertEquals(Language::HE_IL, $element->getAttribute('w:bidi'));
+    }
+
     /**
      * Test spelling
      */

From 4084d4f191202c40789c4b0396122e353a019106 Mon Sep 17 00:00:00 2001
From: Kai Gohegan <kai.gohegan@network-plus.co.uk>
Date: Mon, 9 Oct 2017 13:19:23 +0100
Subject: [PATCH 104/370] Update AbstractContainer.php

Suppressing the PHP warning doesn't seem to work. Padding the $args array does.
---
 src/PhpWord/Element/AbstractContainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index d5b4cc62..328b2d35 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -98,7 +98,7 @@ abstract class AbstractContainer extends AbstractElement
             // Special case for TextBreak
             // @todo Remove the `$count` parameter in 1.0.0 to make this element similiar to other elements?
             if ($element == 'TextBreak') {
-                @list($count, $fontStyle, $paragraphStyle) = $args; // Suppress error
+                list($count, $fontStyle, $paragraphStyle) = array_pad($args, 3, null);
                 if ($count === null) {
                     $count = 1;
                 }

From 87a355bb821753882bee9310d00b5aed75f65c61 Mon Sep 17 00:00:00 2001
From: Nilton <niltoncastillo@pimarox.nl>
Date: Sat, 21 Oct 2017 00:07:52 +0200
Subject: [PATCH 105/370] Bring back b, i, <span style="font-style: italic;">
 and <span style="font-weight: bold;">

---
 src/PhpWord/Shared/Html.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index d03d0adf..a0deb7b1 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -119,9 +119,12 @@ class Html
             'h6'        => array('Heading',     null,   $element,   $styles,    null,   'Heading6',     null),
             '#text'     => array('Text',        $node,  $element,   $styles,    null,   null,           null),
             'strong'    => array('Property',    null,   null,       $styles,    null,   'bold',         true),
+            'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
             'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
+            'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
+            'span'      => array('Property',    null,   null,       $styles,    null,   'span',        $node),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
             'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
             'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
@@ -251,7 +254,16 @@ class Html
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
-        $styles['font'][$argument1] = $argument2;
+        if ($argument1 !== 'span') {
+            $styles['font'][$argument1] = $argument2;
+        } else {
+            if (!is_null($argument2->attributes)) {
+                $nodeAttr = $argument2->attributes->getNamedItem('style');
+                if (!is_null($nodeAttr) && property_exists($nodeAttr, 'value')) {
+                    $styles['font'] = self::parseStyle($nodeAttr, $styles['font']);
+                }
+            }
+        }
 
         return null;
     }
@@ -369,6 +381,20 @@ class Html
                 case 'background-color':
                     $styles['bgColor'] = trim($cValue, "#");
                     break;
+                case 'font-weight':
+                    $tValue = false;
+                    if (preg_match('#bold#', $cValue)) {
+                        $tValue = true; // also match bolder
+                    }
+                    $styles['bold'] = $tValue;
+                    break;
+                case 'font-style':
+                    $tValue = false;
+                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
+                        $tValue = true;
+                    }
+                    $styles['italic'] = $tValue;
+                    break;
             }
         }
 

From 0f50b6dc61ee6745c1022906305f0b4b3a3bd9cf Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 23 Oct 2017 23:05:29 +0200
Subject: [PATCH 106/370] update documentation

---
 composer.json       | 3 +++
 docs/conf.py        | 6 +++---
 docs/elements.rst   | 2 +-
 docs/installing.rst | 2 +-
 docs/references.rst | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index ab8b6aa6..5b5a91d2 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,9 @@
         {
             "name": "Roman Syroeshko",
             "homepage": "http://ru.linkedin.com/pub/roman-syroeshko/34/a53/994/"
+        },
+        {
+            "name": "Antoine de Troostembergh"
         }
     ],
     "require": {
diff --git a/docs/conf.py b/docs/conf.py
index e9b1c59e..6b7cf8e8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,14 +41,14 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'PHPWord'
-copyright = u'2014-2015, PHPWord Contributors'
+copyright = u'2014-2017, PHPWord Contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.13.0'
+version = '0.14.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
@@ -120,7 +120,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/docs/elements.rst b/docs/elements.rst
index 848e3f98..124f4431 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -432,7 +432,7 @@ Comments
 ---------
 
 Comments can be added to a document by using ``addComment``.
-The comment can contain formatted text. Once the comment has been added, it can be linked to any to any element.
+The comment can contain formatted text. Once the comment has been added, it can be linked to any element with ``setCommentStart``.
 
 .. code-block:: php
 
diff --git a/docs/installing.rst b/docs/installing.rst
index 9593484a..37e4d379 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -34,7 +34,7 @@ Example:
 
     {
         "require": {
-           "phpoffice/phpword": "v0.13.*"
+           "phpoffice/phpword": "v0.14.*"
         }
     }
 
diff --git a/docs/references.rst b/docs/references.rst
index 9c4e06a8..a17f558d 100644
--- a/docs/references.rst
+++ b/docs/references.rst
@@ -4,7 +4,7 @@ References
 ==========
 
 ISO/IEC 29500, Third edition, 2012-09-01
----------------------
+----------------------------------------
 
 - `Part 1: Fundamentals and Markup Language Reference
   <http://standards.iso.org/ittf/PubliclyAvailableStandards/c061750_ISO_IEC_29500-1_2012.zip>`__

From 3cbc65bae4843a4535d1ba538ccbaf5d81e18e07 Mon Sep 17 00:00:00 2001
From: lightbringer <lightbringer1991@yahoo.com>
Date: Sat, 28 Oct 2017 18:56:16 +1100
Subject: [PATCH 107/370] 489: Fix z-index size too big in 64bit OS

---
 src/PhpWord/Writer/Word2007/Style/Frame.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 9c6ddaef..abbf07ac 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -28,6 +28,8 @@ use PhpOffice\PhpWord\Writer\Word2007\Element\ParagraphAlignment;
  */
 class Frame extends AbstractStyle
 {
+    const PHP_32BIT_INT_MAX = 2147483647;
+
     /**
      * Write style.
      *
@@ -41,7 +43,8 @@ class Frame extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $zIndices = array(FrameStyle::WRAP_INFRONT => PHP_INT_MAX, FrameStyle::WRAP_BEHIND => -PHP_INT_MAX);
+        $maxZIndex = min(PHP_INT_MAX, self::PHP_32BIT_INT_MAX);
+        $zIndices = array(FrameStyle::WRAP_INFRONT => $maxZIndex, FrameStyle::WRAP_BEHIND => -$maxZIndex);
 
         $properties = array(
             'width'     => 'width',

From 0459670a9c0517872f513a484eae36285c6239b4 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 4 Nov 2017 22:44:12 +0100
Subject: [PATCH 108/370] Enable php-cs-fixer in build & fix resulting warnings
 (#1099)

* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
---
 .gitignore                                    |     1 +
 .php_cs.dist                                  |   146 +
 .travis.yml                                   |    30 +-
 .travis_shell_after_success.sh                |     2 +-
 bootstrap.php                                 |     4 +-
 composer.json                                 |     8 +-
 docs/elements.rst                             |     6 +-
 run_tests.sh                                  |    14 +
 samples/Sample_01_SimpleText.php              |     2 +-
 samples/Sample_02_TabStops.php                |     2 +-
 samples/Sample_07_TemplateCloneRow.php        |   124 +-
 samples/Sample_08_ParagraphPagination.php     |     2 +-
 samples/Sample_09_Tables.php                  |    11 +-
 samples/Sample_13_Images.php                  |     2 +-
 samples/Sample_37_Comments.php                |     3 +-
 samples/Sample_Header.php                     |     4 +-
 samples/index.php                             |     8 +-
 src/PhpWord/Collection/AbstractCollection.php |     9 +-
 src/PhpWord/Collection/Bookmarks.php          |     4 +-
 src/PhpWord/Collection/Charts.php             |     4 +-
 src/PhpWord/Collection/Comments.php           |     4 +-
 src/PhpWord/Collection/Endnotes.php           |     4 +-
 src/PhpWord/Collection/Footnotes.php          |     4 +-
 src/PhpWord/Collection/Titles.php             |     4 +-
 .../ComplexType/FootnoteProperties.php        |    26 +-
 src/PhpWord/ComplexType/ProofState.php        |    12 +-
 src/PhpWord/ComplexType/TrackChangesView.php  |    36 +-
 src/PhpWord/Element/AbstractContainer.php     |    14 +-
 src/PhpWord/Element/AbstractElement.php       |    33 +-
 src/PhpWord/Element/Bookmark.php              |     4 +-
 src/PhpWord/Element/Cell.php                  |     4 +-
 src/PhpWord/Element/Chart.php                 |     6 +-
 src/PhpWord/Element/CheckBox.php              |     4 +-
 src/PhpWord/Element/Comment.php               |     4 +-
 src/PhpWord/Element/Endnote.php               |     4 +-
 src/PhpWord/Element/Field.php                 |    60 +-
 src/PhpWord/Element/Footer.php                |    11 +-
 src/PhpWord/Element/Footnote.php              |     4 +-
 src/PhpWord/Element/FormField.php             |     6 +-
 src/PhpWord/Element/Header.php                |     4 +-
 src/PhpWord/Element/Image.php                 |    51 +-
 src/PhpWord/Element/Line.php                  |     4 +-
 src/PhpWord/Element/Link.php                  |     5 +-
 src/PhpWord/Element/ListItem.php              |     4 +-
 src/PhpWord/Element/ListItemRun.php           |    10 +-
 src/PhpWord/Element/Object.php                |     9 +-
 src/PhpWord/Element/PageBreak.php             |     4 +-
 src/PhpWord/Element/PreserveText.php          |     5 +-
 src/PhpWord/Element/Row.php                   |     4 +-
 src/PhpWord/Element/SDT.php                   |     4 +-
 src/PhpWord/Element/Section.php               |    22 +-
 src/PhpWord/Element/Shape.php                 |     4 +-
 src/PhpWord/Element/TOC.php                   |    11 +-
 src/PhpWord/Element/Table.php                 |     5 +-
 src/PhpWord/Element/Text.php                  |     8 +-
 src/PhpWord/Element/TextBox.php               |     4 +-
 src/PhpWord/Element/TextBreak.php             |     8 +-
 src/PhpWord/Element/TextRun.php               |     4 +-
 src/PhpWord/Element/Title.php                 |     6 +-
 src/PhpWord/Element/TrackChange.php           |     6 +-
 src/PhpWord/Escaper/AbstractEscaper.php       |     4 +-
 src/PhpWord/Escaper/EscaperInterface.php      |     4 +-
 src/PhpWord/Escaper/RegExp.php                |     4 +-
 src/PhpWord/Escaper/Rtf.php                   |    13 +-
 src/PhpWord/Escaper/Xml.php                   |     4 +-
 src/PhpWord/Exception/CopyFileException.php   |    12 +-
 .../CreateTemporaryFileException.php          |     8 +-
 src/PhpWord/Exception/Exception.php           |     4 +-
 .../Exception/InvalidImageException.php       |     4 +-
 .../Exception/InvalidObjectException.php      |     4 +-
 .../Exception/InvalidStyleException.php       |     4 +-
 .../UnsupportedImageTypeException.php         |     4 +-
 src/PhpWord/IOFactory.php                     |    23 +-
 src/PhpWord/Media.php                         |    58 +-
 src/PhpWord/Metadata/Compatibility.php        |     8 +-
 src/PhpWord/Metadata/DocInfo.php              |    39 +-
 src/PhpWord/Metadata/Protection.php           |     8 +-
 src/PhpWord/Metadata/Settings.php             |    54 +-
 src/PhpWord/PhpWord.php                       |    23 +-
 src/PhpWord/Reader/AbstractReader.php         |    13 +-
 src/PhpWord/Reader/HTML.php                   |     4 +-
 src/PhpWord/Reader/MsDoc.php                  |    93 +-
 src/PhpWord/Reader/ODText.php                 |     7 +-
 src/PhpWord/Reader/ODText/AbstractPart.php    |     4 +-
 src/PhpWord/Reader/ODText/Content.php         |     7 +-
 src/PhpWord/Reader/ODText/Meta.php            |     8 +-
 src/PhpWord/Reader/RTF.php                    |     4 +-
 src/PhpWord/Reader/RTF/Document.php           |    49 +-
 src/PhpWord/Reader/ReaderInterface.php        |     6 +-
 src/PhpWord/Reader/Word2007.php               |     7 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |    35 +-
 src/PhpWord/Reader/Word2007/DocPropsApp.php   |     4 +-
 src/PhpWord/Reader/Word2007/DocPropsCore.php  |    21 +-
 .../Reader/Word2007/DocPropsCustom.php        |     5 +-
 src/PhpWord/Reader/Word2007/Document.php      |    10 +-
 src/PhpWord/Reader/Word2007/Endnotes.php      |     4 +-
 src/PhpWord/Reader/Word2007/Footnotes.php     |     5 +-
 src/PhpWord/Reader/Word2007/Numbering.php     |     7 +-
 src/PhpWord/Reader/Word2007/Settings.php      |    13 +-
 src/PhpWord/Reader/Word2007/Styles.php        |     7 +-
 src/PhpWord/Settings.php                      |    42 +-
 src/PhpWord/Shared/AbstractEnum.php           |     7 +-
 src/PhpWord/Shared/Converter.php              |    18 +-
 src/PhpWord/Shared/Html.php                   |    23 +-
 src/PhpWord/Shared/OLERead.php                |     5 +-
 src/PhpWord/Shared/PCLZip/pclzip.lib.php      | 10562 ++++++++--------
 src/PhpWord/Shared/ZipArchive.php             |    19 +-
 src/PhpWord/SimpleType/Jc.php                 |     6 +-
 src/PhpWord/SimpleType/JcTable.php            |     4 +-
 src/PhpWord/SimpleType/NumberFormat.php       |     4 +-
 src/PhpWord/SimpleType/Zoom.php               |     4 +-
 src/PhpWord/Style.php                         |    10 +-
 src/PhpWord/Style/AbstractStyle.php           |    20 +-
 src/PhpWord/Style/Border.php                  |     6 +-
 src/PhpWord/Style/Cell.php                    |    12 +-
 src/PhpWord/Style/Chart.php                   |     5 +-
 src/PhpWord/Style/Extrusion.php               |     6 +-
 src/PhpWord/Style/Fill.php                    |     8 +-
 src/PhpWord/Style/Font.php                    |    20 +-
 src/PhpWord/Style/Frame.php                   |     4 +-
 src/PhpWord/Style/Image.php                   |     5 +-
 src/PhpWord/Style/Indentation.php             |     6 +-
 src/PhpWord/Style/Language.php                |    17 +-
 src/PhpWord/Style/Line.php                    |    19 +-
 src/PhpWord/Style/LineNumbering.php           |    12 +-
 src/PhpWord/Style/ListItem.php                |    29 +-
 src/PhpWord/Style/Numbering.php               |    18 +-
 src/PhpWord/Style/NumberingLevel.php          |    67 +-
 src/PhpWord/Style/Outline.php                 |    22 +-
 src/PhpWord/Style/Paper.php                   |     4 +-
 src/PhpWord/Style/Paragraph.php               |    22 +-
 src/PhpWord/Style/Row.php                     |     4 +-
 src/PhpWord/Style/Section.php                 |    12 +-
 src/PhpWord/Style/Shading.php                 |    12 +-
 src/PhpWord/Style/Shadow.php                  |     6 +-
 src/PhpWord/Style/Shape.php                   |     4 +-
 src/PhpWord/Style/Spacing.php                 |     6 +-
 src/PhpWord/Style/TOC.php                     |     4 +-
 src/PhpWord/Style/Tab.php                     |    38 +-
 src/PhpWord/Style/Table.php                   |    20 +-
 src/PhpWord/Style/TextBox.php                 |    13 +-
 src/PhpWord/Template.php                      |     4 +-
 src/PhpWord/TemplateProcessor.php             |    74 +-
 src/PhpWord/Writer/AbstractWriter.php         |    44 +-
 src/PhpWord/Writer/HTML.php                   |     9 +-
 .../Writer/HTML/Element/AbstractElement.php   |     5 +-
 src/PhpWord/Writer/HTML/Element/Container.php |     4 +-
 src/PhpWord/Writer/HTML/Element/Endnote.php   |     4 +-
 src/PhpWord/Writer/HTML/Element/Footnote.php  |     4 +-
 src/PhpWord/Writer/HTML/Element/Image.php     |     4 +-
 src/PhpWord/Writer/HTML/Element/Link.php      |     4 +-
 src/PhpWord/Writer/HTML/Element/ListItem.php  |     4 +-
 src/PhpWord/Writer/HTML/Element/PageBreak.php |     6 +-
 src/PhpWord/Writer/HTML/Element/Table.php     |     4 +-
 src/PhpWord/Writer/HTML/Element/Text.php      |    12 +-
 src/PhpWord/Writer/HTML/Element/TextBreak.php |     4 +-
 src/PhpWord/Writer/HTML/Element/TextRun.php   |     4 +-
 src/PhpWord/Writer/HTML/Element/Title.php     |     4 +-
 src/PhpWord/Writer/HTML/Part/AbstractPart.php |    17 +-
 src/PhpWord/Writer/HTML/Part/Body.php         |     6 +-
 src/PhpWord/Writer/HTML/Part/Head.php         |    28 +-
 .../Writer/HTML/Style/AbstractStyle.php       |     5 +-
 src/PhpWord/Writer/HTML/Style/Font.php        |     4 +-
 src/PhpWord/Writer/HTML/Style/Generic.php     |     4 +-
 src/PhpWord/Writer/HTML/Style/Image.php       |     4 +-
 src/PhpWord/Writer/HTML/Style/Paragraph.php   |     8 +-
 src/PhpWord/Writer/ODText.php                 |     5 +-
 .../Writer/ODText/Element/AbstractElement.php |     4 +-
 .../Writer/ODText/Element/Container.php       |     4 +-
 src/PhpWord/Writer/ODText/Element/Image.php   |     4 +-
 src/PhpWord/Writer/ODText/Element/Link.php    |     4 +-
 src/PhpWord/Writer/ODText/Element/Table.php   |     4 +-
 src/PhpWord/Writer/ODText/Element/Text.php    |    68 +-
 .../Writer/ODText/Element/TextBreak.php       |     4 +-
 src/PhpWord/Writer/ODText/Element/TextRun.php |     4 +-
 src/PhpWord/Writer/ODText/Element/Title.php   |     4 +-
 .../Writer/ODText/Part/AbstractPart.php       |     6 +-
 src/PhpWord/Writer/ODText/Part/Content.php    |    15 +-
 src/PhpWord/Writer/ODText/Part/Manifest.php   |     4 +-
 src/PhpWord/Writer/ODText/Part/Meta.php       |     5 +-
 src/PhpWord/Writer/ODText/Part/Mimetype.php   |     4 +-
 src/PhpWord/Writer/ODText/Part/Styles.php     |    12 +-
 .../Writer/ODText/Style/AbstractStyle.php     |     4 +-
 src/PhpWord/Writer/ODText/Style/Font.php      |     6 +-
 src/PhpWord/Writer/ODText/Style/Image.php     |     6 +-
 src/PhpWord/Writer/ODText/Style/Paragraph.php |     6 +-
 src/PhpWord/Writer/ODText/Style/Section.php   |     8 +-
 src/PhpWord/Writer/ODText/Style/Table.php     |     6 +-
 src/PhpWord/Writer/PDF.php                    |     6 +-
 src/PhpWord/Writer/PDF/AbstractRenderer.php   |    31 +-
 src/PhpWord/Writer/PDF/DomPDF.php             |    16 +-
 src/PhpWord/Writer/PDF/MPDF.php               |     7 +-
 src/PhpWord/Writer/PDF/TCPDF.php              |     6 +-
 src/PhpWord/Writer/RTF.php                    |     8 +-
 .../Writer/RTF/Element/AbstractElement.php    |    11 +-
 src/PhpWord/Writer/RTF/Element/Container.php  |     4 +-
 src/PhpWord/Writer/RTF/Element/Image.php      |     4 +-
 src/PhpWord/Writer/RTF/Element/Link.php       |     4 +-
 src/PhpWord/Writer/RTF/Element/ListItem.php   |     4 +-
 src/PhpWord/Writer/RTF/Element/PageBreak.php  |     4 +-
 src/PhpWord/Writer/RTF/Element/Table.php      |     4 +-
 src/PhpWord/Writer/RTF/Element/Text.php       |     4 +-
 src/PhpWord/Writer/RTF/Element/TextBreak.php  |     4 +-
 src/PhpWord/Writer/RTF/Element/TextRun.php    |     4 +-
 src/PhpWord/Writer/RTF/Element/Title.php      |     4 +-
 src/PhpWord/Writer/RTF/Part/AbstractPart.php  |    12 +-
 src/PhpWord/Writer/RTF/Part/Document.php      |    16 +-
 src/PhpWord/Writer/RTF/Part/Header.php        |    11 +-
 .../Writer/RTF/Style/AbstractStyle.php        |     4 +-
 src/PhpWord/Writer/RTF/Style/Border.php       |     8 +-
 src/PhpWord/Writer/RTF/Style/Font.php         |     8 +-
 src/PhpWord/Writer/RTF/Style/Paragraph.php    |     5 +-
 src/PhpWord/Writer/RTF/Style/Section.php      |     4 +-
 src/PhpWord/Writer/Word2007.php               |    25 +-
 .../Word2007/Element/AbstractElement.php      |    19 +-
 .../Writer/Word2007/Element/Bookmark.php      |     6 +-
 src/PhpWord/Writer/Word2007/Element/Chart.php |     6 +-
 .../Writer/Word2007/Element/CheckBox.php      |    12 +-
 .../Writer/Word2007/Element/Container.php     |     6 +-
 .../Writer/Word2007/Element/Endnote.php       |     4 +-
 src/PhpWord/Writer/Word2007/Element/Field.php |    32 +-
 .../Writer/Word2007/Element/Footnote.php      |     6 +-
 .../Writer/Word2007/Element/FormField.php     |    19 +-
 src/PhpWord/Writer/Word2007/Element/Image.php |    10 +-
 src/PhpWord/Writer/Word2007/Element/Line.php  |     9 +-
 src/PhpWord/Writer/Word2007/Element/Link.php  |     6 +-
 .../Writer/Word2007/Element/ListItem.php      |     6 +-
 .../Writer/Word2007/Element/ListItemRun.php   |     6 +-
 .../Writer/Word2007/Element/Object.php        |     6 +-
 .../Writer/Word2007/Element/PageBreak.php     |     5 +-
 .../Word2007/Element/ParagraphAlignment.php   |     6 +-
 .../Writer/Word2007/Element/PreserveText.php  |     6 +-
 src/PhpWord/Writer/Word2007/Element/SDT.php   |    17 +-
 src/PhpWord/Writer/Word2007/Element/Shape.php |    11 +-
 src/PhpWord/Writer/Word2007/Element/TOC.php   |     9 +-
 src/PhpWord/Writer/Word2007/Element/Table.php |    10 +-
 .../Word2007/Element/TableAlignment.php       |     6 +-
 src/PhpWord/Writer/Word2007/Element/Text.php  |     6 +-
 .../Writer/Word2007/Element/TextBox.php       |     6 +-
 .../Writer/Word2007/Element/TextBreak.php     |     6 +-
 .../Writer/Word2007/Element/TextRun.php       |     6 +-
 src/PhpWord/Writer/Word2007/Element/Title.php |     6 +-
 .../Writer/Word2007/Part/AbstractPart.php     |    15 +-
 src/PhpWord/Writer/Word2007/Part/Chart.php    |    43 +-
 src/PhpWord/Writer/Word2007/Part/Comments.php |     5 +-
 .../Writer/Word2007/Part/ContentTypes.php     |    25 +-
 .../Writer/Word2007/Part/DocPropsApp.php      |     4 +-
 .../Writer/Word2007/Part/DocPropsCore.php     |     4 +-
 .../Writer/Word2007/Part/DocPropsCustom.php   |     4 +-
 src/PhpWord/Writer/Word2007/Part/Document.php |     7 +-
 src/PhpWord/Writer/Word2007/Part/Endnotes.php |     4 +-
 .../Writer/Word2007/Part/FontTable.php        |     4 +-
 src/PhpWord/Writer/Word2007/Part/Footer.php   |     4 +-
 .../Writer/Word2007/Part/Footnotes.php        |     5 +-
 src/PhpWord/Writer/Word2007/Part/Header.php   |     4 +-
 .../Writer/Word2007/Part/Numbering.php        |     7 +-
 src/PhpWord/Writer/Word2007/Part/Rels.php     |    10 +-
 .../Writer/Word2007/Part/RelsDocument.php     |     4 +-
 src/PhpWord/Writer/Word2007/Part/RelsPart.php |     4 +-
 src/PhpWord/Writer/Word2007/Part/Settings.php |    89 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   |    10 +-
 src/PhpWord/Writer/Word2007/Part/Theme.php    |     5 +-
 .../Writer/Word2007/Part/WebSettings.php      |     4 +-
 .../Writer/Word2007/Style/AbstractStyle.php   |    15 +-
 src/PhpWord/Writer/Word2007/Style/Cell.php    |     7 +-
 .../Writer/Word2007/Style/Extrusion.php       |     8 +-
 src/PhpWord/Writer/Word2007/Style/Fill.php    |     6 +-
 src/PhpWord/Writer/Word2007/Style/Font.php    |    11 +-
 src/PhpWord/Writer/Word2007/Style/Frame.php   |    15 +-
 src/PhpWord/Writer/Word2007/Style/Image.php   |     4 +-
 .../Writer/Word2007/Style/Indentation.php     |     6 +-
 src/PhpWord/Writer/Word2007/Style/Line.php    |     7 +-
 .../Writer/Word2007/Style/LineNumbering.php   |     7 +-
 .../Writer/Word2007/Style/MarginBorder.php    |    14 +-
 src/PhpWord/Writer/Word2007/Style/Outline.php |     8 +-
 .../Writer/Word2007/Style/Paragraph.php       |    14 +-
 src/PhpWord/Writer/Word2007/Style/Row.php     |     7 +-
 src/PhpWord/Writer/Word2007/Style/Section.php |     6 +-
 src/PhpWord/Writer/Word2007/Style/Shading.php |     6 +-
 src/PhpWord/Writer/Word2007/Style/Shadow.php  |     8 +-
 src/PhpWord/Writer/Word2007/Style/Shape.php   |     6 +-
 src/PhpWord/Writer/Word2007/Style/Spacing.php |     6 +-
 src/PhpWord/Writer/Word2007/Style/Tab.php     |    12 +-
 src/PhpWord/Writer/Word2007/Style/Table.php   |    13 +-
 src/PhpWord/Writer/Word2007/Style/TextBox.php |     8 +-
 src/PhpWord/Writer/WriterInterface.php        |     4 +-
 tests/PhpWord/Collection/CollectionTest.php   |     4 +-
 .../ComplexType/FootnotePropertiesTest.php    |    11 +-
 tests/PhpWord/ComplexType/ProofStateTest.php  |    10 +-
 tests/PhpWord/Element/AbstractElementTest.php |     4 +-
 tests/PhpWord/Element/BookmarkTest.php        |    38 +
 tests/PhpWord/Element/CellTest.php            |     4 +-
 tests/PhpWord/Element/CheckBoxTest.php        |     4 +-
 tests/PhpWord/Element/CommentTest.php         |    24 +-
 tests/PhpWord/Element/FieldTest.php           |     4 +-
 tests/PhpWord/Element/FooterTest.php          |     4 +-
 tests/PhpWord/Element/FootnoteTest.php        |     4 +-
 tests/PhpWord/Element/HeaderTest.php          |     6 +-
 tests/PhpWord/Element/ImageTest.php           |    10 +-
 tests/PhpWord/Element/LineTest.php            |     4 +-
 tests/PhpWord/Element/LinkTest.php            |     6 +-
 tests/PhpWord/Element/ListItemRunTest.php     |     4 +-
 tests/PhpWord/Element/ListItemTest.php        |     4 +-
 tests/PhpWord/Element/ObjectTest.php          |    19 +-
 tests/PhpWord/Element/PageBreakTest.php       |     4 +-
 tests/PhpWord/Element/PreserveTextTest.php    |     4 +-
 tests/PhpWord/Element/RowTest.php             |     4 +-
 tests/PhpWord/Element/SDTTest.php             |     4 +-
 tests/PhpWord/Element/SectionTest.php         |    15 +-
 tests/PhpWord/Element/TOCTest.php             |     4 +-
 tests/PhpWord/Element/TableTest.php           |     4 +-
 tests/PhpWord/Element/TextBoxTest.php         |     4 +-
 tests/PhpWord/Element/TextBreakTest.php       |     4 +-
 tests/PhpWord/Element/TextRunTest.php         |     4 +-
 tests/PhpWord/Element/TextTest.php            |     4 +-
 tests/PhpWord/Element/TitleTest.php           |     4 +-
 .../Exception/CopyFileExceptionTest.php       |     4 +-
 .../CreateTemporaryFileExceptionTest.php      |     4 +-
 tests/PhpWord/Exception/ExceptionTest.php     |     6 +-
 .../Exception/InvalidImageExceptionTest.php   |     6 +-
 .../Exception/InvalidStyleExceptionTest.php   |     6 +-
 .../UnsupportedImageTypeExceptionTest.php     |     6 +-
 tests/PhpWord/IOFactoryTest.php               |     4 +-
 tests/PhpWord/MediaTest.php                   |     6 +-
 tests/PhpWord/Metadata/DocInfoTest.php        |     4 +-
 tests/PhpWord/Metadata/SettingsTest.php       |    34 +-
 tests/PhpWord/PhpWordTest.php                 |     8 +-
 tests/PhpWord/Reader/HTMLTest.php             |     4 +-
 tests/PhpWord/Reader/MsDocTest.php            |     4 +-
 tests/PhpWord/Reader/ODTextTest.php           |     4 +-
 tests/PhpWord/Reader/RTFTest.php              |     4 +-
 tests/PhpWord/Reader/Word2007Test.php         |     4 +-
 tests/PhpWord/SettingsTest.php                |     5 +-
 tests/PhpWord/Shared/ConverterTest.php        |     6 +-
 tests/PhpWord/Shared/HtmlTest.php             |     4 +-
 tests/PhpWord/Shared/ZipArchiveTest.php       |     5 +-
 tests/PhpWord/Style/AbstractStyleTest.php     |     5 +-
 tests/PhpWord/Style/CellTest.php              |     4 +-
 tests/PhpWord/Style/FontTest.php              |     6 +-
 tests/PhpWord/Style/ImageTest.php             |     4 +-
 tests/PhpWord/Style/IndentationTest.php       |     4 +-
 tests/PhpWord/Style/LanguageTest.php          |     4 +-
 tests/PhpWord/Style/LineNumberingTest.php     |     4 +-
 tests/PhpWord/Style/LineTest.php              |     4 +-
 tests/PhpWord/Style/ListItemTest.php          |     4 +-
 tests/PhpWord/Style/NumberingLevelTest.php    |     4 +-
 tests/PhpWord/Style/NumberingTest.php         |     4 +-
 tests/PhpWord/Style/PaperTest.php             |     4 +-
 tests/PhpWord/Style/ParagraphTest.php         |     7 +-
 tests/PhpWord/Style/RowTest.php               |     4 +-
 tests/PhpWord/Style/SectionTest.php           |     6 +-
 tests/PhpWord/Style/ShadingTest.php           |     4 +-
 tests/PhpWord/Style/SpacingTest.php           |     4 +-
 tests/PhpWord/Style/TOCTest.php               |     4 +-
 tests/PhpWord/Style/TabTest.php               |     4 +-
 tests/PhpWord/Style/TableTest.php             |     4 +-
 tests/PhpWord/Style/TextBoxTest.php           |     5 +-
 tests/PhpWord/StyleTest.php                   |     4 +-
 tests/PhpWord/TemplateProcessorTest.php       |     6 +-
 tests/PhpWord/Writer/HTML/ElementTest.php     |     5 +-
 tests/PhpWord/Writer/HTML/PartTest.php        |     5 +-
 tests/PhpWord/Writer/HTML/StyleTest.php       |     5 +-
 tests/PhpWord/Writer/HTMLTest.php             |     9 +-
 tests/PhpWord/Writer/ODText/ElementTest.php   |     5 +-
 .../Writer/ODText/Part/AbstractPartTest.php   |     7 +-
 .../Writer/ODText/Part/ContentTest.php        |     5 +-
 tests/PhpWord/Writer/ODText/StyleTest.php     |     5 +-
 tests/PhpWord/Writer/ODTextTest.php           |    11 +-
 tests/PhpWord/Writer/PDF/DomPDFTest.php       |     7 +-
 tests/PhpWord/Writer/PDF/MPDFTest.php         |     7 +-
 tests/PhpWord/Writer/PDF/TCPDFTest.php        |     7 +-
 tests/PhpWord/Writer/PDFTest.php              |     7 +-
 tests/PhpWord/Writer/RTF/ElementTest.php      |     5 +-
 tests/PhpWord/Writer/RTF/StyleTest.php        |     5 +-
 tests/PhpWord/Writer/RTFTest.php              |    11 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |     9 +-
 .../Writer/Word2007/Part/AbstractPartTest.php |     9 +-
 .../Writer/Word2007/Part/CommentsTest.php     |    11 +-
 .../Writer/Word2007/Part/DocumentTest.php     |     9 +-
 .../Writer/Word2007/Part/FooterTest.php       |     5 +-
 .../Writer/Word2007/Part/FootnotesTest.php    |     5 +-
 .../Writer/Word2007/Part/HeaderTest.php       |     5 +-
 .../Writer/Word2007/Part/NumberingTest.php    |     9 +-
 .../Writer/Word2007/Part/SettingsTest.php     |    39 +-
 .../Writer/Word2007/Part/StylesTest.php       |    12 +-
 tests/PhpWord/Writer/Word2007/PartTest.php    |     5 +-
 .../Writer/Word2007/Style/FontTest.php        |     5 +-
 tests/PhpWord/Writer/Word2007/StyleTest.php   |     5 +-
 tests/PhpWord/Writer/Word2007Test.php         |    13 +-
 tests/PhpWord/_includes/TestHelperDOCX.php    |    11 +-
 tests/PhpWord/_includes/XmlDocument.php       |     8 +-
 tests/bootstrap.php                           |     7 +-
 392 files changed, 7171 insertions(+), 7475 deletions(-)
 create mode 100644 .php_cs.dist
 create mode 100755 run_tests.sh
 create mode 100644 tests/PhpWord/Element/BookmarkTest.php

diff --git a/.gitignore b/.gitignore
index 66e64406..42f03ebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ vendor
 phpword.ini
 /.buildpath
 /.project
+/.php_cs.cache
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 00000000..895ed80f
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,146 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->notName('pclzip.lib.php')
+    ->notName('OLERead.php')
+    ->in('samples')
+    ->in('src')
+    ->in('tests');
+
+return PhpCsFixer\Config::create()
+        ->setRiskyAllowed(true)
+        ->setFinder($finder)
+        ->setRules(array(
+            'array_syntax' => array('syntax' => 'long'),
+            'binary_operator_spaces' => array('align_double_arrow' => true),
+            'blank_line_after_namespace' => true,
+            'blank_line_after_opening_tag' => false,
+            'blank_line_before_return' => true,
+            'braces' => true,
+            'cast_spaces' => true,
+            'class_definition' => true,
+            'class_keyword_remove' => false, // ::class keyword gives us beter support in IDE
+            'combine_consecutive_unsets' => true,
+            'concat_space' => array('spacing' => 'one'),
+            'declare_equal_normalize' => true,
+            'declare_strict_types' => false, // Too early to adopt strict types
+            'dir_constant' => true,
+            'elseif' => true,
+            'encoding' => true,
+            'ereg_to_preg' => true,
+            'full_opening_tag' => true,
+            'function_declaration' => true,
+            'function_typehint_space' => true,
+            'general_phpdoc_annotation_remove' => false, // No use for that
+            'hash_to_slash_comment' => true,
+            'header_comment' => false, // We don't use common header in all our files
+            'heredoc_to_nowdoc' => false, // Not sure about this one
+            'is_null' => false, // Risky
+            'include' => true,
+            'indentation_type' => true,
+            'line_ending' => true,
+            'linebreak_after_opening_tag' => true,
+            'lowercase_cast' => true,
+            'lowercase_constants' => true,
+            'lowercase_keywords' => true,
+            'mb_str_functions' => false, // No, too dangerous to change that
+            'method_argument_space' => true,
+            'method_separation' => true,
+            'modernize_types_casting' => true,
+            'native_function_casing' => true,
+            'native_function_invocation'=> false, // This is risky and seems to be micro-optimization that make code uglier so not worth it, at least for now
+            'new_with_braces' => true,
+            'no_alias_functions' => true,
+            'no_blank_lines_after_class_opening' => true,
+            'no_blank_lines_after_phpdoc' => true,
+            'no_blank_lines_before_namespace' => false, // we want 1 blank line before namespace
+            'no_closing_tag' => true,
+            'no_empty_comment' => true,
+            'no_empty_phpdoc' => true,
+            'no_empty_statement' => true,
+            'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'useTrait', 'curly_brace_block', 'parenthesis_brace_block', 'square_brace_block'),
+            'no_leading_import_slash' => true,
+            'no_leading_namespace_whitespace' => true,
+            'no_mixed_echo_print' => true,
+            'no_multiline_whitespace_around_double_arrow' => true,
+            'no_multiline_whitespace_before_semicolons' => true,
+            'no_php4_constructor' => true,
+            'no_short_bool_cast' => true,
+            'no_short_echo_tag' => true,
+            'no_singleline_whitespace_before_semicolons' => true,
+            'no_spaces_after_function_name' => true,
+            'no_spaces_around_offset' => true,
+            'no_spaces_inside_parenthesis' => true,
+            'no_trailing_comma_in_list_call' => true,
+            'no_trailing_comma_in_singleline_array' => true,
+            'no_trailing_whitespace' => true,
+            'no_trailing_whitespace_in_comment' => true,
+            'no_unneeded_control_parentheses' => true,
+            'no_unreachable_default_argument_value' => true,
+            'no_unused_imports' => true,
+            'no_useless_else' => true,
+            'no_useless_return' => true,
+            'no_whitespace_before_comma_in_array' => true,
+            'no_whitespace_in_blank_line' => true,
+            'normalize_index_brace' => true,
+            'not_operator_with_space' => false, // No we prefer to keep '!' without spaces
+            'not_operator_with_successor_space' => false, // idem
+            'object_operator_without_whitespace' => true,
+            'ordered_class_elements' => false, // We prefer to keep some freedom
+            'ordered_imports' => true,
+            'php_unit_construct' => true,
+            'php_unit_dedicate_assert' => true,
+            'php_unit_fqcn_annotation' => true,
+            'php_unit_strict' => false, // We sometime actually need assertEquals
+            'phpdoc_add_missing_param_annotation' => true,
+            'phpdoc_align' => false, // Waste of time
+            'phpdoc_annotation_without_dot' => true,
+            'phpdoc_indent' => true,
+            'phpdoc_inline_tag' => true,
+            'phpdoc_no_access' => true,
+            'phpdoc_no_alias_tag' => true,
+            'phpdoc_no_empty_return' => true,
+            'phpdoc_no_package' => true,
+            'phpdoc_no_useless_inheritdoc' => true,
+            'phpdoc_order' => true,
+            'phpdoc_return_self_reference' => true,
+            'phpdoc_scalar' => true,
+            'phpdoc_separation' => false,
+            'phpdoc_single_line_var_spacing' => true,
+            'phpdoc_summary' => false,
+            'phpdoc_to_comment' => true,
+            'phpdoc_trim' => true,
+            'phpdoc_types' => true,
+            'phpdoc_var_without_name' => true,
+            'pow_to_exponentiation' => false,
+            'pre_increment' => false,
+            'protected_to_private' => true,
+            'psr0' => true,
+            'psr4' => true,
+            'random_api_migration' => false, // This breaks our unit tests
+            'return_type_declaration' => true,
+            'self_accessor' => true,
+            'semicolon_after_instruction' => false, // Buggy in `samples/index.php`
+            'short_scalar_cast' => true,
+            'silenced_deprecation_error' => true,
+            'simplified_null_return' => false, // While technically correct we prefer to be explicit when returning null
+            'single_blank_line_at_eof' => true,
+            'single_blank_line_before_namespace' => true,
+            'single_class_element_per_statement' => true,
+            'single_import_per_statement' => true,
+            'single_line_after_imports' => true,
+            'single_quote' => true,
+            'space_after_semicolon' => true,
+            'standardize_not_equals' => true,
+            'strict_comparison' => false, // No, too dangerous to change that
+            'strict_param' =>  false, // No, too dangerous to change that
+            'switch_case_semicolon_to_colon' => true,
+            'switch_case_space' => true,
+            'ternary_operator_spaces' => true,
+            'ternary_to_null_coalescing' => false, // Cannot use that with PHP 5.6
+            'trailing_comma_in_multiline_array' => true,
+            'trim_array_spaces' => false,
+            'unary_operator_spaces' => true,
+            'visibility_required' => true,
+            'whitespace_after_comma_in_array' => true,
+    ));
diff --git a/.travis.yml b/.travis.yml
index 3508dca3..0ec84081 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,21 @@ php:
     - 5.5
     - 5.6
     - 7.0
-##    - hhvm
+    - 7.1
 
 matrix:
+    include:
+        - php: 5.6
+          env: COVERAGE=1
     allow_failures:
         - php: 7.0
-##        - php: hhvm
+        - php: 7.1
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+        - .php-cs.cache
 
 env:
     global:
@@ -25,6 +34,8 @@ before_install:
     - sudo apt-get install -y graphviz
 
 before_script:
+    ## Deactivate xdebug if we don't do code coverage
+    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
     ## Composer
     - composer self-update
     - composer install --prefer-source
@@ -34,19 +45,20 @@ before_script:
 
 script:
     ## PHP_CodeSniffer
-    - ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip ; fi
+    ## PHP-CS-Fixer
+    - if [ -n "$COVERAGE" ]; then ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run ; fi
     ## PHP Mess Detector
-    - ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit
-    - ./vendor/bin/phpunit -c ./ --coverage-text --coverage-html ./build/coverage
+    - ./vendor/bin/phpunit -c ./ $(if [ -n "$COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi)
     ## PHPLOC
-    - ./vendor/bin/phploc src/
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phploc src/ ; fi
     ## PHPDocumentor
-    - ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
+    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 
 after_script:
     ## PHPDocumentor
     - bash .travis_shell_after_success.sh
     ## Scrutinizer
-    - wget https://scrutinizer-ci.com/ocular.phar
-    - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+    - if [ -n "$COVERAGE" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
diff --git a/.travis_shell_after_success.sh b/.travis_shell_after_success.sh
index 35c7a338..12728526 100644
--- a/.travis_shell_after_success.sh
+++ b/.travis_shell_after_success.sh
@@ -5,7 +5,7 @@ echo "TRAVIS_REPO_SLUG: $TRAVIS_REPO_SLUG"
 echo "TRAVIS_PHP_VERSION: $TRAVIS_PHP_VERSION"
 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
 
-if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.5" ]; then
+if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then
 
   echo -e "Publishing PHPDoc...\n"
 
diff --git a/bootstrap.php b/bootstrap.php
index 11939fee..362e8b74 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/composer.json b/composer.json
index 9cc03123..ab8b6aa6 100644
--- a/composer.json
+++ b/composer.json
@@ -39,12 +39,14 @@
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*",
+        "phpunit/phpunit": "4.8.*",
         "phpdocumentor/phpdocumentor":"2.*",
-        "squizlabs/php_codesniffer": "1.*",
+        "twig/twig":"1.27",
+        "squizlabs/php_codesniffer": "^2.7",
+        "friendsofphp/php-cs-fixer": "^2.0",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.*",
-        "dompdf/dompdf":"0.6.*",
+        "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
         "mpdf/mpdf": "5.*"
     },
diff --git a/docs/elements.rst b/docs/elements.rst
index a35eb654..848e3f98 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -135,12 +135,12 @@ Text breaks are empty new lines. To add text breaks, use the following syntax. A
 Page breaks
 ~~~~~~~~~~~
 
-There are two ways to insert a page breaks, using the ``addPageBreak``
+There are two ways to insert a page break, using the ``addPageBreak``
 method or using the ``pageBreakBefore`` style of paragraph.
 
-:: code-block:: php
+.. code-block:: php
 
-    \\$section->addPageBreak();
+    $section->addPageBreak();
 
 Lists
 -----
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 00000000..6b81d69c
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+## PHP_CodeSniffer
+./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
+
+## PHP-CS-Fixer
+./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
+
+## PHP Mess Detector
+./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
+
+## PHPUnit
+./vendor/bin/phpunit -c ./ --no-coverage
+
diff --git a/samples/Sample_01_SimpleText.php b/samples/Sample_01_SimpleText.php
index fae6c210..5a3393b3 100644
--- a/samples/Sample_01_SimpleText.php
+++ b/samples/Sample_01_SimpleText.php
@@ -1,6 +1,6 @@
 <?php
-use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 
 include_once 'Sample_Header.php';
 
diff --git a/samples/Sample_02_TabStops.php b/samples/Sample_02_TabStops.php
index 17021987..4f588ee7 100644
--- a/samples/Sample_02_TabStops.php
+++ b/samples/Sample_02_TabStops.php
@@ -14,7 +14,7 @@ $phpWord->addParagraphStyle(
             new \PhpOffice\PhpWord\Style\Tab('left', 1550),
             new \PhpOffice\PhpWord\Style\Tab('center', 3200),
             new \PhpOffice\PhpWord\Style\Tab('right', 5300),
-        )
+        ),
     )
 );
 
diff --git a/samples/Sample_07_TemplateCloneRow.php b/samples/Sample_07_TemplateCloneRow.php
index 22a68537..e845362c 100644
--- a/samples/Sample_07_TemplateCloneRow.php
+++ b/samples/Sample_07_TemplateCloneRow.php
@@ -1,62 +1,62 @@
-<?php
-include_once 'Sample_Header.php';
-
-// Template processor instance creation
-echo date('H:i:s'), ' Creating new TemplateProcessor instance...', EOL;
-$templateProcessor = new \PhpOffice\PhpWord\TemplateProcessor('resources/Sample_07_TemplateCloneRow.docx');
-
-// Variables on different parts of document
-$templateProcessor->setValue('weekday', date('l'));            // On section/content
-$templateProcessor->setValue('time', date('H:i'));             // On footer
-$templateProcessor->setValue('serverName', realpath(__DIR__)); // On header
-
-// Simple table
-$templateProcessor->cloneRow('rowValue', 10);
-
-$templateProcessor->setValue('rowValue#1', 'Sun');
-$templateProcessor->setValue('rowValue#2', 'Mercury');
-$templateProcessor->setValue('rowValue#3', 'Venus');
-$templateProcessor->setValue('rowValue#4', 'Earth');
-$templateProcessor->setValue('rowValue#5', 'Mars');
-$templateProcessor->setValue('rowValue#6', 'Jupiter');
-$templateProcessor->setValue('rowValue#7', 'Saturn');
-$templateProcessor->setValue('rowValue#8', 'Uranus');
-$templateProcessor->setValue('rowValue#9', 'Neptun');
-$templateProcessor->setValue('rowValue#10', 'Pluto');
-
-$templateProcessor->setValue('rowNumber#1', '1');
-$templateProcessor->setValue('rowNumber#2', '2');
-$templateProcessor->setValue('rowNumber#3', '3');
-$templateProcessor->setValue('rowNumber#4', '4');
-$templateProcessor->setValue('rowNumber#5', '5');
-$templateProcessor->setValue('rowNumber#6', '6');
-$templateProcessor->setValue('rowNumber#7', '7');
-$templateProcessor->setValue('rowNumber#8', '8');
-$templateProcessor->setValue('rowNumber#9', '9');
-$templateProcessor->setValue('rowNumber#10', '10');
-
-// Table with a spanned cell
-$templateProcessor->cloneRow('userId', 3);
-
-$templateProcessor->setValue('userId#1', '1');
-$templateProcessor->setValue('userFirstName#1', 'James');
-$templateProcessor->setValue('userName#1', 'Taylor');
-$templateProcessor->setValue('userPhone#1', '+1 428 889 773');
-
-$templateProcessor->setValue('userId#2', '2');
-$templateProcessor->setValue('userFirstName#2', 'Robert');
-$templateProcessor->setValue('userName#2', 'Bell');
-$templateProcessor->setValue('userPhone#2', '+1 428 889 774');
-
-$templateProcessor->setValue('userId#3', '3');
-$templateProcessor->setValue('userFirstName#3', 'Michael');
-$templateProcessor->setValue('userName#3', 'Ray');
-$templateProcessor->setValue('userPhone#3', '+1 428 889 775');
-
-echo date('H:i:s'), ' Saving the result document...', EOL;
-$templateProcessor->saveAs('results/Sample_07_TemplateCloneRow.docx');
-
-echo getEndingNotes(array('Word2007' => 'docx'));
-if (!CLI) {
-    include_once 'Sample_Footer.php';
-}
+<?php
+include_once 'Sample_Header.php';
+
+// Template processor instance creation
+echo date('H:i:s'), ' Creating new TemplateProcessor instance...', EOL;
+$templateProcessor = new \PhpOffice\PhpWord\TemplateProcessor('resources/Sample_07_TemplateCloneRow.docx');
+
+// Variables on different parts of document
+$templateProcessor->setValue('weekday', date('l'));            // On section/content
+$templateProcessor->setValue('time', date('H:i'));             // On footer
+$templateProcessor->setValue('serverName', realpath(__DIR__)); // On header
+
+// Simple table
+$templateProcessor->cloneRow('rowValue', 10);
+
+$templateProcessor->setValue('rowValue#1', 'Sun');
+$templateProcessor->setValue('rowValue#2', 'Mercury');
+$templateProcessor->setValue('rowValue#3', 'Venus');
+$templateProcessor->setValue('rowValue#4', 'Earth');
+$templateProcessor->setValue('rowValue#5', 'Mars');
+$templateProcessor->setValue('rowValue#6', 'Jupiter');
+$templateProcessor->setValue('rowValue#7', 'Saturn');
+$templateProcessor->setValue('rowValue#8', 'Uranus');
+$templateProcessor->setValue('rowValue#9', 'Neptun');
+$templateProcessor->setValue('rowValue#10', 'Pluto');
+
+$templateProcessor->setValue('rowNumber#1', '1');
+$templateProcessor->setValue('rowNumber#2', '2');
+$templateProcessor->setValue('rowNumber#3', '3');
+$templateProcessor->setValue('rowNumber#4', '4');
+$templateProcessor->setValue('rowNumber#5', '5');
+$templateProcessor->setValue('rowNumber#6', '6');
+$templateProcessor->setValue('rowNumber#7', '7');
+$templateProcessor->setValue('rowNumber#8', '8');
+$templateProcessor->setValue('rowNumber#9', '9');
+$templateProcessor->setValue('rowNumber#10', '10');
+
+// Table with a spanned cell
+$templateProcessor->cloneRow('userId', 3);
+
+$templateProcessor->setValue('userId#1', '1');
+$templateProcessor->setValue('userFirstName#1', 'James');
+$templateProcessor->setValue('userName#1', 'Taylor');
+$templateProcessor->setValue('userPhone#1', '+1 428 889 773');
+
+$templateProcessor->setValue('userId#2', '2');
+$templateProcessor->setValue('userFirstName#2', 'Robert');
+$templateProcessor->setValue('userName#2', 'Bell');
+$templateProcessor->setValue('userPhone#2', '+1 428 889 774');
+
+$templateProcessor->setValue('userId#3', '3');
+$templateProcessor->setValue('userFirstName#3', 'Michael');
+$templateProcessor->setValue('userName#3', 'Ray');
+$templateProcessor->setValue('userPhone#3', '+1 428 889 775');
+
+echo date('H:i:s'), ' Saving the result document...', EOL;
+$templateProcessor->saveAs('results/Sample_07_TemplateCloneRow.docx');
+
+echo getEndingNotes(array('Word2007' => 'docx'));
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/samples/Sample_08_ParagraphPagination.php b/samples/Sample_08_ParagraphPagination.php
index f91b1c56..3c21b138 100644
--- a/samples/Sample_08_ParagraphPagination.php
+++ b/samples/Sample_08_ParagraphPagination.php
@@ -19,7 +19,7 @@ $section->addText(
     'Below are the samples on how to control your paragraph '
         . 'pagination. See "Line and Page Break" tab on paragraph properties '
         . 'window to see the attribute set by these controls.',
-    array('bold' => true),
+    array('bold'  => true),
     array('space' => array('before' => 360, 'after' => 480))
 );
 
diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index e3edc605..c4be7c9e 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -46,11 +46,11 @@ for ($i = 1; $i <= 8; $i++) {
     $table->addCell(2000)->addText("Cell {$i}");
     $table->addCell(2000)->addText("Cell {$i}");
     $table->addCell(2000)->addText("Cell {$i}");
-    $text = (0== $i % 2) ? 'X' : '';
+    $text = (0 == $i % 2) ? 'X' : '';
     $table->addCell(500)->addText($text);
 }
 
-/**
+/*
  *  3. colspan (gridSpan) and rowspan (vMerge)
  *  ---------------------
  *  |     |   B    |    |
@@ -93,7 +93,7 @@ $table->addCell(2000, $cellVCentered)->addText('C', null, $cellHCentered);
 $table->addCell(2000, $cellVCentered)->addText('D', null, $cellHCentered);
 $table->addCell(null, $cellRowContinue);
 
-/**
+/*
  *  4. colspan (gridSpan) and rowspan (vMerge)
  *  ---------------------
  *  |     |   B    |  1 |
@@ -104,6 +104,7 @@ $table->addCell(null, $cellRowContinue);
  *  ---------------------
  * @see https://github.com/PHPOffice/PHPWord/issues/806
  */
+
 $section->addPageBreak();
 $section->addText('Table with colspan and rowspan', $header);
 
@@ -114,12 +115,12 @@ $table = $section->addTable('Colspan Rowspan');
 $row = $table->addRow();
 
 $row->addCell(null, array('vMerge' => 'restart'))->addText('A');
-$row->addCell(null, array('gridSpan' => 2, 'vMerge' => 'restart',))->addText('B');
+$row->addCell(null, array('gridSpan' => 2, 'vMerge' => 'restart'))->addText('B');
 $row->addCell()->addText('1');
 
 $row = $table->addRow();
 $row->addCell(null, array('vMerge' => 'continue'));
-$row->addCell(null, array('vMerge' => 'continue','gridSpan' => 2,));
+$row->addCell(null, array('vMerge' => 'continue', 'gridSpan' => 2));
 $row->addCell()->addText('2');
 $row = $table->addRow();
 $row->addCell(null, array('vMerge' => 'continue'));
diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index 1e6943db..6c7033b0 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -23,7 +23,7 @@ $section->addImage($source);
 // Image from string
 $source = 'resources/_mars.jpg';
 $fileContent = file_get_contents($source);
-$section->addText("Image from string");
+$section->addText('Image from string');
 $section->addImage($fileContent);
 
 //Wrapping style
diff --git a/samples/Sample_37_Comments.php b/samples/Sample_37_Comments.php
index 670e914b..5c0e8abc 100644
--- a/samples/Sample_37_Comments.php
+++ b/samples/Sample_37_Comments.php
@@ -47,7 +47,7 @@ $image->setCommentRangeStart($commentOnImage);
 $section->addTextBreak(2);
 
 // We can also do things the other way round, link the comment to the element
-$anotherText = $section->addText("another text");
+$anotherText = $section->addText('another text');
 
 $comment1 = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
 $comment1->addText('Test', array('bold' => true));
@@ -55,7 +55,6 @@ $comment1->setStartElement($anotherText);
 $comment1->setEndElement($anotherText);
 $phpWord->addComment($comment1);
 
-
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index 90bdf4fa..1d6b14a1 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -89,8 +89,8 @@ function getEndingNotes($writers)
 
     // Do not show execution time for index
     if (!IS_INDEX) {
-        $result .= date('H:i:s') . " Done writing file(s)" . EOL;
-        $result .= date('H:i:s') . " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB" . EOL;
+        $result .= date('H:i:s') . ' Done writing file(s)' . EOL;
+        $result .= date('H:i:s') . ' Peak memory usage: ' . (memory_get_peak_usage(true) / 1024 / 1024) . ' MB' . EOL;
     }
 
     // Return
diff --git a/samples/index.php b/samples/index.php
index a65d8fd9..3dbc09ff 100644
--- a/samples/index.php
+++ b/samples/index.php
@@ -13,7 +13,7 @@ $requirements = array(
     'xsl'   => array('PHP extension XSL (optional)', extension_loaded('xsl')),
 );
 if (!CLI) {
-?>
+    ?>
 <div class="jumbotron">
 <p>Welcome to PHPWord, a library written in pure PHP that provides a set of classes to write to and read from different document file formats, i.e. Office Open XML (.docx), Open Document Format (.odt), and Rich Text Format (.rtf).</p>
 <p>&nbsp;</p>
@@ -25,14 +25,14 @@ if (!CLI) {
 <?php
 }
 if (!CLI) {
-    echo "<h3>Requirement check:</h3>";
-    echo "<ul>";
+    echo '<h3>Requirement check:</h3>';
+    echo '<ul>';
     foreach ($requirements as $key => $value) {
         list($label, $result) = $value;
         $status = $result ? 'passed' : 'failed';
         echo "<li>{$label} ... <span class='{$status}'>{$status}</span></li>";
     }
-    echo "</ul>";
+    echo '</ul>';
     include_once 'Sample_Footer.php';
 } else {
     echo 'Requirement check:' . PHP_EOL;
diff --git a/src/PhpWord/Collection/AbstractCollection.php b/src/PhpWord/Collection/AbstractCollection.php
index beff290e..61709a50 100644
--- a/src/PhpWord/Collection/AbstractCollection.php
+++ b/src/PhpWord/Collection/AbstractCollection.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -51,9 +51,9 @@ abstract class AbstractCollection
     {
         if (array_key_exists($index, $this->items)) {
             return $this->items[$index];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -61,7 +61,6 @@ abstract class AbstractCollection
      *
      * @param int $index
      * @param mixed $item
-     * @return void
      */
     public function setItem($index, $item)
     {
diff --git a/src/PhpWord/Collection/Bookmarks.php b/src/PhpWord/Collection/Bookmarks.php
index b263cda7..7210fb03 100644
--- a/src/PhpWord/Collection/Bookmarks.php
+++ b/src/PhpWord/Collection/Bookmarks.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Charts.php b/src/PhpWord/Collection/Charts.php
index 01f3f72e..56d92c94 100644
--- a/src/PhpWord/Collection/Charts.php
+++ b/src/PhpWord/Collection/Charts.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
index e0383814..f2fe82d9 100644
--- a/src/PhpWord/Collection/Comments.php
+++ b/src/PhpWord/Collection/Comments.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Endnotes.php b/src/PhpWord/Collection/Endnotes.php
index 083142ed..52a56d31 100644
--- a/src/PhpWord/Collection/Endnotes.php
+++ b/src/PhpWord/Collection/Endnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Footnotes.php b/src/PhpWord/Collection/Footnotes.php
index 0c094a53..63989f53 100644
--- a/src/PhpWord/Collection/Footnotes.php
+++ b/src/PhpWord/Collection/Footnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Titles.php b/src/PhpWord/Collection/Titles.php
index 80e2d9d7..9e4f12cd 100644
--- a/src/PhpWord/Collection/Titles.php
+++ b/src/PhpWord/Collection/Titles.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
index 0c1fb40e..8cb3a869 100644
--- a/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
@@ -25,7 +26,6 @@ use PhpOffice\PhpWord\SimpleType\NumberFormat;
  */
 final class FootnoteProperties
 {
-
     const RESTART_NUMBER_CONTINUOUS = 'continuous';
     const RESTART_NUMBER_EACH_SECTION = 'eachSect';
     const RESTART_NUMBER_EACH_PAGE = 'eachPage';
@@ -52,7 +52,7 @@ final class FootnoteProperties
     /**
      * Footnote and Endnote Numbering Starting Value
      *
-     * @var double
+     * @var float
      */
     private $numStart;
 
@@ -86,14 +86,15 @@ final class FootnoteProperties
             self::POSITION_PAGE_BOTTOM,
             self::POSITION_BENEATH_TEXT,
             self::POSITION_SECTION_END,
-            self::POSITION_DOC_END
+            self::POSITION_DOC_END,
         );
 
         if (in_array($pos, $position)) {
             $this->pos = $pos;
         } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $position) . " possible");
+            throw new \InvalidArgumentException('Invalid value, on of ' . implode(', ', $position) . ' possible');
         }
+
         return $this;
     }
 
@@ -117,13 +118,14 @@ final class FootnoteProperties
     {
         NumberFormat::validate($numFmt);
         $this->numFmt = $numFmt;
+
         return $this;
     }
 
     /**
      * Get the Footnote Numbering Format
      *
-     * @return double
+     * @return float
      */
     public function getNumStart()
     {
@@ -133,12 +135,13 @@ final class FootnoteProperties
     /**
      * Set the Footnote Numbering Format
      *
-     * @param double $numStart
+     * @param float $numStart
      * @return self
      */
     public function setNumStart($numStart)
     {
         $this->numStart = $numStart;
+
         return $this;
     }
 
@@ -164,14 +167,15 @@ final class FootnoteProperties
         $restartNumbers = array(
             self::RESTART_NUMBER_CONTINUOUS,
             self::RESTART_NUMBER_EACH_SECTION,
-            self::RESTART_NUMBER_EACH_PAGE
+            self::RESTART_NUMBER_EACH_PAGE,
         );
 
         if (in_array($numRestart, $restartNumbers)) {
-            $this->numRestart= $numRestart;
+            $this->numRestart = $numRestart;
         } else {
-            throw new \InvalidArgumentException("Invalid value, on of " . implode(', ', $restartNumbers) . " possible");
+            throw new \InvalidArgumentException('Invalid value, on of ' . implode(', ', $restartNumbers) . ' possible');
         }
+
         return $this;
     }
 }
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
index daa705dd..6a915da1 100644
--- a/src/PhpWord/ComplexType/ProofState.php
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
@@ -23,7 +24,6 @@ namespace PhpOffice\PhpWord\ComplexType;
  */
 final class ProofState
 {
-
     /**
      * Check Completed
      */
@@ -60,8 +60,9 @@ final class ProofState
         if ($spelling == self::CLEAN || $spelling == self::DIRTY) {
             $this->spelling = $spelling;
         } else {
-            throw new \InvalidArgumentException("Invalid value, dirty or clean possible");
+            throw new \InvalidArgumentException('Invalid value, dirty or clean possible');
         }
+
         return $this;
     }
 
@@ -87,8 +88,9 @@ final class ProofState
         if ($grammar == self::CLEAN || $grammar == self::DIRTY) {
             $this->grammar = $grammar;
         } else {
-            throw new \InvalidArgumentException("Invalid value, dirty or clean possible");
+            throw new \InvalidArgumentException('Invalid value, dirty or clean possible');
         }
+
         return $this;
     }
 
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
index 9c8948ae..3fc16298 100644
--- a/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
@@ -23,46 +24,45 @@ namespace PhpOffice\PhpWord\ComplexType;
  */
 final class TrackChangesView
 {
-
     /**
      * Display Visual Indicator Of Markup Area
      *
-     * @var boolean
+     * @var bool
      */
     private $markup;
 
     /**
      * Display Comments
      *
-     * @var boolean
+     * @var bool
      */
     private $comments;
 
     /**
      * Display Content Revisions
      *
-     * @var boolean
+     * @var bool
      */
     private $insDel;
 
     /**
      * Display Formatting Revisions
      *
-     * @var boolean
+     * @var bool
      */
     private $formatting;
 
     /**
      * Display Ink Annotations
      *
-     * @var boolean
+     * @var bool
      */
     private $inkAnnotations;
 
     /**
      * Get Display Visual Indicator Of Markup Area
      *
-     * @return boolean True if markup is shown
+     * @return bool True if markup is shown
      */
     public function hasMarkup()
     {
@@ -72,7 +72,7 @@ final class TrackChangesView
     /**
      * Set Display Visual Indicator Of Markup Area
      *
-     * @param boolean $markup
+     * @param bool $markup
      *            Set to true to show markup
      */
     public function setMarkup($markup)
@@ -83,7 +83,7 @@ final class TrackChangesView
     /**
      * Get Display Comments
      *
-     * @return boolean True if comments are shown
+     * @return bool True if comments are shown
      */
     public function hasComments()
     {
@@ -93,7 +93,7 @@ final class TrackChangesView
     /**
      * Set Display Comments
      *
-     * @param boolean $comments
+     * @param bool $comments
      *            Set to true to show comments
      */
     public function setComments($comments)
@@ -104,7 +104,7 @@ final class TrackChangesView
     /**
      * Get Display Content Revisions
      *
-     * @return boolean True if content revisions are shown
+     * @return bool True if content revisions are shown
      */
     public function hasInsDel()
     {
@@ -114,7 +114,7 @@ final class TrackChangesView
     /**
      * Set Display Content Revisions
      *
-     * @param boolean $insDel
+     * @param bool $insDel
      *            Set to true to show content revisions
      */
     public function setInsDel($insDel)
@@ -125,7 +125,7 @@ final class TrackChangesView
     /**
      * Get Display Formatting Revisions
      *
-     * @return boolean True if formatting revisions are shown
+     * @return bool True if formatting revisions are shown
      */
     public function hasFormatting()
     {
@@ -135,7 +135,7 @@ final class TrackChangesView
     /**
      * Set Display Formatting Revisions
      *
-     * @param boolean|null $formatting
+     * @param bool|null $formatting
      *            Set to true to show formatting revisions
      */
     public function setFormatting($formatting = null)
@@ -146,7 +146,7 @@ final class TrackChangesView
     /**
      * Get Display Ink Annotations
      *
-     * @return boolean True if ink annotations are shown
+     * @return bool True if ink annotations are shown
      */
     public function hasInkAnnotations()
     {
@@ -156,7 +156,7 @@ final class TrackChangesView
     /**
      * Set Display Ink Annotations
      *
-     * @param boolean $inkAnnotations
+     * @param bool $inkAnnotations
      *            Set to true to show ink annotations
      */
     public function setInkAnnotations($inkAnnotations)
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index d5b4cc62..75153499 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -37,7 +37,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method PageBreak addPageBreak()
  * @method Table addTable(mixed $style = null)
  * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
- * @method Object addObject(string $source, mixed $style = null)
+ * @method \PhpOffice\PhpWord\Element\Object addObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
  * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
  * @method Line addLine(mixed $lineStyle = null)
@@ -83,7 +83,7 @@ abstract class AbstractContainer extends AbstractElement
             'ListItem', 'ListItemRun', 'Table', 'Image', 'Object',
             'Footnote', 'Endnote', 'CheckBox', 'TextBox', 'Field',
             'Line', 'Shape', 'Title', 'TOC', 'PageBreak',
-            'Chart', 'FormField', 'SDT', 'Comment'
+            'Chart', 'FormField', 'SDT', 'Comment',
         );
         $functions = array();
         foreach ($elements as $element) {
@@ -105,9 +105,8 @@ abstract class AbstractContainer extends AbstractElement
                 for ($i = 1; $i <= $count; $i++) {
                     $this->addElement($element, $fontStyle, $paragraphStyle);
                 }
-
-            // All other elements
             } else {
+                // All other elements
                 array_unshift($args, $element); // Prepend element name to the beginning of args array
                 return call_user_func_array(array($this, 'addElement'), $args);
             }
@@ -181,9 +180,8 @@ abstract class AbstractContainer extends AbstractElement
      *
      * @param string $method
      *
-     * @return bool
-     *
      * @throws \BadMethodCallException
+     * @return bool
      */
     private function checkValidity($method)
     {
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 4ff4978a..81e18528 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -73,7 +73,7 @@ abstract class AbstractElement
     /**
      * Unique Id for element
      *
-     * @var int
+     * @var string
      */
     protected $elementId;
 
@@ -142,7 +142,6 @@ abstract class AbstractElement
      * Set PhpWord as reference.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function setPhpWord(PhpWord $phpWord = null)
     {
@@ -164,7 +163,6 @@ abstract class AbstractElement
      *
      * @param string $docPart
      * @param int $docPartId
-     * @return void
      */
     public function setDocPart($docPart, $docPartId = 1)
     {
@@ -221,7 +219,6 @@ abstract class AbstractElement
      * Set element index.
      *
      * @param int $value
-     * @return void
      */
     public function setElementIndex($value)
     {
@@ -231,7 +228,7 @@ abstract class AbstractElement
     /**
      * Get element unique ID
      *
-     * @return integer
+     * @return int
      */
     public function getElementId()
     {
@@ -240,8 +237,6 @@ abstract class AbstractElement
 
     /**
      * Set element unique ID from 6 first digit of md5.
-     *
-     * @return void
      */
     public function setElementId()
     {
@@ -262,7 +257,6 @@ abstract class AbstractElement
      * Set relation Id.
      *
      * @param int $value
-     * @return void
      */
     public function setRelationId($value)
     {
@@ -297,9 +291,9 @@ abstract class AbstractElement
     public function setCommentRangeStart(Comment $value)
     {
         if ($this instanceof Comment) {
-            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+            throw new \InvalidArgumentException('Cannot set a Comment on a Comment');
         }
-        $this->commentRangeStart= $value;
+        $this->commentRangeStart = $value;
         $this->commentRangeStart->setStartElement($this);
     }
 
@@ -317,14 +311,13 @@ abstract class AbstractElement
      * Set comment end
      *
      * @param Comment $value
-     * @return void
      */
     public function setCommentRangeEnd(Comment $value)
     {
         if ($this instanceof Comment) {
-            throw new \InvalidArgumentException("Cannot set a Comment on a Comment");
+            throw new \InvalidArgumentException('Cannot set a Comment on a Comment');
         }
-        $this->commentRangeEnd= $value;
+        $this->commentRangeEnd = $value;
         $this->commentRangeEnd->setEndElement($this);
     }
 
@@ -334,7 +327,6 @@ abstract class AbstractElement
      * Passed parameter should be a container, except for Table (contain Row) and Row (contain Cell)
      *
      * @param \PhpOffice\PhpWord\Element\AbstractElement $container
-     * @return void
      */
     public function setParentContainer(AbstractElement $container)
     {
@@ -363,8 +355,6 @@ abstract class AbstractElement
      *
      * - Image element needs to be passed to Media object
      * - Icon needs to be set for Object element
-     *
-     * @return void
      */
     private function setMediaRelation()
     {
@@ -391,8 +381,6 @@ abstract class AbstractElement
 
     /**
      * Set relation Id for elements that will be registered in the Collection subnamespaces.
-     *
-     * @return void
      */
     private function setCollectionRelation()
     {
@@ -411,7 +399,7 @@ abstract class AbstractElement
      */
     public function isInSection()
     {
-        return ($this->docPart == 'Section');
+        return $this->docPart == 'Section';
     }
 
     /**
@@ -441,9 +429,8 @@ abstract class AbstractElement
      * @param array $enum
      * @param mixed $default
      *
-     * @return mixed
-     *
      * @throws \InvalidArgumentException
+     * @return mixed
      *
      * @todo Merge with the same method in AbstractStyle
      */
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index 4df06afb..2eceb5ed 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Cell.php b/src/PhpWord/Element/Cell.php
index 28e517fd..b5250cd6 100644
--- a/src/PhpWord/Element/Cell.php
+++ b/src/PhpWord/Element/Cell.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Chart.php b/src/PhpWord/Element/Chart.php
index f98c1d74..c340da40 100644
--- a/src/PhpWord/Element/Chart.php
+++ b/src/PhpWord/Element/Chart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -83,7 +83,6 @@ class Chart extends AbstractElement
      * Set type.
      *
      * @param string $value
-     * @return void
      */
     public function setType($value)
     {
@@ -96,7 +95,6 @@ class Chart extends AbstractElement
      *
      * @param array $categories
      * @param array $values
-     * @return void
      */
     public function addSeries($categories, $values)
     {
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
index b049c7f1..e0a94fdf 100644
--- a/src/PhpWord/Element/CheckBox.php
+++ b/src/PhpWord/Element/CheckBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 5e0ebe63..a8f39748 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php
index 2d8e4731..6565c039 100644
--- a/src/PhpWord/Element/Endnote.php
+++ b/src/PhpWord/Element/Endnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 380d7a92..726938b5 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Element;
  * Field element
  *
  * @since 0.11.0
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_SimpleField.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_SimpleField.html
  */
 class Field extends AbstractElement
 {
@@ -32,36 +32,36 @@ class Field extends AbstractElement
      * @var array
      */
     protected $fieldsArray = array(
-        'PAGE'=>array(
-           'properties'=>array(
+        'PAGE' => array(
+           'properties' => array(
                'format' => array('Arabic', 'ArabicDash', 'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN'),
            ),
-           'options'=>array('PreserveFormat')
+           'options' => array('PreserveFormat'),
         ),
-        'NUMPAGES'=>array(
-           'properties'=>array(
+        'NUMPAGES' => array(
+           'properties' => array(
                'format' => array('Arabic', 'ArabicDash', 'CardText', 'DollarText', 'Ordinal', 'OrdText',
-                   'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper'),
-               'numformat' => array('0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%')
+                   'alphabetic', 'ALPHABETIC', 'roman', 'ROMAN', 'Caps', 'FirstCap', 'Lower', 'Upper', ),
+               'numformat' => array('0', '0,00', '#.##0', '#.##0,00', '€ #.##0,00(€ #.##0,00)', '0%', '0,00%'),
            ),
-           'options'=>array('PreserveFormat')
+           'options' => array('PreserveFormat'),
         ),
-        'DATE'=>array(
-            'properties'=> array(
-               'dateformat' =>array('d-M-yyyy', 'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-M-yy', 'yyyy-MM-dd',
+        'DATE' => array(
+            'properties' => array(
+               'dateformat' => array('d-M-yyyy', 'dddd d MMMM yyyy', 'd MMMM yyyy', 'd-M-yy', 'yyyy-MM-dd',
                     'd-MMM-yy', 'd/M/yyyy', 'd MMM. yy', 'd/M/yy', 'MMM-yy', 'd-M-yyy H:mm', 'd-M-yyyy H:mm:ss',
-                    'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss')
+                    'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss', ),
             ),
-            'options'=>array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat')
+            'options' => array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat'),
         ),
-        'XE'=>array(
+        'XE' => array(
             'properties' => array(),
-            'options' => array('Bold', 'Italic')
+            'options'    => array('Bold', 'Italic'),
         ),
-        'INDEX'=>array(
+        'INDEX' => array(
             'properties' => array(),
-            'options' => array('PreserveFormat')
-        )
+            'options'    => array('PreserveFormat'),
+        ),
     );
 
     /**
@@ -113,9 +113,8 @@ class Field extends AbstractElement
      *
      * @param string $type
      *
-     * @return string
-     *
      * @throws \InvalidArgumentException
+     * @return string
      */
     public function setType($type = null)
     {
@@ -126,6 +125,7 @@ class Field extends AbstractElement
                 throw new \InvalidArgumentException("Invalid type '$type'");
             }
         }
+
         return $this->type;
     }
 
@@ -144,9 +144,8 @@ class Field extends AbstractElement
      *
      * @param array $properties
      *
-     * @return self
-     *
      * @throws \InvalidArgumentException
+     * @return self
      */
     public function setProperties($properties = array())
     {
@@ -158,6 +157,7 @@ class Field extends AbstractElement
             }
             $this->properties = array_merge($this->properties, $properties);
         }
+
         return $this->properties;
     }
 
@@ -176,9 +176,8 @@ class Field extends AbstractElement
      *
      * @param array $options
      *
-     * @return self
-     *
      * @throws \InvalidArgumentException
+     * @return self
      */
     public function setOptions($options = array())
     {
@@ -190,6 +189,7 @@ class Field extends AbstractElement
             }
             $this->options = array_merge($this->options, $options);
         }
+
         return $this->options;
     }
 
@@ -208,9 +208,8 @@ class Field extends AbstractElement
      *
      * @param string | TextRun $text
      *
-     * @return string | TextRun
-     * 
      * @throws \InvalidArgumentException
+     * @return string | TextRun
      */
     public function setText($text)
     {
@@ -218,9 +217,10 @@ class Field extends AbstractElement
             if (is_string($text) || $text instanceof TextRun) {
                 $this->text = $text;
             } else {
-                throw new \InvalidArgumentException("Invalid text");
+                throw new \InvalidArgumentException('Invalid text');
             }
         }
+
         return $this->text;
     }
 
diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php
index b3196f3f..08ff525a 100644
--- a/src/PhpWord/Element/Footer.php
+++ b/src/PhpWord/Element/Footer.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,11 +26,11 @@ class Footer extends AbstractContainer
      * Header/footer types constants
      *
      * @var string
-     * @link http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
+     * @see  http://www.datypic.com/sc/ooxml/t-w_ST_HdrFtr.html Header or Footer Type
      */
-    const AUTO  = 'default';  // default and odd pages
+    const AUTO = 'default';  // default and odd pages
     const FIRST = 'first';
-    const EVEN  = 'even';
+    const EVEN = 'even';
 
     /**
      * @var string Container type
@@ -64,7 +64,6 @@ class Footer extends AbstractContainer
      * @since 0.10.0
      *
      * @param string $value
-     * @return void
      */
     public function setType($value = self::AUTO)
     {
diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php
index 73350bb7..9acdc4c3 100644
--- a/src/PhpWord/Element/Footnote.php
+++ b/src/PhpWord/Element/Footnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index 414714a8..1e3e182c 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Element;
  * Form field element
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
  */
 class FormField extends Text
 {
diff --git a/src/PhpWord/Element/Header.php b/src/PhpWord/Element/Header.php
index d4afdb86..ee820877 100644
--- a/src/PhpWord/Element/Header.php
+++ b/src/PhpWord/Element/Header.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 1c8c520d..c9620b6b 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -61,7 +61,7 @@ class Image extends AbstractElement
     /**
      * Is watermark
      *
-     * @var boolean
+     * @var bool
      */
     private $watermark;
 
@@ -96,7 +96,7 @@ class Image extends AbstractElement
     /**
      * Is memory image
      *
-     * @var boolean
+     * @var bool
      */
     private $memoryImage;
 
@@ -110,7 +110,7 @@ class Image extends AbstractElement
     /**
      * Image media index
      *
-     * @var integer
+     * @var int
      */
     private $mediaIndex;
 
@@ -126,7 +126,7 @@ class Image extends AbstractElement
      *
      * @param string $source
      * @param mixed $style
-     * @param boolean $watermark
+     * @param bool $watermark
      *
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
@@ -183,7 +183,7 @@ class Image extends AbstractElement
     /**
      * Get is watermark
      *
-     * @return boolean
+     * @return bool
      */
     public function isWatermark()
     {
@@ -193,7 +193,7 @@ class Image extends AbstractElement
     /**
      * Set is watermark
      *
-     * @param boolean $value
+     * @param bool $value
      */
     public function setIsWatermark($value)
     {
@@ -243,7 +243,7 @@ class Image extends AbstractElement
     /**
      * Get is memory image
      *
-     * @return boolean
+     * @return bool
      */
     public function isMemImage()
     {
@@ -264,7 +264,6 @@ class Image extends AbstractElement
      * Set target file name.
      *
      * @param string $value
-     * @return void
      */
     public function setTarget($value)
     {
@@ -274,7 +273,7 @@ class Image extends AbstractElement
     /**
      * Get media index
      *
-     * @return integer
+     * @return int
      */
     public function getMediaIndex()
     {
@@ -284,8 +283,7 @@ class Image extends AbstractElement
     /**
      * Set media index.
      *
-     * @param integer $value
-     * @return void
+     * @param int $value
      */
     public function setMediaIndex($value)
     {
@@ -368,8 +366,6 @@ class Image extends AbstractElement
     /**
      * Check memory image, supported type, image functions, and proportional width/height.
      *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
@@ -380,7 +376,7 @@ class Image extends AbstractElement
         // Check image data
         if ($this->sourceType == self::SOURCE_ARCHIVE) {
             $imageData = $this->getArchiveImageSize($this->source);
-        } else if ($this->sourceType == self::SOURCE_STRING) {
+        } elseif ($this->sourceType == self::SOURCE_STRING) {
             $imageData = $this->getStringImageSize($this->source);
         } else {
             $imageData = @getimagesize($this->source);
@@ -407,8 +403,6 @@ class Image extends AbstractElement
 
     /**
      * Set source type.
-     *
-     * @return void
      */
     private function setSourceType()
     {
@@ -443,9 +437,9 @@ class Image extends AbstractElement
      *
      * @param string $source
      *
-     * @return array|null
-     *
      * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
+     *
+     * @return array|null
      */
     private function getArchiveImageSize($source)
     {
@@ -483,19 +477,19 @@ class Image extends AbstractElement
      */
     private function getStringImageSize($source)
     {
+        $result = false;
         if (!function_exists('getimagesizefromstring')) {
-            $uri = 'data://application/octet-stream;base64,'  . base64_encode($source);
-            return @getimagesize($uri);
+            $uri = 'data://application/octet-stream;base64,' . base64_encode($source);
+            $result = @getimagesize($uri);
         } else {
-            return @getimagesizefromstring($source);
+            $result = @getimagesizefromstring($source);
         }
-        return false;
+
+        return $result;
     }
 
     /**
      * Set image functions and extensions.
-     *
-     * @return void
      */
     private function setFunctions()
     {
@@ -530,9 +524,8 @@ class Image extends AbstractElement
     /**
      * Set proportional width/height if one dimension not available.
      *
-     * @param integer $actualWidth
-     * @param integer $actualHeight
-     * @return void
+     * @param int $actualWidth
+     * @param int $actualHeight
      */
     private function setProportionalSize($actualWidth, $actualHeight)
     {
diff --git a/src/PhpWord/Element/Line.php b/src/PhpWord/Element/Line.php
index 3e94a3a6..eba66473 100644
--- a/src/PhpWord/Element/Line.php
+++ b/src/PhpWord/Element/Line.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Link.php b/src/PhpWord/Element/Link.php
index 6641b46d..4637120a 100644
--- a/src/PhpWord/Element/Link.php
+++ b/src/PhpWord/Element/Link.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -75,6 +75,7 @@ class Link extends AbstractElement
      * @param string $text
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
+     * @param bool $internal
      */
     public function __construct($source, $text = null, $fontStyle = null, $paragraphStyle = null, $internal = false)
     {
diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php
index 25ace090..7f665b1b 100644
--- a/src/PhpWord/Element/ListItem.php
+++ b/src/PhpWord/Element/ListItem.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
index 53440db6..5286f662 100644
--- a/src/PhpWord/Element/ListItemRun.php
+++ b/src/PhpWord/Element/ListItemRun.php
@@ -10,8 +10,8 @@
 * file that was distributed with this source code. For the full list of
 * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
 *
-* @link        https://github.com/PHPOffice/PHPWord
-* @copyright   2010-2016 PHPWord contributors
+* @see         https://github.com/PHPOffice/PHPWord
+* @copyright   2010-2017 PHPWord contributors
 * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
 
@@ -74,10 +74,10 @@ class ListItemRun extends TextRun
         return $this->style;
     }
 
-     /**
+    /**
      * Get ListItem depth.
-      *
-      * @return int
+     *
+     * @return int
      */
     public function getDepth()
     {
diff --git a/src/PhpWord/Element/Object.php b/src/PhpWord/Element/Object.php
index 7285030c..8fe83224 100644
--- a/src/PhpWord/Element/Object.php
+++ b/src/PhpWord/Element/Object.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -84,9 +84,9 @@ class Object extends AbstractElement
             $this->icon = realpath(__DIR__ . "/../resources/{$ext}.png");
 
             return $this;
-        } else {
-            throw new InvalidObjectException();
         }
+
+        throw new InvalidObjectException();
     }
 
     /**
@@ -133,7 +133,6 @@ class Object extends AbstractElement
      * Set Image Relation ID.
      *
      * @param int $rId
-     * @return void
      */
     public function setImageRelationId($rId)
     {
diff --git a/src/PhpWord/Element/PageBreak.php b/src/PhpWord/Element/PageBreak.php
index d9d4bc64..e41e807b 100644
--- a/src/PhpWord/Element/PageBreak.php
+++ b/src/PhpWord/Element/PageBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index 813c1396..ad20d7a3 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -47,7 +47,6 @@ class PreserveText extends AbstractElement
      */
     private $paragraphStyle;
 
-
     /**
      * Create a new Preserve Text Element
      *
diff --git a/src/PhpWord/Element/Row.php b/src/PhpWord/Element/Row.php
index 05fde7e4..2e89b354 100644
--- a/src/PhpWord/Element/Row.php
+++ b/src/PhpWord/Element/Row.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index b0c68b0f..88ee7238 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index e9beffcf..ffc98435 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -73,7 +73,6 @@ class Section extends AbstractContainer
      * Set section style.
      *
      * @param array $style
-     * @return void
      */
     public function setStyle($style = null)
     {
@@ -172,7 +171,7 @@ class Section extends AbstractContainer
      * If any of the Header instances have a type of Header::FIRST then this method returns true.
      * False otherwise.
      *
-     * @return boolean
+     * @return bool
      */
     public function hasDifferentFirstPage()
     {
@@ -186,6 +185,7 @@ class Section extends AbstractContainer
                 return true;
             }
         }
+
         return false;
     }
 
@@ -195,11 +195,11 @@ class Section extends AbstractContainer
      * @since 0.10.0
      *
      * @param string $type
-     * @param boolean $header
-     *
-     * @return Header|Footer
+     * @param bool $header
      *
      * @throws \Exception
+     *
+     * @return Header|Footer
      */
     private function addHeaderFooter($type = Header::AUTO, $header = true)
     {
@@ -215,10 +215,10 @@ class Section extends AbstractContainer
             $container->setPhpWord($this->phpWord);
 
             $collection[$index] = $container;
+
             return $container;
-        } else {
-            throw new \Exception('Invalid header/footer type.');
         }
+        throw new \Exception('Invalid header/footer type.');
     }
 
     /**
@@ -290,8 +290,8 @@ class Section extends AbstractContainer
     {
         if (empty($this->footers)) {
             return null;
-        } else {
-            return $this->footers[1];
         }
+
+        return $this->footers[1];
     }
 }
diff --git a/src/PhpWord/Element/Shape.php b/src/PhpWord/Element/Shape.php
index 4717afb8..b553a4ac 100644
--- a/src/PhpWord/Element/Shape.php
+++ b/src/PhpWord/Element/Shape.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TOC.php b/src/PhpWord/Element/TOC.php
index d3ab2be1..e3ca0a08 100644
--- a/src/PhpWord/Element/TOC.php
+++ b/src/PhpWord/Element/TOC.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -54,14 +54,13 @@ class TOC extends AbstractElement
      */
     private $maxDepth = 9;
 
-
     /**
      * Create a new Table-of-Contents Element
      *
      * @param mixed $fontStyle
      * @param array $tocStyle
-     * @param integer $minDepth
-     * @param integer $maxDepth
+     * @param int $minDepth
+     * @param int $maxDepth
      */
     public function __construct($fontStyle = null, $tocStyle = null, $minDepth = 1, $maxDepth = 9)
     {
@@ -132,7 +131,6 @@ class TOC extends AbstractElement
      * Set max depth.
      *
      * @param int $value
-     * @return void
      */
     public function setMaxDepth($value)
     {
@@ -153,7 +151,6 @@ class TOC extends AbstractElement
      * Set min depth.
      *
      * @param int $value
-     * @return void
      */
     public function setMinDepth($value)
     {
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 357af37a..3a045031 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -121,7 +121,6 @@ class Table extends AbstractElement
      * Set table width.
      *
      * @param int $width
-     * @return void
      */
     public function setWidth($width)
     {
diff --git a/src/PhpWord/Element/Text.php b/src/PhpWord/Element/Text.php
index 0de9cdea..4de12176 100644
--- a/src/PhpWord/Element/Text.php
+++ b/src/PhpWord/Element/Text.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -105,12 +105,12 @@ class Text extends AbstractElement
     public function setParagraphStyle($style = null)
     {
         if (is_array($style)) {
-            $this->paragraphStyle = new Paragraph;
+            $this->paragraphStyle = new Paragraph();
             $this->paragraphStyle->setStyleByArray($style);
         } elseif ($style instanceof Paragraph) {
             $this->paragraphStyle = $style;
         } elseif (null === $style) {
-            $this->paragraphStyle = new Paragraph;
+            $this->paragraphStyle = new Paragraph();
         } else {
             $this->paragraphStyle = $style;
         }
diff --git a/src/PhpWord/Element/TextBox.php b/src/PhpWord/Element/TextBox.php
index 4a1e5131..8058d0c9 100644
--- a/src/PhpWord/Element/TextBox.php
+++ b/src/PhpWord/Element/TextBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TextBreak.php b/src/PhpWord/Element/TextBreak.php
index 893fa875..4cf65f35 100644
--- a/src/PhpWord/Element/TextBreak.php
+++ b/src/PhpWord/Element/TextBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -74,6 +74,7 @@ class TextBreak extends AbstractElement
             $this->fontStyle = $style;
             $this->setParagraphStyle($paragraphStyle);
         }
+
         return $this->fontStyle;
     }
 
@@ -96,13 +97,14 @@ class TextBreak extends AbstractElement
     public function setParagraphStyle($style = null)
     {
         if (is_array($style)) {
-            $this->paragraphStyle = new Paragraph;
+            $this->paragraphStyle = new Paragraph();
             $this->paragraphStyle->setStyleByArray($style);
         } elseif ($style instanceof Paragraph) {
             $this->paragraphStyle = $style;
         } else {
             $this->paragraphStyle = $style;
         }
+
         return $this->paragraphStyle;
     }
 
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
index c2ce4f99..d8a898b4 100644
--- a/src/PhpWord/Element/TextRun.php
+++ b/src/PhpWord/Element/TextRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index eabb1feb..808af55e 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -83,7 +83,7 @@ class Title extends AbstractElement
     /**
      * Get depth
      *
-     * @return integer
+     * @return int
      */
     public function getDepth()
     {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 1df7148d..11cc763a 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -49,9 +49,9 @@ class TrackChange extends AbstractContainer
      */
     public function __construct($author, \DateTime $date)
     {
-
         $this->author = $author;
         $this->date = $date;
+
         return $this;
     }
 
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index 8ce4e301..8207e2c6 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
index 71cf36b4..1ef35c1b 100644
--- a/src/PhpWord/Escaper/EscaperInterface.php
+++ b/src/PhpWord/Escaper/EscaperInterface.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
index dfcfb1e1..2f4e12ec 100644
--- a/src/PhpWord/Escaper/RegExp.php
+++ b/src/PhpWord/Escaper/RegExp.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
index ec24c0af..35f91ada 100644
--- a/src/PhpWord/Escaper/Rtf.php
+++ b/src/PhpWord/Escaper/Rtf.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,9 +28,9 @@ class Rtf extends AbstractEscaper
     {
         if (20 > $code || $code >= 80) {
             return '{\u' . $code . '}';
-        } else {
-            return chr($code);
         }
+
+        return chr($code);
     }
 
     protected function escapeMultibyteCharacter($code)
@@ -40,6 +40,7 @@ class Rtf extends AbstractEscaper
 
     /**
      * @see http://www.randomchaos.com/documents/?source=php_and_unicode
+     * @param string $input
      */
     protected function escapeSingleValue($input)
     {
@@ -57,9 +58,9 @@ class Rtf extends AbstractEscaper
                 if (0 == count($bytes)) {
                     if ($asciiCode < 224) {
                         $numberOfBytes = 2;
-                    } else if ($asciiCode < 240) {
+                    } elseif ($asciiCode < 240) {
                         $numberOfBytes = 3;
-                    } else if ($asciiCode < 248) {
+                    } elseif ($asciiCode < 248) {
                         $numberOfBytes = 4;
                     }
                 }
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
index 3a0981aa..81cedaa9 100644
--- a/src/PhpWord/Escaper/Xml.php
+++ b/src/PhpWord/Escaper/Xml.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/CopyFileException.php b/src/PhpWord/Exception/CopyFileException.php
index c172657f..a5c1da6a 100644
--- a/src/PhpWord/Exception/CopyFileException.php
+++ b/src/PhpWord/Exception/CopyFileException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,10 +23,10 @@ namespace PhpOffice\PhpWord\Exception;
 final class CopyFileException extends Exception
 {
     /**
-     * @param string $source The fully qualified source file name.
-     * @param string $destination The fully qualified destination file name.
-     * @param integer $code The user defined exception code.
-     * @param \Exception $previous The previous exception used for the exception chaining.
+     * @param string $source The fully qualified source file name
+     * @param string $destination The fully qualified destination file name
+     * @param int $code The user defined exception code
+     * @param \Exception $previous The previous exception used for the exception chaining
      */
     final public function __construct($source, $destination, $code = 0, \Exception $previous = null)
     {
diff --git a/src/PhpWord/Exception/CreateTemporaryFileException.php b/src/PhpWord/Exception/CreateTemporaryFileException.php
index 67d969ba..fafc8dac 100644
--- a/src/PhpWord/Exception/CreateTemporaryFileException.php
+++ b/src/PhpWord/Exception/CreateTemporaryFileException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,8 +23,8 @@ namespace PhpOffice\PhpWord\Exception;
 final class CreateTemporaryFileException extends Exception
 {
     /**
-     * @param integer $code The user defined exception code.
-     * @param \Exception $previous The previous exception used for the exception chaining.
+     * @param int $code The user defined exception code
+     * @param \Exception $previous The previous exception used for the exception chaining
      */
     final public function __construct($code = 0, \Exception $previous = null)
     {
diff --git a/src/PhpWord/Exception/Exception.php b/src/PhpWord/Exception/Exception.php
index a9c49f7f..b94ed1be 100644
--- a/src/PhpWord/Exception/Exception.php
+++ b/src/PhpWord/Exception/Exception.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidImageException.php b/src/PhpWord/Exception/InvalidImageException.php
index 21c885ee..0a7b8fed 100644
--- a/src/PhpWord/Exception/InvalidImageException.php
+++ b/src/PhpWord/Exception/InvalidImageException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidObjectException.php b/src/PhpWord/Exception/InvalidObjectException.php
index ad564d47..54015506 100644
--- a/src/PhpWord/Exception/InvalidObjectException.php
+++ b/src/PhpWord/Exception/InvalidObjectException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidStyleException.php b/src/PhpWord/Exception/InvalidStyleException.php
index 44980842..e697f6cf 100644
--- a/src/PhpWord/Exception/InvalidStyleException.php
+++ b/src/PhpWord/Exception/InvalidStyleException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/UnsupportedImageTypeException.php b/src/PhpWord/Exception/UnsupportedImageTypeException.php
index 1b09bc8f..73b41d04 100644
--- a/src/PhpWord/Exception/UnsupportedImageTypeException.php
+++ b/src/PhpWord/Exception/UnsupportedImageTypeException.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/IOFactory.php b/src/PhpWord/IOFactory.php
index c868841a..eed1f163 100644
--- a/src/PhpWord/IOFactory.php
+++ b/src/PhpWord/IOFactory.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,9 +29,9 @@ abstract class IOFactory
      * @param PhpWord $phpWord
      * @param string $name
      *
-     * @return WriterInterface
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return WriterInterface
      */
     public static function createWriter(PhpWord $phpWord, $name = 'Word2007')
     {
@@ -49,9 +49,9 @@ abstract class IOFactory
      *
      * @param string $name
      *
-     * @return ReaderInterface
-     *
      * @throws Exception
+     *
+     * @return ReaderInterface
      */
     public static function createReader($name = 'Word2007')
     {
@@ -65,19 +65,19 @@ abstract class IOFactory
      * @param string $name
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
      *
-     * @return \PhpOffice\PhpWord\Writer\WriterInterface|\PhpOffice\PhpWord\Reader\ReaderInterface
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return \PhpOffice\PhpWord\Writer\WriterInterface|\PhpOffice\PhpWord\Reader\ReaderInterface
      */
     private static function createObject($type, $name, $phpWord = null)
     {
         $class = "PhpOffice\\PhpWord\\{$type}\\{$name}";
         if (class_exists($class) && self::isConcreteClass($class)) {
             return new $class($phpWord);
-        } else {
-            throw new Exception("\"{$name}\" is not a valid {$type}.");
         }
+        throw new Exception("\"{$name}\" is not a valid {$type}.");
     }
+
     /**
      * Loads PhpWord from file
      *
@@ -89,8 +89,10 @@ abstract class IOFactory
     {
         /** @var \PhpOffice\PhpWord\Reader\ReaderInterface $reader */
         $reader = self::createReader($readerName);
+
         return $reader->load($filename);
     }
+
     /**
      * Check if it's a concrete class (not abstract nor interface)
      *
@@ -100,6 +102,7 @@ abstract class IOFactory
     private static function isConcreteClass($class)
     {
         $reflection = new \ReflectionClass($class);
+
         return !$reflection->isAbstract() && !$reflection->isInterface();
     }
 }
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
index df337854..d9879010 100644
--- a/src/PhpWord/Media.php
+++ b/src/PhpWord/Media.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -43,9 +43,9 @@ class Media
      * @param string $source
      * @param \PhpOffice\PhpWord\Element\Image $image
      *
-     * @return integer
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return int
      */
     public static function addElement($container, $mediaType, $source, Image $image = null)
     {
@@ -83,12 +83,10 @@ class Media
                     $image->setTarget($target);
                     $image->setMediaIndex($mediaTypeCount);
                     break;
-
                 // Objects
                 case 'object':
                     $target = "{$container}_oleObject{$mediaTypeCount}.bin";
                     break;
-
                 // Links
                 case 'link':
                     $target = $source;
@@ -100,15 +98,17 @@ class Media
             $mediaData['type'] = $mediaType;
             $mediaData['rID'] = $rId;
             self::$elements[$container][$mediaId] = $mediaData;
+
             return $rId;
-        } else {
-            $mediaData = self::$elements[$container][$mediaId];
-            if (!is_null($image)) {
-                $image->setTarget($mediaData['target']);
-                $image->setMediaIndex($mediaData['mediaIndex']);
-            }
-            return $mediaData['rID'];
         }
+
+        $mediaData = self::$elements[$container][$mediaId];
+        if (!is_null($image)) {
+            $image->setTarget($mediaData['target']);
+            $image->setMediaIndex($mediaData['mediaIndex']);
+        }
+
+        return $mediaData['rID'];
     }
 
     /**
@@ -116,7 +116,7 @@ class Media
      *
      * @param string $container section|headerx|footerx|footnote|endnote
      * @param string $mediaType image|object|link
-     * @return integer
+     * @return int
      * @since 0.10.0
      */
     public static function countElements($container, $mediaType = null)
@@ -157,13 +157,15 @@ class Media
                     $elements[$key] = $val;
                 }
             }
+
             return $elements;
-        } else {
-            if (!isset(self::$elements[$container])) {
-                return $elements;
-            }
-            return self::getElementsByType($container, $type);
         }
+
+        if (!isset(self::$elements[$container])) {
+            return $elements;
+        }
+
+        return self::getElementsByType($container, $type);
     }
 
     /**
@@ -208,7 +210,7 @@ class Media
      * @param  string $type
      * @param  \PhpOffice\PhpWord\Element\Image $image
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -224,7 +226,7 @@ class Media
      *
      * @param string $linkSrc
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -256,7 +258,7 @@ class Media
      *
      * @param string $key
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -270,11 +272,11 @@ class Media
      *
      * @deprecated 0.10.0
      *
-     * @param  integer $headerCount
+     * @param  int $headerCount
      * @param  string $src
      * @param  \PhpOffice\PhpWord\Element\Image $image
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -290,7 +292,7 @@ class Media
      *
      * @param string $key
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -318,11 +320,11 @@ class Media
      *
      * @deprecated 0.10.0
      *
-     * @param  integer $footerCount
+     * @param  int $footerCount
      * @param  string $src
      * @param  \PhpOffice\PhpWord\Element\Image $image
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
@@ -338,7 +340,7 @@ class Media
      *
      * @param string $key
      *
-     * @return integer
+     * @return int
      *
      * @codeCoverageIgnore
      */
diff --git a/src/PhpWord/Metadata/Compatibility.php b/src/PhpWord/Metadata/Compatibility.php
index eb93274d..69f6f98a 100644
--- a/src/PhpWord/Metadata/Compatibility.php
+++ b/src/PhpWord/Metadata/Compatibility.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Metadata;
  * Compatibility setting class
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_Compat.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Compat.html
  */
 class Compatibility
 {
@@ -33,7 +33,7 @@ class Compatibility
      * 15 = 2013
      *
      * @var int
-     * @link http://msdn.microsoft.com/en-us/library/dd909048%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd909048%28v=office.12%29.aspx
      */
     private $ooxmlVersion = 12;
 
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index 63a7d515..0508dcd0 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -119,17 +119,17 @@ class DocInfo
      */
     public function __construct()
     {
-        $this->creator        = '';
+        $this->creator = '';
         $this->lastModifiedBy = $this->creator;
-        $this->created        = time();
-        $this->modified       = time();
-        $this->title          = '';
-        $this->subject        = '';
-        $this->description    = '';
-        $this->keywords       = '';
-        $this->category       = '';
-        $this->company        = '';
-        $this->manager        = '';
+        $this->created = time();
+        $this->modified = time();
+        $this->title = '';
+        $this->subject = '';
+        $this->description = '';
+        $this->keywords = '';
+        $this->category = '';
+        $this->company = '';
+        $this->manager = '';
     }
 
     /**
@@ -399,7 +399,7 @@ class DocInfo
      * Check if a Custom Property is defined
      *
      * @param string $propertyName
-     * @return boolean
+     * @return bool
      */
     public function isCustomPropertySet($propertyName)
     {
@@ -416,9 +416,9 @@ class DocInfo
     {
         if ($this->isCustomPropertySet($propertyName)) {
             return $this->customProperties[$propertyName]['value'];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -431,9 +431,9 @@ class DocInfo
     {
         if ($this->isCustomPropertySet($propertyName)) {
             return $this->customProperties[$propertyName]['type'];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -456,7 +456,7 @@ class DocInfo
             self::PROPERTY_TYPE_FLOAT,
             self::PROPERTY_TYPE_STRING,
             self::PROPERTY_TYPE_DATE,
-            self::PROPERTY_TYPE_BOOLEAN
+            self::PROPERTY_TYPE_BOOLEAN,
         );
         if (($propertyType === null) || (!in_array($propertyType, $propertyTypes))) {
             if ($propertyValue === null) {
@@ -474,8 +474,9 @@ class DocInfo
 
         $this->customProperties[$propertyName] = array(
             'value' => $propertyValue,
-            'type' => $propertyType
+            'type'  => $propertyType,
         );
+
         return $this;
     }
 
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 0e2ee7c1..ef5063f8 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Metadata;
  * Document protection class
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_DocProtect.html
  * @todo Password!
  */
 class Protection
@@ -30,7 +30,7 @@ class Protection
      * Editing restriction readOnly|comments|trackedChanges|forms
      *
      * @var string
-     * @link http://www.datypic.com/sc/ooxml/a-w_edit-1.html
+     * @see  http://www.datypic.com/sc/ooxml/a-w_edit-1.html
      */
     private $editing;
 
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 64788cc3..85c0659d 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -10,30 +10,30 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Metadata;
 
 use PhpOffice\PhpWord\ComplexType\ProofState;
-use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 
 /**
  * Setting class
  *
  * @since 0.14.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Settings.html
  */
 class Settings
 {
-
     /**
      * Magnification Setting
      *
-     * @link http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
+     * @see  http://www.datypic.com/sc/ooxml/e-w_zoom-1.html
      * @var mixed either integer, in which case it treated as a percent, or one of PhpOffice\PhpWord\SimpleType\Zoom
      */
     private $zoom = 100;
@@ -41,14 +41,14 @@ class Settings
     /**
      * Hide spelling errors
      *
-     * @var boolean
+     * @var bool
      */
     private $hideSpellingErrors = false;
 
     /**
      * Hide grammatical errors
      *
-     * @var boolean
+     * @var bool
      */
     private $hideGrammaticalErrors = false;
 
@@ -62,21 +62,21 @@ class Settings
     /**
      * Track Revisions to Document
      *
-     * @var boolean
+     * @var bool
      */
     private $trackRevisions = false;
 
     /**
      * Do Not Use Move Syntax When Tracking Revisions
      *
-     * @var boolean
+     * @var bool
      */
     private $doNotTrackMoves = false;
 
     /**
      * Do Not Track Formatting Revisions When Tracking Revisions
      *
-     * @var boolean
+     * @var bool
      */
     private $doNotTrackFormatting = false;
 
@@ -103,7 +103,7 @@ class Settings
 
     /**
      * Theme Font Languages
-     * 
+     *
      * @var Language
      */
     private $themeFontLang;
@@ -123,6 +123,7 @@ class Settings
         if ($this->documentProtection == null) {
             $this->documentProtection = new Protection();
         }
+
         return $this->documentProtection;
     }
 
@@ -142,6 +143,7 @@ class Settings
         if ($this->proofState == null) {
             $this->proofState = new ProofState();
         }
+
         return $this->proofState;
     }
 
@@ -156,7 +158,7 @@ class Settings
     /**
      * Are spelling errors hidden
      *
-     * @return boolean
+     * @return bool
      */
     public function hasHideSpellingErrors()
     {
@@ -166,7 +168,7 @@ class Settings
     /**
      * Hide spelling errors
      *
-     * @param boolean $hideSpellingErrors
+     * @param bool $hideSpellingErrors
      */
     public function setHideSpellingErrors($hideSpellingErrors)
     {
@@ -176,7 +178,7 @@ class Settings
     /**
      * Are grammatical errors hidden
      *
-     * @return boolean
+     * @return bool
      */
     public function hasHideGrammaticalErrors()
     {
@@ -186,7 +188,7 @@ class Settings
     /**
      * Hide grammatical errors
      *
-     * @param boolean $hideGrammaticalErrors
+     * @param bool $hideGrammaticalErrors
      */
     public function setHideGrammaticalErrors($hideGrammaticalErrors)
     {
@@ -194,7 +196,7 @@ class Settings
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasEvenAndOddHeaders()
     {
@@ -202,7 +204,7 @@ class Settings
     }
 
     /**
-     * @param boolean $evenAndOddHeaders
+     * @param bool $evenAndOddHeaders
      */
     public function setEvenAndOddHeaders($evenAndOddHeaders)
     {
@@ -230,7 +232,7 @@ class Settings
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasTrackRevisions()
     {
@@ -238,7 +240,7 @@ class Settings
     }
 
     /**
-     * @param boolean $trackRevisions
+     * @param bool $trackRevisions
      */
     public function setTrackRevisions($trackRevisions)
     {
@@ -246,7 +248,7 @@ class Settings
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasDoNotTrackMoves()
     {
@@ -254,7 +256,7 @@ class Settings
     }
 
     /**
-     * @param boolean $doNotTrackMoves
+     * @param bool $doNotTrackMoves
      */
     public function setDoNotTrackMoves($doNotTrackMoves)
     {
@@ -262,7 +264,7 @@ class Settings
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasDoNotTrackFormatting()
     {
@@ -270,7 +272,7 @@ class Settings
     }
 
     /**
-     * @param boolean $doNotTrackFormatting
+     * @param bool $doNotTrackFormatting
      */
     public function setDoNotTrackFormatting($doNotTrackFormatting)
     {
@@ -301,7 +303,7 @@ class Settings
 
     /**
      * Returns the Language
-     * 
+     *
      * @return Language
      */
     public function getThemeFontLang()
@@ -311,7 +313,7 @@ class Settings
 
     /**
      * sets the Language for this document
-     * 
+     *
      * @param Language $themeFontLang
      */
     public function setThemeFontLang($themeFontLang)
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 1571537e..d7c2348a 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
 
@@ -108,9 +108,9 @@ class PhpWord
      * @param mixed $function
      * @param mixed $args
      *
-     * @return mixed
-     *
      * @throws \BadMethodCallException
+     *
+     * @return mixed
      */
     public function __call($function, $args)
     {
@@ -241,7 +241,6 @@ class PhpWord
      * Set default font name.
      *
      * @param string $fontName
-     * @return void
      */
     public function setDefaultFontName($fontName)
     {
@@ -251,7 +250,7 @@ class PhpWord
     /**
      * Get default font size
      *
-     * @return integer
+     * @return int
      */
     public function getDefaultFontSize()
     {
@@ -262,7 +261,6 @@ class PhpWord
      * Set default font size.
      *
      * @param int $fontSize
-     * @return void
      */
     public function setDefaultFontSize($fontSize)
     {
@@ -285,21 +283,20 @@ class PhpWord
      *
      * @deprecated 0.12.0 Use `new TemplateProcessor($documentTemplate)` instead.
      *
-     * @param  string $filename Fully qualified filename.
-     *
-     * @return TemplateProcessor
+     * @param  string $filename Fully qualified filename
      *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      *
+     * @return TemplateProcessor
+     *
      * @codeCoverageIgnore
      */
     public function loadTemplate($filename)
     {
         if (file_exists($filename)) {
             return new TemplateProcessor($filename);
-        } else {
-            throw new Exception("Template file {$filename} not found.");
         }
+        throw new Exception("Template file {$filename} not found.");
     }
 
     /**
@@ -325,7 +322,7 @@ class PhpWord
         $writer = IOFactory::createWriter($this, $format);
 
         if ($download === true) {
-            header("Content-Description: File Transfer");
+            header('Content-Description: File Transfer');
             header('Content-Disposition: attachment; filename="' . $filename . '"');
             header('Content-Type: ' . $mime[$format]);
             header('Content-Transfer-Encoding: binary');
diff --git a/src/PhpWord/Reader/AbstractReader.php b/src/PhpWord/Reader/AbstractReader.php
index 93288c3b..f59a9556 100644
--- a/src/PhpWord/Reader/AbstractReader.php
+++ b/src/PhpWord/Reader/AbstractReader.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -62,6 +62,7 @@ abstract class AbstractReader implements ReaderInterface
     public function setReadDataOnly($value = true)
     {
         $this->readDataOnly = $value;
+
         return $this;
     }
 
@@ -70,21 +71,21 @@ abstract class AbstractReader implements ReaderInterface
      *
      * @param string $filename
      *
-     * @return resource
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return resource
      */
     protected function openFile($filename)
     {
         // Check if file exists
         if (!file_exists($filename) || !is_readable($filename)) {
-            throw new Exception("Could not open " . $filename . " for reading! File does not exist.");
+            throw new Exception("Could not open $filename for reading! File does not exist.");
         }
 
         // Open file
         $this->fileHandle = fopen($filename, 'r');
         if ($this->fileHandle === false) {
-            throw new Exception("Could not open file " . $filename . " for reading.");
+            throw new Exception("Could not open file $filename for reading.");
         }
     }
 
diff --git a/src/PhpWord/Reader/HTML.php b/src/PhpWord/Reader/HTML.php
index 824573e9..4e8b5e82 100644
--- a/src/PhpWord/Reader/HTML.php
+++ b/src/PhpWord/Reader/HTML.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index b3fdd9d4..9baacb51 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -19,8 +19,8 @@ namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\Common\Drawing;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Shared\OLERead;
+use PhpOffice\PhpWord\Style;
 
 /**
  * Reader for Word97
@@ -164,13 +164,14 @@ class MsDoc extends AbstractReader implements ReaderInterface
             $arrayCP[$inc] = self::getInt4d($data, $posMem);
             $posMem += 4;
         }
+
         return $arrayCP;
     }
 
     /**
-     *
-     * @link http://msdn.microsoft.com/en-us/library/dd949344%28v=office.12%29.aspx
-     * @link https://igor.io/2012/09/24/binary-parsing.html
+     * @see  http://msdn.microsoft.com/en-us/library/dd949344%28v=office.12%29.aspx
+     * @see  https://igor.io/2012/09/24/binary-parsing.html
+     * @param string $data
      */
     private function readFib($data)
     {
@@ -1095,6 +1096,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
             $this->arrayFib['lcbColorSchemeMapping'] = self::getInt4d($data, $pos);
             $pos += 4;
         }
+
         return $pos;
     }
 
@@ -1107,11 +1109,11 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $this->readRecordPlcfSed();
 
         // reading paragraphs
-        //@link https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L86
+        //@see  https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L86
         $this->readRecordPlcfBtePapx();
 
         // reading character formattings
-        //@link https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L94
+        //@see  https://github.com/notmasteryet/CompoundFile/blob/ec118f354efebdee9102e41b5b7084fce81125b0/WordFileReader/WordDocument.cs#L94
         $this->readRecordPlcfBteChpx();
 
         $this->generatePhpWord();
@@ -1119,7 +1121,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Section and information about them
-     * @link : http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
+     * @see  : http://msdn.microsoft.com/en-us/library/dd924458%28v=office.12%29.aspx
      */
     private function readRecordPlcfSed()
     {
@@ -1133,7 +1135,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $posMem += 4;
 
         // PlcfSed : aSed
-        //@link : http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
+        //@see  : http://msdn.microsoft.com/en-us/library/dd950194%28v=office.12%29.aspx
         $numSed = $this->getNumInLcb($this->arrayFib['lcbPlcfSed'], 12);
 
         $aSed = array();
@@ -1164,7 +1166,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Specifies the fonts that are used in the document
-     * @link : http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
+     * @see  : http://msdn.microsoft.com/en-us/library/dd943880%28v=office.12%29.aspx
      */
     private function readRecordSttbfFfn()
     {
@@ -1215,7 +1217,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 }
                 $this->arrayFonts[] = array(
                     'main' => $xszFfn,
-                    'alt' => $xszAlt,
+                    'alt'  => $xszAlt,
                 );
             }
         }
@@ -1223,7 +1225,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Paragraph and information about them
-     * @link http://msdn.microsoft.com/en-us/library/dd908569%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd908569%28v=office.12%29.aspx
      */
     private function readRecordPlcfBtePapx()
     {
@@ -1247,7 +1249,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
             }
             $arrayRGB = array();
             for ($inc = 1; $inc <= $numRun; $inc++) {
-                // @link http://msdn.microsoft.com/en-us/library/dd925804(v=office.12).aspx
+                // @see  http://msdn.microsoft.com/en-us/library/dd925804(v=office.12).aspx
                 $arrayRGB[$inc] = self::getInt1d($this->dataWorkDocument, $offset);
                 $offset += 1;
                 // reserved
@@ -1426,7 +1428,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 } else {
                     if ($istd > 0) {
                         // @todo : Determining Properties of a Paragraph Style
-                        # @link http://msdn.microsoft.com/en-us/library/dd948631%28v=office.12%29.aspx
+                        # @see  http://msdn.microsoft.com/en-us/library/dd948631%28v=office.12%29.aspx
                     }
                 }
             }*/
@@ -1435,7 +1437,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
     /**
      * Character formatting properties to text in a document
-     * @link http://msdn.microsoft.com/en-us/library/dd907108%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd907108%28v=office.12%29.aspx
      */
     private function readRecordPlcfBteChpx()
     {
@@ -1453,7 +1455,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $offset = $offsetBase;
 
         // ChpxFkp
-        // @link : http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
+        // @see  : http://msdn.microsoft.com/en-us/library/dd910989%28v=office.12%29.aspx
         $numRGFC = self::getInt1d($this->dataWorkDocument, $offset + 511);
         $arrayRGFC = array();
         for ($inc = 0; $inc <= $numRGFC; $inc++) {
@@ -1471,12 +1473,12 @@ class MsDoc extends AbstractReader implements ReaderInterface
         foreach ($arrayRGB as $keyRGB => $rgb) {
             $oStyle = new \stdClass();
             $oStyle->pos_start = $start;
-            $oStyle->pos_len = (int)ceil((($arrayRGFC[$keyRGB] -1) - $arrayRGFC[$keyRGB -1]) / 2);
+            $oStyle->pos_len = (int) ceil((($arrayRGFC[$keyRGB] - 1) - $arrayRGFC[$keyRGB - 1]) / 2);
             $start += $oStyle->pos_len;
 
             if ($rgb > 0) {
                 // Chp Structure
-                // @link : http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
+                // @see  : http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
                 $posRGB = $offsetBase + $rgb * 2;
 
                 $cb = self::getInt1d($this->dataWorkDocument, $posRGB);
@@ -1500,12 +1502,13 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $oSprm->f = ($sprm / 512) & 0x0001;
         $oSprm->sgc = ($sprm / 1024) & 0x0007;
         $oSprm->spra = ($sprm / 8192);
+
         return $oSprm;
     }
 
     /**
      * @param string $data
-     * @param integer $pos
+     * @param int $pos
      * @param \stdClass $oSprm
      * @return array
      */
@@ -1558,16 +1561,17 @@ class MsDoc extends AbstractReader implements ReaderInterface
         }
 
         return array(
-            'length' => $length,
+            'length'  => $length,
             'operand' => $operand,
         );
     }
 
     /**
-     * @param $data integer
-     * @param $pos integer
+     * @param $data int
+     * @param $pos int
+     * @param $cbNum int
      * @return \stdClass
-     * @link http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
+     * @see  http://msdn.microsoft.com/en-us/library/dd772849%28v=office.12%29.aspx
      */
     private function readPrl($data, $pos, $cbNum)
     {
@@ -1732,7 +1736,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             }
                             break;
                         // sprmCIco
-                        //@link http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
+                        //@see  http://msdn.microsoft.com/en-us/library/dd773060%28v=office.12%29.aspx
                         case 0x42:
                             switch (dechex($operand)) {
                                 case 0x00:
@@ -1787,7 +1791,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             break;
                         // sprmCHps
                         case 0x43:
-                            $oStylePrl->styleFont['size'] = dechex($operand/2);
+                            $oStylePrl->styleFont['size'] = dechex($operand / 2);
                             break;
                         // sprmCIss
                         case 0x48:
@@ -1838,7 +1842,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                         case 0x61:
                             break;
                         // sprmCShd80
-                        //@link http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
+                        //@see  http://msdn.microsoft.com/en-us/library/dd923447%28v=office.12%29.aspx
                         case 0x66:
                             // $operand = self::getInt2d($data, $pos);
                             $pos += 2;
@@ -1848,7 +1852,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             // $icoFore = ($operand >> 11) && bindec('11111');
                             break;
                         // sprmCCv
-                        //@link : http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
+                        //@see  : http://msdn.microsoft.com/en-us/library/dd952824%28v=office.12%29.aspx
                         case 0x70:
                             $red = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
                             $pos += 1;
@@ -1857,7 +1861,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                             $blue = str_pad(dechex(self::getInt1d($this->dataWorkDocument, $pos)), 2, '0', STR_PAD_LEFT);
                             $pos += 1;
                             $pos += 1;
-                            $oStylePrl->styleFont['color'] = $red.$green.$blue;
+                            $oStylePrl->styleFont['color'] = $red . $green . $blue;
                             $cbNum -= 4;
                             break;
                         default:
@@ -1950,7 +1954,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 // HFD > clsid
                 $sprmCPicLocation += 16;
                 // HFD > hyperlink
-                //@link : http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd909835%28v=office.12%29.aspx
                 $streamVersion = self::getInt4d($this->dataData, $sprmCPicLocation);
                 $sprmCPicLocation += 4;
                 $data = self::getInt4d($this->dataData, $sprmCPicLocation);
@@ -2018,8 +2022,8 @@ class MsDoc extends AbstractReader implements ReaderInterface
                 }*/
             } else {
                 // Pictures
-                //@link : http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
-                //@link : http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd925458%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd926136%28v=office.12%29.aspx
                 // PICF : lcb
                 $sprmCPicLocation += 4;
                 // PICF : cbHeader
@@ -2106,13 +2110,13 @@ class MsDoc extends AbstractReader implements ReaderInterface
                     $sprmCPicLocation += $shapeRH['recLen'];
                 }
                 // picture : rgfb
-                //@link : http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
+                //@see  : http://msdn.microsoft.com/en-us/library/dd950560%28v=office.12%29.aspx
                 $fileBlockRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                 while ($fileBlockRH['recType'] == 0xF007 || ($fileBlockRH['recType'] >= 0xF018 && $fileBlockRH['recType'] <= 0xF117)) {
                     $sprmCPicLocation += 8;
                     switch ($fileBlockRH['recType']) {
                         // OfficeArtFBSE
-                        //@link : http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
+                        //@see  : http://msdn.microsoft.com/en-us/library/dd944923%28v=office.12%29.aspx
                         case 0xF007:
                             // btWin32
                             $sprmCPicLocation += 1;
@@ -2147,7 +2151,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                 }
                             }
                             // embeddedBlip
-                            //@link : http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
+                            //@see  : http://msdn.microsoft.com/en-us/library/dd910081%28v=office.12%29.aspx
                             $embeddedBlipRH = $this->loadRecordHeader($this->dataData, $sprmCPicLocation);
                             switch ($embeddedBlipRH['recType']) {
                                 case self::OFFICEARTBLIPJPG:
@@ -2192,13 +2196,14 @@ class MsDoc extends AbstractReader implements ReaderInterface
         }
 
         $oStylePrl->length = $pos - $posStart;
+
         return $oStylePrl;
     }
 
     /**
      * Read a record header
      * @param string $stream
-     * @param integer $pos
+     * @param int $pos
      * @return array
      */
     private function loadRecordHeader($stream, $pos)
@@ -2206,11 +2211,12 @@ class MsDoc extends AbstractReader implements ReaderInterface
         $rec = self::getInt2d($stream, $pos);
         $recType = self::getInt2d($stream, $pos + 2);
         $recLen = self::getInt4d($stream, $pos + 4);
+
         return array(
-            'recVer' => ($rec >> 0) & bindec('1111'),
+            'recVer'      => ($rec >> 0) & bindec('1111'),
             'recInstance' => ($rec >> 4) & bindec('111111111111'),
-            'recType' => $recType,
-            'recLen' => $recLen,
+            'recType'     => $recType,
+            'recLen'      => $recLen,
         );
     }
 
@@ -2273,7 +2279,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
                                 }
                                 if (ord($sText[0]) == 1) {
                                     if (isset($oCharacters->style->image)) {
-                                        $fileImage = tempnam(sys_get_temp_dir(), 'PHPWord_MsDoc').'.'.$oCharacters->style->image['format'];
+                                        $fileImage = tempnam(sys_get_temp_dir(), 'PHPWord_MsDoc') . '.' . $oCharacters->style->image['format'];
                                         file_put_contents($fileImage, $oCharacters->style->image['data']);
                                         $oSection->addImage($fileImage, array('width' => $oCharacters->style->image['width'], 'height' => $oCharacters->style->image['height']));
                                         // print_r('>addImage<'.$fileImage.'>'.EOL);
@@ -2308,7 +2314,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
      */
     public static function getInt2d($data, $pos)
     {
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
     }
 
     /**
@@ -2320,7 +2326,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
      */
     public static function getInt3d($data, $pos)
     {
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16);
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16);
     }
 
     /**
@@ -2342,6 +2348,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
         } else {
             $ord24 = ($or24 & 127) << 24;
         }
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $ord24;
+
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $ord24;
     }
 }
diff --git a/src/PhpWord/Reader/ODText.php b/src/PhpWord/Reader/ODText.php
index e8c86886..5a22b4ba 100644
--- a/src/PhpWord/Reader/ODText.php
+++ b/src/PhpWord/Reader/ODText.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -40,7 +40,7 @@ class ODText extends AbstractReader implements ReaderInterface
 
         $readerParts = array(
             'content.xml' => 'Content',
-            'meta.xml' => 'Meta',
+            'meta.xml'    => 'Meta',
         );
 
         foreach ($readerParts as $xmlFile => $partName) {
@@ -58,7 +58,6 @@ class ODText extends AbstractReader implements ReaderInterface
      * @param string $partName
      * @param string $docFile
      * @param string $xmlFile
-     * @return void
      */
     private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
     {
diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php
index 5ec2f22d..bdac3b6f 100644
--- a/src/PhpWord/Reader/ODText/AbstractPart.php
+++ b/src/PhpWord/Reader/ODText/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index 0e11147b..8843d8a2 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -31,7 +31,6 @@ class Content extends AbstractPart
      * Read content.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
@@ -48,11 +47,9 @@ class Content extends AbstractPart
                         $depth = $xmlReader->getAttribute('text:outline-level', $node);
                         $section->addTitle($node->nodeValue, $depth);
                         break;
-
                     case 'text:p': // Paragraph
                         $section->addText($node->nodeValue);
                         break;
-
                     case 'text:list': // List
                         $listItems = $xmlReader->getElements('text:list-item/text:p', $node);
                         foreach ($listItems as $listItem) {
diff --git a/src/PhpWord/Reader/ODText/Meta.php b/src/PhpWord/Reader/ODText/Meta.php
index 9533c38b..98832d17 100644
--- a/src/PhpWord/Reader/ODText/Meta.php
+++ b/src/PhpWord/Reader/ODText/Meta.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -31,7 +31,6 @@ class Meta extends AbstractPart
      * Read meta.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      * @todo Process property type
      */
     public function read(PhpWord $phpWord)
@@ -70,9 +69,8 @@ class Meta extends AbstractPart
             if (in_array($property, array('Category', 'Company', 'Manager'))) {
                 $method = "set{$property}";
                 $docProps->$method($propertyNode->nodeValue);
-
-            // Set other custom properties
             } else {
+                // Set other custom properties
                 $docProps->setCustomProperty($property, $propertyNode->nodeValue);
             }
         }
diff --git a/src/PhpWord/Reader/RTF.php b/src/PhpWord/Reader/RTF.php
index b6d2e21e..2d09a04d 100644
--- a/src/PhpWord/Reader/RTF.php
+++ b/src/PhpWord/Reader/RTF.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/RTF/Document.php b/src/PhpWord/Reader/RTF/Document.php
index 4e0f2c35..be16d707 100644
--- a/src/PhpWord/Reader/RTF/Document.php
+++ b/src/PhpWord/Reader/RTF/Document.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -131,7 +131,6 @@ class Document
      * - Pushes every other character into the text queue
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      * @todo Use `fread` stream for scalability
      */
     public function read(PhpWord $phpWord)
@@ -153,7 +152,7 @@ class Document
 
         // Walk each characters
         while ($this->offset < $this->length) {
-            $char  = $this->rtf[$this->offset];
+            $char = $this->rtf[$this->offset];
             $ascii = ord($char);
 
             if (isset($markers[$ascii])) { // Marker found: {, }, \, LF, or CR
@@ -163,7 +162,7 @@ class Document
                 if (false === $this->isControl) { // Non control word: Push character
                     $this->pushText($char);
                 } else {
-                    if (preg_match("/^[a-zA-Z0-9-]?$/", $char)) { // No delimiter: Buffer control
+                    if (preg_match('/^[a-zA-Z0-9-]?$/', $char)) { // No delimiter: Buffer control
                         $this->control .= $char;
                         $this->isFirst = false;
                     } else { // Delimiter found: Parse buffered control
@@ -184,8 +183,6 @@ class Document
 
     /**
      * Mark opening braket `{` character.
-     *
-     * @return void
      */
     private function markOpening()
     {
@@ -195,8 +192,6 @@ class Document
 
     /**
      * Mark closing braket `}` character.
-     *
-     * @return void
      */
     private function markClosing()
     {
@@ -206,8 +201,6 @@ class Document
 
     /**
      * Mark backslash `\` character.
-     *
-     * @return void
      */
     private function markBackslash()
     {
@@ -223,8 +216,6 @@ class Document
 
     /**
      * Mark newline character: Flush control word because it's not possible to span multiline.
-     *
-     * @return void
      */
     private function markNewline()
     {
@@ -237,7 +228,6 @@ class Document
      * Flush control word or text.
      *
      * @param bool $isControl
-     * @return void
      */
     private function flush($isControl = false)
     {
@@ -252,11 +242,10 @@ class Document
      * Flush control word.
      *
      * @param bool $isControl
-     * @return void
      */
     private function flushControl($isControl = false)
     {
-        if (1 === preg_match("/^([A-Za-z]+)(-?[0-9]*) ?$/", $this->control, $match)) {
+        if (1 === preg_match('/^([A-Za-z]+)(-?[0-9]*) ?$/', $this->control, $match)) {
             list(, $control, $parameter) = $match;
             $this->parseControl($control, $parameter);
         }
@@ -268,8 +257,6 @@ class Document
 
     /**
      * Flush text in queue.
-     *
-     * @return void
      */
     private function flushText()
     {
@@ -296,7 +283,6 @@ class Document
      * Reset control word and first char state.
      *
      * @param bool $value
-     * @return void
      */
     private function setControl($value)
     {
@@ -308,14 +294,13 @@ class Document
      * Push text into queue.
      *
      * @param string $char
-     * @return void
      */
     private function pushText($char)
     {
         if ('<' == $char) {
-            $this->text .= "&lt;";
+            $this->text .= '&lt;';
         } elseif ('>' == $char) {
-            $this->text .= "&gt;";
+            $this->text .= '&gt;';
         } else {
             $this->text .= $char;
         }
@@ -326,19 +311,18 @@ class Document
      *
      * @param string $control
      * @param string $parameter
-     * @return void
      */
     private function parseControl($control, $parameter)
     {
         $controls = array(
             'par'       => array(self::PARA,    'paragraph',    true),
-            'b'         => array(self::STYL,    'font',         'bold',         true),
-            'i'         => array(self::STYL,    'font',         'italic',       true),
-            'u'         => array(self::STYL,    'font',         'underline',    true),
-            'strike'    => array(self::STYL,    'font',         'strikethrough',true),
-            'fs'        => array(self::STYL,    'font',         'size',         $parameter),
-            'qc'        => array(self::STYL,    'paragraph',    'alignment',    Jc::CENTER),
-            'sa'        => array(self::STYL,    'paragraph',    'spaceAfter',   $parameter),
+            'b'         => array(self::STYL,    'font',         'bold',          true),
+            'i'         => array(self::STYL,    'font',         'italic',        true),
+            'u'         => array(self::STYL,    'font',         'underline',     true),
+            'strike'    => array(self::STYL,    'font',         'strikethrough', true),
+            'fs'        => array(self::STYL,    'font',         'size',          $parameter),
+            'qc'        => array(self::STYL,    'paragraph',    'alignment',     Jc::CENTER),
+            'sa'        => array(self::STYL,    'paragraph',    'spaceAfter',    $parameter),
             'fonttbl'   => array(self::SKIP,    'fonttbl',      null),
             'colortbl'  => array(self::SKIP,    'colortbl',     null),
             'info'      => array(self::SKIP,    'info',         null),
@@ -366,7 +350,6 @@ class Document
      * Read paragraph.
      *
      * @param array $directives
-     * @return void
      */
     private function readParagraph($directives)
     {
@@ -379,7 +362,6 @@ class Document
      * Read style.
      *
      * @param array $directives
-     * @return void
      */
     private function readStyle($directives)
     {
@@ -391,7 +373,6 @@ class Document
      * Read skip.
      *
      * @param array $directives
-     * @return void
      */
     private function readSkip($directives)
     {
@@ -402,8 +383,6 @@ class Document
 
     /**
      * Read text.
-     *
-     * @return void
      */
     private function readText()
     {
diff --git a/src/PhpWord/Reader/ReaderInterface.php b/src/PhpWord/Reader/ReaderInterface.php
index 4f5231a7..3b2e357b 100644
--- a/src/PhpWord/Reader/ReaderInterface.php
+++ b/src/PhpWord/Reader/ReaderInterface.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,7 +28,7 @@ interface ReaderInterface
      * Can the current ReaderInterface read the file?
      *
      * @param  string $filename
-     * @return boolean
+     * @return bool
      */
     public function canRead($filename);
 
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index d203dd29..9f9fce08 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -55,7 +55,7 @@ class Word2007 extends AbstractReader implements ReaderInterface
             array('stepPart' => 'document', 'stepItems' => array(
                 'endnotes'  => 'Endnotes',
                 'footnotes' => 'Footnotes',
-                'settings' => 'Settings',
+                'settings'  => 'Settings',
             )),
         );
 
@@ -83,7 +83,6 @@ class Word2007 extends AbstractReader implements ReaderInterface
      * @param string $partName
      * @param string $docFile
      * @param string $xmlFile
-     * @return void
      */
     private function readPart(PhpWord $phpWord, $relationships, $partName, $docFile, $xmlFile)
     {
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index c94a3546..21e12902 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -36,9 +36,9 @@ abstract class AbstractPart
      */
     const READ_VALUE = 'attributeValue';            // Read attribute value
     const READ_EQUAL = 'attributeEquals';           // Read `true` when attribute value equals specified value
-    const READ_TRUE  = 'attributeTrue';             // Read `true` when element exists
+    const READ_TRUE = 'attributeTrue';              // Read `true` when element exists
     const READ_FALSE = 'attributeFalse';            // Read `false` when element exists
-    const READ_SIZE  = 'attributeMultiplyByTwo';    // Read special attribute value for Font::$size
+    const READ_SIZE = 'attributeMultiplyByTwo';     // Read special attribute value for Font::$size
 
     /**
      * Document file
@@ -82,7 +82,6 @@ abstract class AbstractPart
      * Set relationships.
      *
      * @param array $value
-     * @return void
      */
     public function setRels($value)
     {
@@ -96,7 +95,6 @@ abstract class AbstractPart
      * @param \DOMElement $domNode
      * @param mixed $parent
      * @param string $docPart
-     * @return void
      *
      * @todo Get font style for preserve text
      */
@@ -137,9 +135,8 @@ abstract class AbstractPart
                 }
             }
             $parent->addPreserveText($textContent, $fontStyle, $paragraphStyle);
-
-        // List item
         } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
+            // List item
             $textContent = '';
             $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
             $levelId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:ilvl');
@@ -148,18 +145,16 @@ abstract class AbstractPart
                 $textContent .= $xmlReader->getValue('w:t', $node);
             }
             $parent->addListItem($textContent, $levelId, null, "PHPWordList{$numId}", $paragraphStyle);
-
-        // Heading
         } elseif (!empty($headingMatches)) {
+            // Heading
             $textContent = '';
             $nodes = $xmlReader->getElements('w:r', $domNode);
             foreach ($nodes as $node) {
                 $textContent .= $xmlReader->getValue('w:t', $node);
             }
             $parent->addTitle($textContent, $headingMatches[1]);
-
-        // Text and TextRun
         } else {
+            // Text and TextRun
             $runCount = $xmlReader->countElements('w:r', $domNode);
             $linkCount = $xmlReader->countElements('w:hyperlink', $domNode);
             $runLinkCount = $runCount + $linkCount;
@@ -185,7 +180,6 @@ abstract class AbstractPart
      * @param mixed $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
-     * @return void
      *
      * @todo Footnote paragraph style
      */
@@ -205,25 +199,22 @@ abstract class AbstractPart
                 $parent->addLink($target, $textContent, $fontStyle, $paragraphStyle);
             }
         } else {
-            // Footnote
             if ($xmlReader->elementExists('w:footnoteReference', $domNode)) {
+                // Footnote
                 $parent->addFootnote();
-
-            // Endnote
             } elseif ($xmlReader->elementExists('w:endnoteReference', $domNode)) {
+                // Endnote
                 $parent->addEndnote();
-
-            // Image
             } elseif ($xmlReader->elementExists('w:pict', $domNode)) {
+                // Image
                 $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
                 $target = $this->getMediaTarget($docPart, $rId);
                 if (!is_null($target)) {
                     $imageSource = "zip://{$this->docFile}#{$target}";
                     $parent->addImage($imageSource);
                 }
-
-            // Object
             } elseif ($xmlReader->elementExists('w:object', $domNode)) {
+                // Object
                 $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:object/o:OLEObject');
                 // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
                 $target = $this->getMediaTarget($docPart, $rId);
@@ -231,9 +222,8 @@ abstract class AbstractPart
                     $textContent = "<Object: {$target}>";
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
                 }
-
-            // TextRun
             } else {
+                // TextRun
                 $textContent = $xmlReader->getValue('w:t', $domNode);
                 $parent->addText($textContent, $fontStyle, $paragraphStyle);
             }
@@ -247,7 +237,6 @@ abstract class AbstractPart
      * @param \DOMElement $domNode
      * @param mixed $parent
      * @param string $docPart
-     * @return void
      */
     protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart = 'document')
     {
diff --git a/src/PhpWord/Reader/Word2007/DocPropsApp.php b/src/PhpWord/Reader/Word2007/DocPropsApp.php
index 6b1410a5..df34c9c3 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsApp.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsApp.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php
index 417a93bd..f82c6b4b 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCore.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,15 +33,15 @@ class DocPropsCore extends AbstractPart
      * @var array
      */
     protected $mapping = array(
-        'dc:creator' => 'setCreator',
-        'dc:title' => 'setTitle',
-        'dc:description' => 'setDescription',
-        'dc:subject' => 'setSubject',
-        'cp:keywords' => 'setKeywords',
-        'cp:category' => 'setCategory',
+        'dc:creator'        => 'setCreator',
+        'dc:title'          => 'setTitle',
+        'dc:description'    => 'setDescription',
+        'dc:subject'        => 'setSubject',
+        'cp:keywords'       => 'setKeywords',
+        'cp:category'       => 'setCategory',
         'cp:lastModifiedBy' => 'setLastModifiedBy',
-        'dcterms:created' => 'setCreated',
-        'dcterms:modified' => 'setModified',
+        'dcterms:created'   => 'setCreated',
+        'dcterms:modified'  => 'setModified',
     );
 
     /**
@@ -55,7 +55,6 @@ class DocPropsCore extends AbstractPart
      * Read core/extended document properties.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
index 979a2441..a3d6b90b 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCustom.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -32,7 +32,6 @@ class DocPropsCustom extends AbstractPart
      * Read custom document properties.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index e5063fd9..ff094bcc 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -40,7 +40,6 @@ class Document extends AbstractPart
      * Read document.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
@@ -66,7 +65,6 @@ class Document extends AbstractPart
      *
      * @param array $settings
      * @param \PhpOffice\PhpWord\Element\Section &$section
-     * @return void
      */
     private function readHeaderFooter($settings, Section &$section)
     {
@@ -131,7 +129,7 @@ class Document extends AbstractPart
                 $id = $xmlReader->getAttribute('r:id', $node);
                 $styles['hf'][$id] = array(
                     'method' => str_replace('w:', '', str_replace('Reference', '', $node->nodeName)),
-                    'type' => $xmlReader->getAttribute('w:type', $node),
+                    'type'   => $xmlReader->getAttribute('w:type', $node),
                 );
             }
         }
@@ -145,7 +143,6 @@ class Document extends AbstractPart
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $node
      * @param \PhpOffice\PhpWord\Element\Section &$section
-     * @return void
      *
      * @todo <w:lastRenderedPageBreak>
      */
@@ -175,7 +172,6 @@ class Document extends AbstractPart
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $node
      * @param \PhpOffice\PhpWord\Element\Section &$section
-     * @return void
      */
     private function readWSectPrNode(XMLReader $xmlReader, \DOMElement $node, Section &$section)
     {
diff --git a/src/PhpWord/Reader/Word2007/Endnotes.php b/src/PhpWord/Reader/Word2007/Endnotes.php
index 7bcafc6a..0f46cb2f 100644
--- a/src/PhpWord/Reader/Word2007/Endnotes.php
+++ b/src/PhpWord/Reader/Word2007/Endnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index 3d85af71..61988723 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -45,7 +45,6 @@ class Footnotes extends AbstractPart
      * Read (footnotes|endnotes).xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
diff --git a/src/PhpWord/Reader/Word2007/Numbering.php b/src/PhpWord/Reader/Word2007/Numbering.php
index a00a6307..c2a81dd5 100644
--- a/src/PhpWord/Reader/Word2007/Numbering.php
+++ b/src/PhpWord/Reader/Word2007/Numbering.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -31,7 +31,6 @@ class Numbering extends AbstractPart
      * Read numbering.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
@@ -92,7 +91,7 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $subnode
-     * @param integer $levelId
+     * @param int $levelId
      * @return array
      */
     private function readLevel(XMLReader $xmlReader, \DOMElement $subnode, $levelId)
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 581d6b3d..2580209e 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,14 +29,12 @@ use PhpOffice\PhpWord\Style\Language;
  */
 class Settings extends AbstractPart
 {
-
     private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'trackRevisions', 'doNotTrackMoves', 'doNotTrackFormatting', 'evenAndOddHeaders');
 
     /**
      * Read settings.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
@@ -58,9 +56,9 @@ class Settings extends AbstractPart
                     } else {
                         $docSettings->$method(true);
                     }
-                } else if (method_exists($this, $method)) {
+                } elseif (method_exists($this, $method)) {
                     $this->$method($xmlReader, $phpWord, $node);
-                } else if (method_exists($docSettings, $method)) {
+                } elseif (method_exists($docSettings, $method)) {
                     $docSettings->$method($value);
                 }
             }
@@ -69,14 +67,13 @@ class Settings extends AbstractPart
 
     /**
      * Sets the document Language
-     * 
+     *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
      * @param \DOMNode $node
      */
     protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
-
         $val = $xmlReader->getAttribute('w:val', $node);
         $eastAsia = $xmlReader->getAttribute('w:eastAsia', $node);
         $bidi = $xmlReader->getAttribute('w:bidi', $node);
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index c38ca144..b8e6f22b 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -31,7 +31,6 @@ class Styles extends AbstractPart
      * Read styles.xml.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     public function read(PhpWord $phpWord)
     {
@@ -64,14 +63,12 @@ class Styles extends AbstractPart
                             }
                         }
                         break;
-
                     case 'character':
                         $fontStyle = $this->readFontStyle($xmlReader, $node);
                         if (!empty($fontStyle)) {
                             $phpWord->addFontStyle($name, $fontStyle);
                         }
                         break;
-
                     case 'table':
                         $tStyle = $this->readTableStyle($xmlReader, $node);
                         if (!empty($tStyle)) {
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 5309baf7..91efa1a6 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -30,8 +30,8 @@ class Settings
      * @const string
      */
     const ZIPARCHIVE = 'ZipArchive';
-    const PCLZIP     = 'PclZip';
-    const OLD_LIB    = 'PhpOffice\\PhpWord\\Shared\\ZipArchive'; // @deprecated 0.11
+    const PCLZIP = 'PclZip';
+    const OLD_LIB = 'PhpOffice\\PhpWord\\Shared\\ZipArchive'; // @deprecated 0.11
 
     /**
      * PDF rendering libraries
@@ -39,8 +39,8 @@ class Settings
      * @const string
      */
     const PDF_RENDERER_DOMPDF = 'DomPDF';
-    const PDF_RENDERER_TCPDF  = 'TCPDF';
-    const PDF_RENDERER_MPDF   = 'MPDF';
+    const PDF_RENDERER_TCPDF = 'TCPDF';
+    const PDF_RENDERER_MPDF = 'MPDF';
 
     /**
      * Measurement units multiplication factor
@@ -53,12 +53,12 @@ class Settings
      *
      * @const string
      */
-    const UNIT_TWIP  = 'twip'; // = 1/20 point
-    const UNIT_CM    = 'cm';
-    const UNIT_MM    = 'mm';
-    const UNIT_INCH  = 'inch';
+    const UNIT_TWIP = 'twip'; // = 1/20 point
+    const UNIT_CM = 'cm';
+    const UNIT_MM = 'mm';
+    const UNIT_INCH = 'inch';
     const UNIT_POINT = 'point'; // = 1/72 inch
-    const UNIT_PICA  = 'pica'; // = 1/6 inch = 12 points
+    const UNIT_PICA = 'pica'; // = 1/6 inch = 12 points
 
     /**
      * Default font settings
@@ -154,7 +154,7 @@ class Settings
      */
     public static function setCompatibility($compatibility)
     {
-        $compatibility = (bool)$compatibility;
+        $compatibility = (bool) $compatibility;
         self::$xmlWriterCompatibility = $compatibility;
 
         return true;
@@ -180,6 +180,7 @@ class Settings
     {
         if (in_array($zipClass, array(self::PCLZIP, self::ZIPARCHIVE, self::OLD_LIB))) {
             self::$zipClass = $zipClass;
+
             return true;
         }
 
@@ -229,7 +230,6 @@ class Settings
         return true;
     }
 
-
     /**
      * Return the directory path to the PDF Rendering Library.
      *
@@ -275,7 +275,7 @@ class Settings
     public static function setMeasurementUnit($value)
     {
         $units = array(self::UNIT_TWIP, self::UNIT_CM, self::UNIT_MM, self::UNIT_INCH,
-            self::UNIT_POINT, self::UNIT_PICA);
+            self::UNIT_POINT, self::UNIT_PICA, );
         if (!in_array($value, $units)) {
             return false;
         }
@@ -289,9 +289,7 @@ class Settings
      *
      * @since 0.12.0
      *
-     * @param string $tempDir The user defined path to temporary directory.
-     *
-     * @return void
+     * @param string $tempDir The user defined path to temporary directory
      */
     public static function setTempDir($tempDir)
     {
@@ -319,7 +317,7 @@ class Settings
     /**
      * @since 0.13.0
      *
-     * @return boolean
+     * @return bool
      *
      * @codeCoverageIgnore
      */
@@ -331,7 +329,7 @@ class Settings
     /**
      * @since 0.13.0
      *
-     * @param boolean $outputEscapingEnabled
+     * @param bool $outputEscapingEnabled
      *
      * @codeCoverageIgnore
      */
@@ -360,6 +358,7 @@ class Settings
     {
         if (is_string($value) && trim($value) !== '') {
             self::$defaultFontName = $value;
+
             return true;
         }
 
@@ -369,7 +368,7 @@ class Settings
     /**
      * Get default font size
      *
-     * @return integer
+     * @return int
      */
     public static function getDefaultFontSize()
     {
@@ -384,9 +383,10 @@ class Settings
      */
     public static function setDefaultFontSize($value)
     {
-        $value = intval($value);
+        $value = (int) $value;
         if ($value > 0) {
             self::$defaultFontSize = $value;
+
             return true;
         }
 
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index 35a5749a..d7839c4f 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -3,7 +3,6 @@ namespace PhpOffice\PhpWord\Shared;
 
 abstract class AbstractEnum
 {
-
     private static $constCacheArray = null;
 
     private static function getConstants()
@@ -12,10 +11,11 @@ abstract class AbstractEnum
             self::$constCacheArray = array();
         }
         $calledClass = get_called_class();
-        if (! array_key_exists($calledClass, self::$constCacheArray)) {
+        if (!array_key_exists($calledClass, self::$constCacheArray)) {
             $reflect = new \ReflectionClass($calledClass);
             self::$constCacheArray[$calledClass] = $reflect->getConstants();
         }
+
         return self::$constCacheArray[$calledClass];
     }
 
@@ -33,11 +33,12 @@ abstract class AbstractEnum
      * Returns true the value is valid for this enum
      *
      * @param strign $value
-     * @return boolean true if value is valid
+     * @return bool true if value is valid
      */
     public static function isValid($value)
     {
         $values = array_values(self::getConstants());
+
         return in_array($value, $values, true);
     }
 
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index e5cb5b25..6ba2b567 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,12 +22,12 @@ namespace PhpOffice\PhpWord\Shared;
  */
 class Converter
 {
-    const INCH_TO_CM        = 2.54;
-    const INCH_TO_TWIP      = 1440;
-    const INCH_TO_PIXEL     = 96;
-    const INCH_TO_POINT     = 72;
-    const PIXEL_TO_EMU      = 9525;
-    const DEGREE_TO_ANGLE   = 60000;
+    const INCH_TO_CM = 2.54;
+    const INCH_TO_TWIP = 1440;
+    const INCH_TO_PIXEL = 96;
+    const INCH_TO_POINT = 72;
+    const PIXEL_TO_EMU = 9525;
+    const DEGREE_TO_ANGLE = 60000;
 
     /**
      * Convert centimeter to twip
@@ -235,7 +235,7 @@ class Converter
      */
     public static function degreeToAngle($degree = 1)
     {
-        return (int)round($degree * self::DEGREE_TO_ANGLE);
+        return (int) round($degree * self::DEGREE_TO_ANGLE);
     }
 
     /**
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index d03d0adf..670ba6e5 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -34,7 +34,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element Where the parts need to be added
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
-     * @return void
      */
     public static function addHtml($element, $html, $fullHTML = false)
     {
@@ -95,7 +94,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element object to add an element corresponding with the node
      * @param array $styles Array with all styles
      * @param array $data Array to transport data to a next level in the DOM tree, for example level of listitems
-     * @return void
      */
     protected static function parseNode($node, $element, $styles = array(), $data = array())
     {
@@ -169,7 +167,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array $styles
      * @param array $data
-     * @return void
      */
     private static function parseChildNodes($node, $element, $styles, $data)
     {
@@ -226,7 +223,6 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
-     * @return null
      */
     private static function parseText($node, $element, &$styles)
     {
@@ -235,7 +231,7 @@ class Html
         // Commented as source of bug #257. `method_exists` doesn't seems to work properly in this case.
         // @todo Find better error checking for this one
         // if (method_exists($element, 'addText')) {
-            $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
+        $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
         // }
 
         return null;
@@ -247,7 +243,6 @@ class Html
      * @param array &$styles
      * @param string $argument1 Style name
      * @param string $argument2 Style value
-     * @return null
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
@@ -275,14 +270,14 @@ class Html
 
         // $attributes = $node->attributes;
         // if ($attributes->getNamedItem('width') !== null) {
-            // $newElement->setWidth($attributes->getNamedItem('width')->value);
+        // $newElement->setWidth($attributes->getNamedItem('width')->value);
         // }
 
         // if ($attributes->getNamedItem('height') !== null) {
-            // $newElement->setHeight($attributes->getNamedItem('height')->value);
+        // $newElement->setHeight($attributes->getNamedItem('height')->value);
         // }
         // if ($attributes->getNamedItem('width') !== null) {
-            // $newElement=$element->addCell($width=$attributes->getNamedItem('width')->value);
+        // $newElement=$element->addCell($width=$attributes->getNamedItem('width')->value);
         // }
 
         return $newElement;
@@ -294,7 +289,6 @@ class Html
      * @param array &$styles
      * @param array &$data
      * @param string $argument1 List type
-     * @return null
      */
     private static function parseList(&$styles, &$data, $argument1)
     {
@@ -315,7 +309,6 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param array $data
-     * @return null
      *
      * @todo This function is almost the same like `parseChildNodes`. Merged?
      * @todo As soon as ListItem inherits from AbstractContainer or TextRun delete parsing part of childNodes
@@ -364,10 +357,10 @@ class Html
                     $styles['alignment'] = $cValue; // todo: any mapping?
                     break;
                 case 'color':
-                    $styles['color'] = trim($cValue, "#");
+                    $styles['color'] = trim($cValue, '#');
                     break;
                 case 'background-color':
-                    $styles['bgColor'] = trim($cValue, "#");
+                    $styles['bgColor'] = trim($cValue, '#');
                     break;
             }
         }
diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index aa671522..e4efd7da 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -10,11 +10,10 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
-
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Exception\Exception;
diff --git a/src/PhpWord/Shared/PCLZip/pclzip.lib.php b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
index 4e2a496f..0a69f687 100644
--- a/src/PhpWord/Shared/PCLZip/pclzip.lib.php
+++ b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
@@ -25,4926 +25,2241 @@
 // $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
 // --------------------------------------------------------------------------------
 
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
+// ----- Constants
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
+}
 
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
+// ----- File list separator
+// In version 1.x of PclZip, the separator for file list is a space
+// (which is not a very smart choice, specifically for windows paths !).
+// A better separator should be a comma (,). This constant gives you the
+// abilty to change that.
+// However notice that changing this value, may have impact on existing
+// scripts, using space separated filenames.
+// Recommanded values for compatibility with older versions :
+//define( 'PCLZIP_SEPARATOR', ' ' );
+// Recommanded values for smart separation of filenames.
+if (!defined('PCLZIP_SEPARATOR')) {
+    define('PCLZIP_SEPARATOR', ',');
+}
 
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
+// ----- Error configuration
+// 0 : PclZip Class integrated error handling
+// 1 : PclError external library error handling. By enabling this
+//     you must ensure that you have included PclError library.
+// [2,...] : reserved for futur use
+if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define('PCLZIP_ERROR_EXTERNAL', 0);
+}
 
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
+// ----- Optional static temporary directory
+//       By default temporary files are generated in the script current
+//       path.
+//       If defined :
+//       - MUST BE terminated by a '/'.
+//       - MUST be a valid, already created directory
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+// define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define('PCLZIP_TEMPORARY_DIR', '');
+}
 
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
+// ----- Optional threshold ratio for use of temporary files
+//       Pclzip sense the size of the file to add/extract and decide to
+//       use or not temporary file. The algorythm is looking for
+//       memory_limit of PHP and apply a ratio.
+//       threshold = memory_limit * ratio.
+//       Recommended values are under 0.5. Default 0.47.
+//       Samples :
+// define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
+}
 
 // --------------------------------------------------------------------------------
 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
 // --------------------------------------------------------------------------------
 
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
+// ----- Global variables
+$g_pclzip_version = "2.8.2";
 
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+// ----- Error codes
+//   -1 : Unable to open file in binary write mode
+//   -2 : Unable to open file in binary read mode
+//   -3 : Invalid parameters
+//   -4 : File does not exist
+//   -5 : Filename is too long (max. 255)
+//   -6 : Not a valid zip file
+//   -7 : Invalid extracted file size
+//   -8 : Unable to create directory
+//   -9 : Invalid archive extension
+//  -10 : Invalid archive format
+//  -11 : Unable to delete file (unlink)
+//  -12 : Unable to rename file (rename)
+//  -13 : Invalid header checksum
+//  -14 : Invalid archive size
+define('PCLZIP_ERR_USER_ABORTED', 2);
+define('PCLZIP_ERR_NO_ERROR', 0);
+define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+define('PCLZIP_ERR_MISSING_FILE', -4);
+define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+define('PCLZIP_ERR_INVALID_ZIP', -6);
+define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+define('PCLZIP_ERR_BAD_EXTENSION', -9);
+define('PCLZIP_ERR_BAD_FORMAT', -10);
+define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+// ----- Options values
+define('PCLZIP_OPT_PATH', 77001);
+define('PCLZIP_OPT_ADD_PATH', 77002);
+define('PCLZIP_OPT_REMOVE_PATH', 77003);
+define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+define('PCLZIP_OPT_SET_CHMOD', 77005);
+define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+define('PCLZIP_OPT_BY_NAME', 77008);
+define('PCLZIP_OPT_BY_INDEX', 77009);
+define('PCLZIP_OPT_BY_EREG', 77010);
+define('PCLZIP_OPT_BY_PREG', 77011);
+define('PCLZIP_OPT_COMMENT', 77012);
+define('PCLZIP_OPT_ADD_COMMENT', 77013);
+define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
+// Having big trouble with crypt. Need to multiply 2 long int
+// which is not correctly supported by PHP ...
+//define( 'PCLZIP_OPT_CRYPT', 77018 );
+define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+// ----- File description attributes
+define('PCLZIP_ATT_FILE_NAME', 79001);
+define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+define('PCLZIP_ATT_FILE_MTIME', 79004);
+define('PCLZIP_ATT_FILE_CONTENT', 79005);
+define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
+// ----- Call backs values
+define('PCLZIP_CB_PRE_EXTRACT', 78001);
+define('PCLZIP_CB_POST_EXTRACT', 78002);
+define('PCLZIP_CB_PRE_ADD', 78003);
+define('PCLZIP_CB_POST_ADD', 78004);
+/* For futur use
+define( 'PCLZIP_CB_PRE_LIST', 78005 );
+define( 'PCLZIP_CB_POST_LIST', 78006 );
+define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+define( 'PCLZIP_CB_POST_DELETE', 78008 );
+*/
 
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
+// --------------------------------------------------------------------------------
+// Class : PclZip
+// Description :
+//   PclZip is the class that represent a Zip archive.
+//   The public methods allow the manipulation of the archive.
+// Attributes :
+//   Attributes must not be accessed directly.
+// Methods :
+//   PclZip() : Object creator
+//   create() : Creates the Zip archive
+//   listContent() : List the content of the Zip archive
+//   extract() : Extract the content of the archive
+//   properties() : List the properties of the archive
+// --------------------------------------------------------------------------------
+class PclZip
+{
     // ----- Filename of the zip file
-    var $zipname = '';
+    public $zipname = '';
 
     // ----- File descriptor of the zip file
-    var $zip_fd = 0;
+    public $zip_fd = 0;
 
     // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
+    public $error_code = 1;
+    public $error_string = '';
 
     // ----- Current status of the magic_quotes_runtime
     // This value store the php configuration for magic_quotes
     // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
+    public $magic_quotes_status;
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
+    // --------------------------------------------------------------------------------
+    // Function : PclZip()
+    // Description :
+    //   Creates a PclZip object and set the name of the associated Zip archive
+    //   filename.
+    //   Note that no real action is taken, if the archive does not exist it is not
+    //   created. Use create() for that.
+    // --------------------------------------------------------------------------------
+    public function __construct($p_zipname)
     {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
 
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                               "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-                        );
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                                   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-                        );
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                    ));
-        if ($v_result != 1) {
-          return 0;
+        // ----- Tests the zlib
+        if (!function_exists('gzopen')) {
+            die('Abort ' . basename(__FILE__) . ' : Missing zlib extensions');
         }
 
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-                                         $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG :
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+        // ----- Set the attributes
+        $this->zipname             = $p_zipname;
+        $this->zip_fd              = 0;
+        $this->magic_quotes_status = -1;
 
         // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
+        return;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   create($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two different synopsis. The first one is historical.
+    //   This method creates a Zip Archive. The Zip file is created in the
+    //   filesystem. The files and directories indicated in $p_filelist
+    //   are added in the archive. See the parameters description for the
+    //   supported format of $p_filelist.
+    //   When a directory is in the list, the directory and its content is added
+    //   in the archive.
+    //   In this synopsis, the function takes an optional variable list of
+    //   options. See bellow the supported options.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function create($p_filelist)
     {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-    // ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-                                 "Missing parameter value for option '"
-                                 .PclZipUtilOptionText($p_options_list[$i])
-                                 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-                                 "Wrong parameter value for option '"
-                                 .PclZipUtilOptionText($p_options_list[$i])
-                                 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                               "Unknown parameter '"
-                               .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
-
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-                                   "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-
-    // end foreach
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Create a result list
-    $v_result_list = array();
-
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-
-            $v_dirlist_nb++;
-          }
-
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Look for a stored different filename
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
+            // ----- Remove from the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    return 0;
+                }
+            }
         }
 
-        // ----- Use "in memory" zip algo
-        else {
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
+
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+
+            return 0;
         }
 
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                if ($v_string != '') {
+                    $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+                } else {
+                }
+            }
         }
 
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
         }
 
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
+        // ----- Call the create fct
+        $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
         }
 
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-                          $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-                          $p_header['size'],
-                          strlen($p_header['stored_filename']),
-                          $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-                          $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-                          $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-                          $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-                          $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-                          $p_nb_entries, $p_size,
-                          $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-        || (   (substr($p_path, 0, 1) != "/")
-            && (substr($p_path, 0, 3) != "../")
-            && (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
         // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-      // ----- Check compression method
-      if (   ($v_extract)
-          && (   ($v_header['compression'] != 8)
-              && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-                                   "Filename '".$v_header['stored_filename']."' is "
-                                   ."compressed by an unsupported compression "
-                                   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-          }
-      }
-
-      // ----- Check encrypted files
-      if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-                                   "Unsupported encryption for "
-                                   ." filename '".$v_header['stored_filename']
-                                   ."'");
-
-              return PclZip::errorCode();
-          }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-                                                $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-                && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-                                              $p_path, $p_remove_path,
-                                              $p_remove_all_path,
-                                              $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-            break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+    //   add($p_filelist, $p_option, $p_option_value, ...)
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This methods add the list of files in an existing archive.
+    //   If a file with the same name already exists, it is added at the end of the
+    //   archive, the first one is still present.
+    //   If the archive does not exist, it is created.
+    // Parameters :
+    //   $p_filelist : An array containing file or directory names, or
+    //                 a string containing one filename or one directory name, or
+    //                 a string containing a list of filenames and/or directory
+    //                 names separated by spaces.
+    //   $p_add_dir : A path to add before the real path of the archived file,
+    //                in order to have it memorized in the archive.
+    //   $p_remove_dir : A path to remove from the real path of the file to archive,
+    //                   in order to have a shorter path memorized in the archive.
+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+    //                   is removed first, before $p_add_dir is added.
+    // Options :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_COMMENT :
+    //   PCLZIP_OPT_ADD_COMMENT :
+    //   PCLZIP_OPT_PREPEND_COMMENT :
+    //   PCLZIP_CB_PRE_ADD :
+    //   PCLZIP_CB_POST_ADD :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the added files, with a status of the add action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function add($p_filelist)
     {
-      // ----- Return
-      return $v_result;
-    }
+        $v_result = 1;
 
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
+        // ----- Set default values
+        $v_options                            = array();
+        $v_options[PCLZIP_OPT_NO_COMPRESSION] = false;
 
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
 
-            $p_entry['status'] = "filtered";
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
 
-            return $v_result;
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_ADD => 'optional',
+                    PCLZIP_CB_POST_ADD => 'optional',
+                    PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                    PCLZIP_OPT_COMMENT => 'optional',
+                    PCLZIP_OPT_ADD_COMMENT => 'optional',
+                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                    //, PCLZIP_OPT_CRYPT => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
 
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
+        // ----- Init
+        $v_string_list    = array();
+        $v_att_list       = array();
+        $v_filedescr_list = array();
+        $p_result_list    = array();
 
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
+        // ----- Look if the $p_filelist is really an array
+        if (is_array($p_filelist)) {
+
+            // ----- Look if the first element is also an array
+            //       This will mean that this is a file description entry
+            if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+                $v_att_list = $p_filelist;
+
+            // ----- The list is a list of string names
+            } else {
+                $v_string_list = $p_filelist;
+            }
+
+        // ----- Look if the $p_filelist is a string
+        } elseif (is_string($p_filelist)) {
+            // ----- Create a list from the string
+            $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+
+        // ----- Invalid variable type for $p_filelist
+        } else {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '" . gettype($p_filelist) . "' for p_filelist");
+
+            return 0;
+        }
+
+        // ----- Reformat the string list
+        if (sizeof($v_string_list) != 0) {
+            foreach ($v_string_list as $v_string) {
+                $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+            }
+        }
+
+        // ----- For each file in the list check the attributes
+        $v_supported_attributes = array(
+            PCLZIP_ATT_FILE_NAME => 'mandatory',
+            PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional',
+            PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional',
+            PCLZIP_ATT_FILE_MTIME => 'optional',
+            PCLZIP_ATT_FILE_CONTENT => 'optional',
+            PCLZIP_ATT_FILE_COMMENT => 'optional'
+        );
+        foreach ($v_att_list as $v_entry) {
+            $v_result = $this->privFileDescrParseAtt($v_entry, $v_filedescr_list[], $v_options, $v_supported_attributes);
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Expand the filelist (expand directories)
+        $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
+
+        // ----- Call the create fct
+        $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+        if ($v_result != 1) {
+            return 0;
+        }
 
         // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
+        return $p_result_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']);
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-                                 "Filename '".$p_entry['filename']."' is "
-                                 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
+    // --------------------------------------------------------------------------------
+    // Function : listContent()
+    // Description :
+    //   This public method, gives the list of the files and directories, with their
+    //   properties.
+    //   The properties of each entries in the list are (used also in other functions) :
+    //     filename : Name of the file. For a create or add action it is the filename
+    //                given by the user. For an extract function it is the filename
+    //                of the extracted file.
+    //     stored_filename : Name of the file / directory stored in the archive.
+    //     size : Size of the stored file.
+    //     compressed_size : Size of the file's data compressed in the archive
+    //                       (without the headers overhead)
+    //     mtime : Last known modification date of the file (UNIX timestamp)
+    //     comment : Comment associated with the file
+    //     folder : true | false
+    //     index : index of the file in the archive
+    //     status : status of the action (depending of the action) :
+    //              Values are :
+    //                ok : OK !
+    //                filtered : the file / dir is not extracted (filtered by user)
+    //                already_a_directory : the file can not be extracted because a
+    //                                      directory with the same name already exists
+    //                write_protected : the file can not be extracted because a file
+    //                                  with the same name already exists and is
+    //                                  write protected
+    //                newer_exist : the file was not extracted because a newer file exists
+    //                path_creation_fail : the file is not extracted because the folder
+    //                                     does not exist and can not be created
+    //                write_error : the file was not extracted because there was a
+    //                              error while writing the file
+    //                read_error : the file was not extracted because there was a error
+    //                             while reading the file
+    //                invalid_header : the file was not extracted because of an archive
+    //                                 format error (bad file header)
+    //   Note that each time a method can continue operating when there
+    //   is an action error on a file, the error is only logged in the file status.
+    // Return Values :
+    //   0 on an unrecoverable failure,
+    //   The list of the files in the archive.
+    // --------------------------------------------------------------------------------
+    public function listContent()
     {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-                                 "Filename '".$p_entry['filename']."' is "
-                                 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-            }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-                                 "Filename '".$p_entry['filename']."' exists "
-                                 ."and is write protected");
-
-            return PclZip::errorCode();
-            }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-            && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-          }
-            else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-                && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-                         "Newer version of '".$p_entry['filename']."' exists "
-                        ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-              }
-            }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-              // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-
-          // ----- Look for extract in memory
-          else {
-
-
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-
-              return $v_result;
-            }
-
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-
-              return $v_result;
-            }
-
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Call the extracting fct
+        $p_list = array();
+        if (($v_result = $this->privList($p_list)) != 1) {
+            unset($p_list);
 
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
+            return (0);
         }
-      }
+
+        // ----- Return
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extract($p_path="./", $p_remove_path="")
+    //   extract([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method extract all the files / directories from the archive to the
+    //   folder indicated in $p_path.
+    //   If you want to ignore the 'root' part of path of the memorized files
+    //   you can indicate this in the optional $p_remove_path parameter.
+    //   By default, if a newer file with the same name already exists, the
+    //   file is not extracted.
+    //
+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+    //   at the end of the path value of PCLZIP_OPT_PATH.
+    // Parameters :
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 or a negative value on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function extract()
     {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
         $v_result = 1;
-      }
 
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
-        else {
 
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
 
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_BY_NAME => 'optional',
+                    PCLZIP_OPT_BY_EREG => 'optional',
+                    PCLZIP_OPT_BY_PREG => 'optional',
+                    PCLZIP_OPT_BY_INDEX => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
+        }
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Trace
+
+        // ----- Call the extracting fct
+        $p_list   = array();
+        $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options);
+        if ($v_result < 1) {
+            unset($p_list);
+
+            return (0);
+        }
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+    // Description :
+    //   This method supports two synopsis. The first one is historical.
+    //   This method is doing a partial extract of the archive.
+    //   The extracted files or folders are identified by their index in the
+    //   archive (from 0 to n).
+    //   Note that if the index identify a folder, only the folder entry is
+    //   extracted, not all the files included in the archive.
+    // Parameters :
+    //   $p_index : A single index (integer) or a string of indexes of files to
+    //              extract. The form of the string is "0,4-6,8-12" with only numbers
+    //              and '-' for range or ',' to separate ranges. No spaces or ';'
+    //              are allowed.
+    //   $p_path : Path where the files and directories are to be extracted
+    //   $p_remove_path : First part ('root' part) of the memorized path
+    //                    (if any similar) to remove while extracting.
+    // Options :
+    //   PCLZIP_OPT_PATH :
+    //   PCLZIP_OPT_ADD_PATH :
+    //   PCLZIP_OPT_REMOVE_PATH :
+    //   PCLZIP_OPT_REMOVE_ALL_PATH :
+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+    //     not as files.
+    //     The resulting content is in a new field 'content' in the file
+    //     structure.
+    //     This option must be used alone (any other options are ignored).
+    //   PCLZIP_CB_PRE_EXTRACT :
+    //   PCLZIP_CB_POST_EXTRACT :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the extracted files, with a status of the action.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    //function extractByIndex($p_index, options...)
+    public function extractByIndex($p_index)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Set default values
+        $v_options         = array();
+        //    $v_path = "./";
+        $v_path            = '';
+        $v_remove_path     = "";
+        $v_remove_all_path = false;
+
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Default values for option
+        $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+
+        // ----- Look for arguments
+        if ($v_size > 1) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Remove form the options list the first argument
+            array_shift($v_arg_list);
+            $v_size--;
+
+            // ----- Look for first arg
+            if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+                // ----- Parse the options
+                $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                    PCLZIP_OPT_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_PATH => 'optional',
+                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                    PCLZIP_OPT_ADD_PATH => 'optional',
+                    PCLZIP_CB_PRE_EXTRACT => 'optional',
+                    PCLZIP_CB_POST_EXTRACT => 'optional',
+                    PCLZIP_OPT_SET_CHMOD => 'optional',
+                    PCLZIP_OPT_REPLACE_NEWER => 'optional',
+                    PCLZIP_OPT_STOP_ON_ERROR => 'optional',
+                    PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                ));
+                if ($v_result != 1) {
+                    return 0;
+                }
+
+                // ----- Set the arguments
+                if (isset($v_options[PCLZIP_OPT_PATH])) {
+                    $v_path = $v_options[PCLZIP_OPT_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+                    $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+                }
+                if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+                    // ----- Check for '/' in last path char
+                    if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+                        $v_path .= '/';
+                    }
+                    $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+                }
+                if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = false;
+                } else {
+                }
+
+            // ----- Look for 2 args
+            // Here we need to support the first historic synopsis of the
+            // method.
+            } else {
+
+                // ----- Get the first argument
+                $v_path = $v_arg_list[0];
+
+                // ----- Look for the optional second argument
+                if ($v_size == 2) {
+                    $v_remove_path = $v_arg_list[1];
+                } elseif ($v_size > 2) {
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+                    // ----- Return
+                    return 0;
+                }
+            }
         }
 
         // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
 
-    }
-
-    // ----- Change abort status
-    if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-    }
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        $v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-    // ----- Check the static values
-    // TBC
-    if ($p_local_header['filename'] != $p_central_header['filename']) {
-    }
-    if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-    }
-    if ($p_local_header['flag'] != $p_central_header['flag']) {
-    }
-    if ($p_local_header['compression'] != $p_central_header['compression']) {
-    }
-    if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-    }
-    if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-    }
-
-    // ----- Look for flag bit 3
-    if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
+        // ----- Trick
+        // Here I want to reuse extractByRule(), so I need to parse the $p_index
+        // with privParseOptions()
+        $v_arg_trick     = array(
+            PCLZIP_OPT_BY_INDEX,
+            $p_index
+        );
+        $v_options_trick = array();
+        $v_result        = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick, array(
+            PCLZIP_OPT_BY_INDEX => 'optional'
+        ));
+        if ($v_result != 1) {
+            return 0;
+        }
+        $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+        // ----- Look for default option values
+        $this->privOptionDefaultThreshold($v_options);
+
+        // ----- Call the extracting fct
+        if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+            return (0);
         }
 
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
         // ----- Return
-        return PclZip::errorCode();
-      }
+        return $p_list;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
+    // --------------------------------------------------------------------------------
+    // Function :
+    //   delete([$p_option, $p_option_value, ...])
+    // Description :
+    //   This method removes files from the archive.
+    //   If no parameters are given, then all the archive is emptied.
+    // Parameters :
+    //   None or optional arguments.
+    // Options :
+    //   PCLZIP_OPT_BY_INDEX :
+    //   PCLZIP_OPT_BY_NAME :
+    //   PCLZIP_OPT_BY_EREG :
+    //   PCLZIP_OPT_BY_PREG :
+    // Return Values :
+    //   0 on failure,
+    //   The list of the files which are still present in the archive.
+    //   (see PclZip::listContent() for list entry format)
+    // --------------------------------------------------------------------------------
+    public function delete()
     {
+        $v_result = 1;
 
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+        // ----- Reset the error handler
+        $this->privErrorReset();
 
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-      // ----- Removed in release 2.2 see readme file
-      // The check of the file size is a little too strict.
-      // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-      // While decrypted, zip has training 0 bytes
-      if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-                           'The central dir is not at the end of the archive.'
-                           .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-      }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-        $v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
         }
 
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        // ----- Set default values
+        $v_options = array();
 
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for variable options arguments
+        $v_size = func_num_args();
+
+        // ----- Look for arguments
+        if ($v_size > 0) {
+            // ----- Get the arguments
+            $v_arg_list = func_get_args();
+
+            // ----- Parse the options
+            $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options, array(
+                PCLZIP_OPT_BY_NAME => 'optional',
+                PCLZIP_OPT_BY_EREG => 'optional',
+                PCLZIP_OPT_BY_PREG => 'optional',
+                PCLZIP_OPT_BY_INDEX => 'optional'
+            ));
+            if ($v_result != 1) {
+                return 0;
+            }
+        }
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Call the delete fct
+        $v_list = array();
+        if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+            $this->privSwapBackMagicQuotes();
+            unset($v_list);
+
+            return (0);
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : deleteByIndex()
+    // Description :
+    //   ***** Deprecated *****
+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+    // --------------------------------------------------------------------------------
+    public function deleteByIndex($p_index)
+    {
+
+        $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+        // ----- Return
+        return $p_list;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : properties()
+    // Description :
+    //   This method gives the properties of the archive.
+    //   The properties are :
+    //     nb : Number of files in the archive
+    //     comment : Comment associated with the archive file
+    //     status : not_exist, ok
+    // Parameters :
+    //   None
+    // Return Values :
+    //   0 on failure,
+    //   An array with the archive properties.
+    // --------------------------------------------------------------------------------
+    public function properties()
+    {
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            $this->privSwapBackMagicQuotes();
+
+            return (0);
+        }
+
+        // ----- Default properties
+        $v_prop            = array();
+        $v_prop['comment'] = '';
+        $v_prop['nb']      = 0;
+        $v_prop['status']  = 'not_exist';
+
+        // ----- Look if file exists
+        if (@is_file($this->zipname)) {
+            // ----- Open the zip file
+            if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+                $this->privSwapBackMagicQuotes();
 
                 // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+                PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+                // ----- Return
+                return 0;
+            }
+
+            // ----- Read the central directory informations
+            $v_central_dir = array();
+            if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return 0;
+            }
+
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Set the user attributes
+            $v_prop['comment'] = $v_central_dir['comment'];
+            $v_prop['nb']      = $v_central_dir['entries'];
+            $v_prop['status']  = 'ok';
+        }
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_prop;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : duplicate()
+    // Description :
+    //   This method creates an archive by copying the content of an other one. If
+    //   the archive already exist, it is replaced by the new one without any warning.
+    // Parameters :
+    //   $p_archive : The filename of a valid archive, or
+    //                a valid PclZip object.
+    // Return Values :
+    //   1 on success.
+    //   0 or a negative value on error (error code).
+    // --------------------------------------------------------------------------------
+    public function duplicate($p_archive)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the $p_archive is a PclZip object
+        if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) {
+
+            // ----- Duplicate the archive
+            $v_result = $this->privDuplicate($p_archive->zipname);
+
+        // ----- Look if the $p_archive is a string (so a filename)
+        } elseif (is_string($p_archive)) {
+
+            // ----- Check that $p_archive is a valid zip file
+            // TBC : Should also check the archive format
+            if (!is_file($p_archive)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '" . $p_archive . "'");
+                $v_result = PCLZIP_ERR_MISSING_FILE;
+            } else {
+                // ----- Duplicate the archive
+                $v_result = $this->privDuplicate($p_archive);
+            }
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : merge()
+    // Description :
+    //   This method merge the $p_archive_to_add archive at the end of the current
+    //   one ($this).
+    //   If the archive ($this) does not exist, the merge becomes a duplicate.
+    //   If the $p_archive_to_add archive does not exist, the merge is a success.
+    // Parameters :
+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+    //                       or a PclZip object archive.
+    // Return Values :
+    //   1 on success,
+    //   0 or negative values on error (see below).
+    // --------------------------------------------------------------------------------
+    public function merge($p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Check archive
+        if (!$this->privCheckFormat()) {
+            return (0);
+        }
+
+        // ----- Look if the $p_archive_to_add is a PclZip object
+        if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) {
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($p_archive_to_add);
+
+        // ----- Look if the $p_archive_to_add is a string (so a filename)
+        } elseif (is_string($p_archive_to_add)) {
+
+            // ----- Create a temporary archive
+            $v_object_archive = new PclZip($p_archive_to_add);
+
+            // ----- Merge the archive
+            $v_result = $this->privMerge($v_object_archive);
+
+        // ----- Invalid variable
+        } else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+            $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorCode()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorCode()
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorCode());
+        } else {
+            return ($this->error_code);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorName()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorName($p_with_code = false)
+    {
+        $v_name = array(
+            PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+            PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+            PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+            PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+            PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+            PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+            PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+            PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+            PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+            PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+            PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+            PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+            PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+            PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+            PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+            PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+            PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+            PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+            PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION',
+            PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE',
+            PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+        );
+
+        if (isset($v_name[$this->error_code])) {
+            $v_value = $v_name[$this->error_code];
+        } else {
+            $v_value = 'NoName';
+        }
+
+        if ($p_with_code) {
+            return ($v_value . ' (' . $this->error_code . ')');
+        } else {
+            return ($v_value);
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : errorInfo()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function errorInfo($p_full = false)
+    {
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            return (PclErrorString());
+        } else {
+            if ($p_full) {
+                return ($this->errorName(true) . " : " . $this->error_string);
+            } else {
+                return ($this->error_string . " [code " . $this->error_code . "]");
+            }
+        }
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+    // *****                                                        *****
+    // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFormat()
+    // Description :
+    //   This method check that the archive exists and is a valid zip archive.
+    //   Several level of check exists. (futur)
+    // Parameters :
+    //   $p_level : Level of check. Default 0.
+    //              0 : Check the first bytes (magic codes) (default value))
+    //              1 : 0 + Check the central directory (futur)
+    //              2 : 1 + Check each file header (futur)
+    // Return Values :
+    //   true on success,
+    //   false on error, the error code is set.
+    // --------------------------------------------------------------------------------
+    public function privCheckFormat($p_level = 0)
+    {
+        $v_result = true;
+
+        // ----- Reset the file system cache
+        clearstatcache();
+
+        // ----- Reset the error handler
+        $this->privErrorReset();
+
+        // ----- Look if the file exits
+        if (!is_file($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check that the file is readeable
+        if (!is_readable($this->zipname)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '" . $this->zipname . "'");
+
+            return (false);
+        }
+
+        // ----- Check the magic code
+        // TBC
+
+        // ----- Check the central header
+        // TBC
+
+        // ----- Check each file header
+        // TBC
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privParseOptions()
+    // Description :
+    //   This internal methods reads the variable list of arguments ($p_options_list,
+    //   $p_size) and generate an array with the options and values ($v_result_list).
+    //   $v_requested_options contains the options that can be present and those that
+    //   must be present.
+    //   $v_requested_options is an array, with the option value as key, and 'optional',
+    //   or 'mandatory' as value.
+    // Parameters :
+    //   See above.
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- Read the options
+        $i = 0;
+        while ($i < $p_size) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$p_options_list[$i]])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '" . $p_options_list[$i] . "' for this method");
 
                 // ----- Return
                 return PclZip::errorCode();
             }
 
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+            // ----- Look for next option
+            switch ($p_options_list[$i]) {
+                // ----- Look for options that request a path value
+                case PCLZIP_OPT_PATH:
+                case PCLZIP_OPT_REMOVE_PATH:
+                case PCLZIP_OPT_ADD_PATH:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
 
-                // ----- Return
-                return $v_result;
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_THRESHOLD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Check the value
+                    $v_value = $p_options_list[$i + 1];
+                    if ((!is_integer($v_value)) || ($v_value < 0)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value (and convert it in bytes)
+                    $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
+                    $i++;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_ON:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_TEMP_FILE_OFF:
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+
+                        return PclZip::errorCode();
+                    }
+                    // ----- Check for incompatible options
+                    if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '" . PclZipUtilOptionText($p_options_list[$i]) . "' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1]) && ($p_options_list[$i + 1] != '')) {
+                        $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], false);
+                        $i++;
+                    } else {
+                    }
+                    break;
+
+                // ----- Look for options that request an array of string for value
+                case PCLZIP_OPT_BY_NAME:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an EREG or PREG expression
+                case PCLZIP_OPT_BY_EREG:
+                    $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+                    // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+                    // to PCLZIP_OPT_BY_PREG
+                case PCLZIP_OPT_BY_PREG:
+                    //case PCLZIP_OPT_CRYPT :
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_OPT_COMMENT:
+                case PCLZIP_OPT_ADD_COMMENT:
+                case PCLZIP_OPT_PREPEND_COMMENT:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    if (is_string($p_options_list[$i + 1])) {
+                        $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                    $i++;
+                    break;
+
+                // ----- Look for options that request an array of index
+                case PCLZIP_OPT_BY_INDEX:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_work_list = array();
+                    if (is_string($p_options_list[$i + 1])) {
+
+                        // ----- Remove spaces
+                        $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
+
+                        // ----- Parse items
+                        $v_work_list = explode(",", $p_options_list[$i + 1]);
+                    } elseif (is_integer($p_options_list[$i + 1])) {
+                        $v_work_list[0] = $p_options_list[$i + 1] . '-' . $p_options_list[$i + 1];
+                    } elseif (is_array($p_options_list[$i + 1])) {
+                        $v_work_list = $p_options_list[$i + 1];
+                    } else {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Reduce the index list
+                    // each index item in the list must be a couple with a start and
+                    // an end value : [0,3], [5-5], [8-10], ...
+                    // ----- Check the format of each item
+                    $v_sort_flag  = false;
+                    $v_sort_value = 0;
+                    for ($j = 0; $j < sizeof($v_work_list); $j++) {
+                        // ----- Explode the item
+                        $v_item_list      = explode("-", $v_work_list[$j]);
+                        $v_size_item_list = sizeof($v_item_list);
+
+                        // ----- TBC : Here we might check that each item is a
+                        // real integer ...
+
+                        // ----- Look for single value
+                        if ($v_size_item_list == 1) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[0];
+                        } elseif ($v_size_item_list == 2) {
+                            // ----- Set the option value
+                            $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                            $v_result_list[$p_options_list[$i]][$j]['end']   = $v_item_list[1];
+                        } else {
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+
+                        // ----- Look for list sort
+                        if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                            $v_sort_flag = true;
+
+                            // ----- TBC : An automatic sort should be writen ...
+                            // ----- Error log
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                            // ----- Return
+                            return PclZip::errorCode();
+                        }
+                        $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+                    }
+
+                    // ----- Sort the items
+                    if ($v_sort_flag) {
+                        // TBC : To Be Completed
+                    }
+
+                    // ----- Next option
+                    $i++;
+                    break;
+
+                // ----- Look for options that request no value
+                case PCLZIP_OPT_REMOVE_ALL_PATH:
+                case PCLZIP_OPT_EXTRACT_AS_STRING:
+                case PCLZIP_OPT_NO_COMPRESSION:
+                case PCLZIP_OPT_EXTRACT_IN_OUTPUT:
+                case PCLZIP_OPT_REPLACE_NEWER:
+                case PCLZIP_OPT_STOP_ON_ERROR:
+                    $v_result_list[$p_options_list[$i]] = true;
+                    break;
+
+                // ----- Look for options that request an octal value
+                case PCLZIP_OPT_SET_CHMOD:
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
+                    $i++;
+                    break;
+
+                // ----- Look for options that request a call-back
+                case PCLZIP_CB_PRE_EXTRACT:
+                case PCLZIP_CB_POST_EXTRACT:
+                case PCLZIP_CB_PRE_ADD:
+                case PCLZIP_CB_POST_ADD:
+                    /* for futur use
+                    case PCLZIP_CB_PRE_DELETE :
+                    case PCLZIP_CB_POST_DELETE :
+                    case PCLZIP_CB_PRE_LIST :
+                    case PCLZIP_CB_POST_LIST :
+                    */
+                    // ----- Check the number of parameters
+                    if (($i + 1) >= $p_size) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Get the value
+                    $v_function_name = $p_options_list[$i + 1];
+
+                    // ----- Check that the value is a valid existing function
+                    if (!function_exists($v_function_name)) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '" . $v_function_name . "()' is not an existing function for option '" . PclZipUtilOptionText($p_options_list[$i]) . "'");
+
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Set the attribute
+                    $v_result_list[$p_options_list[$i]] = $v_function_name;
+                    $i++;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $p_options_list[$i] . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
             }
 
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-                                            $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
+            // ----- Next options
+            $i++;
+        }
 
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
+        // ----- Look for mandatory options
+        if ($v_requested_options !== false) {
+            for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                // ----- Look for mandatory option
+                if ($v_requested_options[$key] == 'mandatory') {
+                    // ----- Look if present
+                    if (!isset($v_result_list[$key])) {
+                        // ----- Error log
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
 
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
+                        // ----- Return
+                        return PclZip::errorCode();
+                    }
+                }
             }
         }
 
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
+        // ----- Look for default values
+        if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
 
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privOptionDefaultThreshold()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privOptionDefaultThreshold(&$p_options)
+    {
+        $v_result = 1;
+
+        if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            return $v_result;
+        }
+
+        // ----- Get 'memory_limit' configuration value
+        $v_memory_limit = ini_get('memory_limit');
+        $v_memory_limit = trim($v_memory_limit);
+        $last           = strtolower(substr($v_memory_limit, -1));
+        $v_memory_limit = preg_replace('/[^0-9,.]/', '', $v_memory_limit);
+
+        if ($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1073741824;
+        }
+        if ($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
+            $v_memory_limit = $v_memory_limit * 1048576;
+        }
+        if ($last == 'k') {
+            $v_memory_limit = $v_memory_limit * 1024;
+        }
+
+        $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
+
+        // ----- Sanity check : No threshold if value lower than 1M
+        if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+            unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrParseAtt()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
+    {
+        $v_result = 1;
+
+        // ----- For each file in the list check the attributes
+        foreach ($p_file_list as $v_key => $v_value) {
+
+            // ----- Check if the option is supported
+            if (!isset($v_requested_options[$v_key])) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '" . $v_key . "' for this file");
 
                 // ----- Return
-                return $v_result;
+                return PclZip::errorCode();
             }
 
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            // ----- Look for attribute
+            switch ($v_key) {
+                case PCLZIP_ATT_FILE_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['filename'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_SHORT_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_short_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                case PCLZIP_ATT_FILE_NEW_FULL_NAME:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+                    if ($p_filedescr['new_full_name'] == '') {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+                    break;
+
+                // ----- Look for options that takes a string
+                case PCLZIP_ATT_FILE_COMMENT:
+                    if (!is_string($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". String expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['comment'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_MTIME:
+                    if (!is_integer($v_value)) {
+                        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type " . gettype($v_value) . ". Integer expected for attribute '" . PclZipUtilOptionText($v_key) . "'");
+
+                        return PclZip::errorCode();
+                    }
+
+                    $p_filedescr['mtime'] = $v_value;
+                    break;
+
+                case PCLZIP_ATT_FILE_CONTENT:
+                    $p_filedescr['content'] = $v_value;
+                    break;
+
+                default:
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Unknown parameter '" . $v_key . "'");
+
+                    // ----- Return
+                    return PclZip::errorCode();
+            }
+
+            // ----- Look for mandatory options
+            if ($v_requested_options !== false) {
+                for ($key = reset($v_requested_options); $key = key($v_requested_options); $key = next($v_requested_options)) {
+                    // ----- Look for mandatory option
+                    if ($v_requested_options[$key] == 'mandatory') {
+                        // ----- Look if present
+                        if (!isset($p_file_list[$key])) {
+                            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter " . PclZipUtilOptionText($key) . "(" . $key . ")");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                }
+            }
+
+            // end foreach
         }
 
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
 
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    // --------------------------------------------------------------------------------
+    // Function : privFileDescrExpand()
+    // Description :
+    //   This method look for each item of the list to see if its a file, a folder
+    //   or a string to be added as file. For any other type of files (link, other)
+    //   just ignore the item.
+    //   Then prepare the information that will be stored for that file.
+    //   When its a folder, expand the folder with all the files that are in that
+    //   folder (recursively).
+    // Parameters :
+    // Return Values :
+    //   1 on success.
+    //   0 on failure.
+    // --------------------------------------------------------------------------------
+    public function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Create a result list
+        $v_result_list = array();
+
+        // ----- Look each entry
+        for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
+
+            // ----- Get filedescr
+            $v_descr = $p_filedescr_list[$i];
+
+            // ----- Reduce the filename
+            $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+            $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+
+            // ----- Look for real file or folder
+            if (file_exists($v_descr['filename'])) {
+                if (@is_file($v_descr['filename'])) {
+                    $v_descr['type'] = 'file';
+                } elseif (@is_dir($v_descr['filename'])) {
+                    $v_descr['type'] = 'folder';
+                } elseif (@is_link($v_descr['filename'])) {
+                    // skip
+                    continue;
+                } else {
+                    // skip
+                    continue;
+                }
+
+            // ----- Look for string added as file
+            } elseif (isset($v_descr['content'])) {
+                $v_descr['type'] = 'virtual_file';
+
+            // ----- Missing file
+            } else {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $v_descr['filename'] . "' does not exist");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Calculate the stored filename
+            $this->privCalculateStoredFilename($v_descr, $p_options);
+
+            // ----- Add the descriptor in result list
+            $v_result_list[sizeof($v_result_list)] = $v_descr;
+
+            // ----- Look for folder
+            if ($v_descr['type'] == 'folder') {
+                // ----- List of items in folder
+                $v_dirlist_descr = array();
+                $v_dirlist_nb    = 0;
+                if ($v_folder_handler = @opendir($v_descr['filename'])) {
+                    while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+                        // ----- Skip '.' and '..'
+                        if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                            continue;
+                        }
+
+                        // ----- Compose the full filename
+                        $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'] . '/' . $v_item_handler;
+
+                        // ----- Look for different stored filename
+                        // Because the name of the folder was changed, the name of the
+                        // files/sub-folders also change
+                        if (($v_descr['stored_filename'] != $v_descr['filename']) && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+                            if ($v_descr['stored_filename'] != '') {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'] . '/' . $v_item_handler;
+                            } else {
+                                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+                            }
+                        }
+
+                        $v_dirlist_nb++;
+                    }
+
+                    @closedir($v_folder_handler);
+                } else {
+                    // TBC : unable to open folder in read mode
+                }
+
+                // ----- Expand each element of the list
+                if ($v_dirlist_nb != 0) {
+                    // ----- Expand
+                    if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+                        return $v_result;
+                    }
+
+                    // ----- Concat the resulting list
+                    $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+                } else {
+                }
+
+                // ----- Free local array
+                unset($v_dirlist_descr);
+            }
         }
 
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        // ----- Get the result list
+        $p_filedescr_list = $v_result_list;
 
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCreate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the file in write mode
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Add the list of files
+        $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+        // ----- Close
+        $this->privCloseFd();
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAdd()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Look if the archive exists or is empty
+        if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0)) {
+
+            // ----- Do a create
+            $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+            // ----- Return
+            return $v_result;
+        }
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
 
             // ----- Return
             return $v_result;
         }
 
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    fclose($v_zip_temp_fd);
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = $v_central_dir['comment'];
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+            $v_comment = $v_comment . $p_options[PCLZIP_OPT_ADD_COMMENT];
+        }
+        if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT] . $v_comment;
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count + $v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
         // ----- Close
-        $v_temp_zip->privCloseFd();
         $this->privCloseFd();
 
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
         // ----- Delete the zip file
         // TBC : I should test the result ...
         @unlink($this->zipname);
@@ -4954,544 +2269,2964 @@
         //@rename($v_zip_temp_name, $this->zipname);
         PclZipUtilRename($v_zip_temp_name, $this->zipname);
 
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
+    // --------------------------------------------------------------------------------
+    // Function : privOpenFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privOpenFd($p_mode)
+    {
+        $v_result = 1;
+
+        // ----- Look if already open
+        if ($this->zip_fd != 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \'' . $this->zipname . '\' already open');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in ' . $p_mode . ' mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCloseFd()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privCloseFd()
+    {
+        $v_result = 1;
+
+        if ($this->zip_fd != 0) {
+            @fclose($this->zip_fd);
+        }
+        $this->zip_fd = 0;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddList()
+    // Description :
+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+    //   different from the real path of the file. This is usefull if you want to have PclTar
+    //   running in any directory, and memorize relative path from an other directory.
+    // Parameters :
+    //   $p_list : An array containing the file or directory names to add in the tar
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    //   $p_add_dir : Path to add in the filename path archived
+    //   $p_remove_dir : Path to remove in the filename path archived
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+    public function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Add the files
+        $v_header_list = array();
+        if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($this->zip_fd);
+
+        // ----- Create the Central Dir files header
+        for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if ($v_header_list[$i]['status'] == 'ok') {
+                if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Return
+                    return $v_result;
+                }
+                $v_count++;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($this->zip_fd) - $v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileList()
+    // Description :
+    // Parameters :
+    //   $p_filedescr_list : An array containing the file description
+    //                      or directory names to add in the zip
+    //   $p_result_list : list of added files with their properties (specially the status field)
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+    {
+        $v_result = 1;
+        $v_header = array();
+
+        // ----- Recuperate the current number of elt in list
+        $v_nb = sizeof($p_result_list);
+
+        // ----- Loop on the files
+        for ($j = 0; ($j < sizeof($p_filedescr_list)) && ($v_result == 1); $j++) {
+            // ----- Format the filename
+            $p_filedescr_list[$j]['filename'] = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+
+            // ----- Skip empty file names
+            // TBC : Can this be possible ? not checked in DescrParseAtt ?
+            if ($p_filedescr_list[$j]['filename'] == "") {
+                continue;
+            }
+
+            // ----- Check the filename
+            if (($p_filedescr_list[$j]['type'] != 'virtual_file') && (!file_exists($p_filedescr_list[$j]['filename']))) {
+                PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '" . $p_filedescr_list[$j]['filename'] . "' does not exist");
+
+                return PclZip::errorCode();
+            }
+
+            // ----- Look if it is a file or a dir with no all path remove option
+            // or a dir with all its path removed
+            //      if (   (is_file($p_filedescr_list[$j]['filename']))
+            //          || (   is_dir($p_filedescr_list[$j]['filename'])
+            if (($p_filedescr_list[$j]['type'] == 'file') || ($p_filedescr_list[$j]['type'] == 'virtual_file') || (($p_filedescr_list[$j]['type'] == 'folder') && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]) || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+
+                // ----- Add the file
+                $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header, $p_options);
+                if ($v_result != 1) {
+                    return $v_result;
+                }
+
+                // ----- Store the file infos
+                $p_result_list[$v_nb++] = $v_header;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // TBC : Already done in the fileAtt check ... ?
+        if ($p_filename == "") {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Look for a stored different filename
+        /* TBC : Removed
+        if (isset($p_filedescr['stored_filename'])) {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        } else {
+        $v_stored_filename = $p_filedescr['stored_filename'];
+        }
+        */
+
+        // ----- Set the file properties
+        clearstatcache();
+        $p_header['version']           = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag']              = 0;
+        $p_header['compression']       = 0;
+        $p_header['crc']               = 0;
+        $p_header['compressed_size']   = 0;
+        $p_header['filename_len']      = strlen($p_filename);
+        $p_header['extra_len']         = 0;
+        $p_header['disk']              = 0;
+        $p_header['internal']          = 0;
+        $p_header['offset']            = 0;
+        $p_header['filename']          = $p_filename;
+        // TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['stored_filename']   = $p_filedescr['stored_filename'];
+        $p_header['extra']             = '';
+        $p_header['status']            = 'ok';
+        $p_header['index']             = -1;
+
+        // ----- Look for regular file
+        if ($p_filedescr['type'] == 'file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for regular folder
+        } elseif ($p_filedescr['type'] == 'folder') {
+            $p_header['external'] = 0x00000010;
+            $p_header['mtime']    = filemtime($p_filename);
+            $p_header['size']     = filesize($p_filename);
+
+        // ----- Look for virtual file
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['external'] = 0x00000000;
+            $p_header['size']     = strlen($p_filedescr['content']);
+        }
+
+        // ----- Look for filetime
+        if (isset($p_filedescr['mtime'])) {
+            $p_header['mtime'] = $p_filedescr['mtime'];
+        } elseif ($p_filedescr['type'] == 'virtual_file') {
+            $p_header['mtime'] = time();
+        } else {
+            $p_header['mtime'] = filemtime($p_filename);
+        }
+
+        // ------ Look for file comment
+        if (isset($p_filedescr['comment'])) {
+            $p_header['comment_len'] = strlen($p_filedescr['comment']);
+            $p_header['comment']     = $p_filedescr['comment'];
+        } else {
+            $p_header['comment_len'] = 0;
+            $p_header['comment']     = '';
+        }
+
+        // ----- Look for pre-add callback
+        if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_header['status'] = "skipped";
+                $v_result           = 1;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+                $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+            }
+        }
+
+        // ----- Look for empty stored filename
+        if ($p_header['stored_filename'] == "") {
+            $p_header['status'] = "filtered";
+        }
+
+        // ----- Check the path length
+        if (strlen($p_header['stored_filename']) > 0xFF) {
+            $p_header['status'] = 'filename_too_long';
+        }
+
+        // ----- Look if no error, or file not skipped
+        if ($p_header['status'] == 'ok') {
+
+            // ----- Look for a file
+            if ($p_filedescr['type'] == 'file') {
+                // ----- Look for using temporary file to zip
+                if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])))) {
+                    $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+                    if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                        return $v_result;
+                    }
+
+                // ----- Use "in memory" zip algo
+                } else {
+
+                    // ----- Open the source file
+                    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Read the file content
+                    $v_content = @fread($v_file, $p_header['size']);
+
+                    // ----- Close the file
+                    @fclose($v_file);
+
+                    // ----- Calculate the CRC
+                    $p_header['crc'] = @crc32($v_content);
+
+                    // ----- Look for no compression
+                    if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = $p_header['size'];
+                        $p_header['compression']     = 0;
+
+                    // ----- Look for normal compression
+                    } else {
+                        // ----- Compress the content
+                        $v_content = @gzdeflate($v_content);
+
+                        // ----- Set header parameters
+                        $p_header['compressed_size'] = strlen($v_content);
+                        $p_header['compression']     = 8;
+                    }
+
+                    // ----- Call the header generation
+                    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                        @fclose($v_file);
+
+                        return $v_result;
+                    }
+
+                    // ----- Write the compressed (or not) content
+                    @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+                }
+
+            // ----- Look for a virtual file (a file from string)
+            } elseif ($p_filedescr['type'] == 'virtual_file') {
+
+                $v_content = $p_filedescr['content'];
+
+                // ----- Calculate the CRC
+                $p_header['crc'] = @crc32($v_content);
+
+                // ----- Look for no compression
+                if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = $p_header['size'];
+                    $p_header['compression']     = 0;
+
+                // ----- Look for normal compression
+                } else {
+                    // ----- Compress the content
+                    $v_content = @gzdeflate($v_content);
+
+                    // ----- Set header parameters
+                    $p_header['compressed_size'] = strlen($v_content);
+                    $p_header['compression']     = 8;
+                }
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    @fclose($v_file);
+
+                    return $v_result;
+                }
+
+                // ----- Write the compressed (or not) content
+                @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+            // ----- Look for a directory
+            } elseif ($p_filedescr['type'] == 'folder') {
+                // ----- Look for directory last '/'
+                if (@substr($p_header['stored_filename'], -1) != '/') {
+                    $p_header['stored_filename'] .= '/';
+                }
+
+                // ----- Set the file properties
+                $p_header['size']     = 0;
+                //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+                $p_header['external'] = 0x00000010; // Value for a folder : to be checked
+
+                // ----- Call the header generation
+                if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Look for post-add callback
+        if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Ignored
+                $v_result = 1;
+            }
+
+            // ----- Update the informations
+            // Nothing can be modified
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privAddFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+    {
+        $v_result = PCLZIP_ERR_NO_ERROR;
+
+        // ----- Working variable
+        $p_filename = $p_filedescr['filename'];
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Creates a compressed temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = filesize($p_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file);
+        @gzclose($v_file_compressed);
+
+        // ----- Check the minimum file size
+        if (filesize($v_gzip_temp_name) < 18) {
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \'' . $v_gzip_temp_name . '\' has invalid filesize - should be minimum 18 bytes');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the compressed attributes
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the gzip file header
+        $v_binary_data = @fread($v_file_compressed, 10);
+        $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+        // ----- Check some parameters
+        $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+        // ----- Read the gzip file footer
+        @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
+        $v_binary_data = @fread($v_file_compressed, 8);
+        $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+        // ----- Set the attributes
+        $p_header['compression']     = ord($v_data_header['cm']);
+        //$p_header['mtime'] = $v_data_header['mtime'];
+        $p_header['crc']             = $v_data_footer['crc'];
+        $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Add the compressed data
+        if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        fseek($v_file_compressed, 10);
+        $v_size = $p_header['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($v_file_compressed, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close the file
+        @fclose($v_file_compressed);
+
+        // ----- Unlink the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCalculateStoredFilename()
+    // Description :
+    //   Based on file descriptor properties and global options, this method
+    //   calculate the filename that will be stored in the archive.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Working variables
+        $p_filename = $p_filedescr['filename'];
+        if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+            $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+        } else {
+            $p_add_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+            $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+        } else {
+            $p_remove_dir = '';
+        }
+        if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+            $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        } else {
+            $p_remove_all_dir = 0;
+        }
+
+        // ----- Look for full name change
+        if (isset($p_filedescr['new_full_name'])) {
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+
+        // ----- Look for path and/or short name change
+        } else {
+
+            // ----- Look for short name change
+            // Its when we cahnge just the filename but not the path
+            if (isset($p_filedescr['new_short_name'])) {
+                $v_path_info = pathinfo($p_filename);
+                $v_dir       = '';
+                if ($v_path_info['dirname'] != '') {
+                    $v_dir = $v_path_info['dirname'] . '/';
+                }
+                $v_stored_filename = $v_dir . $p_filedescr['new_short_name'];
+            } else {
+                // ----- Calculate the stored filename
+                $v_stored_filename = $p_filename;
+            }
+
+            // ----- Look for all path to remove
+            if ($p_remove_all_dir) {
+                $v_stored_filename = basename($p_filename);
+
+            // ----- Look for partial path remove
+            } elseif ($p_remove_dir != "") {
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= "/";
+                }
+
+                if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./")) {
+
+                    if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./")) {
+                        $p_remove_dir = "./" . $p_remove_dir;
+                    }
+                    if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./")) {
+                        $p_remove_dir = substr($p_remove_dir, 2);
+                    }
+                }
+
+                $v_compare = PclZipUtilPathInclusion($p_remove_dir, $v_stored_filename);
+                if ($v_compare > 0) {
+                    if ($v_compare == 2) {
+                        $v_stored_filename = "";
+                    } else {
+                        $v_stored_filename = substr($v_stored_filename, strlen($p_remove_dir));
+                    }
+                }
+            }
+
+            // ----- Remove drive letter if any
+            $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+
+            // ----- Look for path to add
+            if ($p_add_dir != "") {
+                if (substr($p_add_dir, -1) == "/") {
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir . "/" . $v_stored_filename;
+                }
+            }
+        }
+
+        // ----- Filename (reduce the path of stored name)
+        $v_stored_filename              = PclZipUtilPathReduction($v_stored_filename);
+        $p_filedescr['stored_filename'] = $v_stored_filename;
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Store the offset position of the file
+        $p_header['offset'] = ftell($this->zip_fd);
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len']);
+
+        // ----- Write the first 148 bytes of the header in the archive
+        fputs($this->zip_fd, $v_binary_data, 30);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // TBC
+        //for (reset($p_header); $key = key($p_header); next($p_header)) {
+        //}
+
+        // ----- Transform UNIX mtime to DOS format mdate/mtime
+        $v_date  = getdate($p_header['mtime']);
+        $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+        $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'], $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'], $p_header['compressed_size'], $p_header['size'], strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'], $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
+
+        // ----- Write the 42 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 46);
+
+        // ----- Write the variable fields
+        if (strlen($p_header['stored_filename']) != 0) {
+            fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+        }
+        if ($p_header['extra_len'] != 0) {
+            fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privWriteCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+    {
+        $v_result = 1;
+
+        // ----- Packed data
+        $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
+
+        // ----- Write the 22 bytes of the header in the zip file
+        fputs($this->zip_fd, $v_binary_data, 22);
+
+        // ----- Write the variable fields
+        if (strlen($p_comment) != 0) {
+            fputs($this->zip_fd, $p_comment, strlen($p_comment));
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privList()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privList(&$p_list)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Open the zip file
+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0) {
+            // ----- Magic quotes trick
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \'' . $this->zipname . '\' in binary read mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of Central Dir
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_central_dir['offset'])) {
+            $this->privSwapBackMagicQuotes();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        for ($i = 0; $i < $v_central_dir['entries']; $i++) {
+            // ----- Read the file header
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+            $v_header['index'] = $i;
+
+            // ----- Get the only interesting attributes
+            $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+            unset($v_header);
+        }
+
+        // ----- Close the zip file
         $this->privCloseFd();
 
+        // ----- Magic quotes trick
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privConvertHeader2FileInfo()
+    // Description :
+    //   This function takes the file informations from the central directory
+    //   entries and extract the interesting parameters that will be given back.
+    //   The resulting file infos are set in the array $p_info
+    //     $p_info['filename'] : Filename with full path. Given by user (add),
+    //                           extracted in the filesystem (extract).
+    //     $p_info['stored_filename'] : Stored filename in the archive.
+    //     $p_info['size'] = Size of the file.
+    //     $p_info['compressed_size'] = Compressed size of the file.
+    //     $p_info['mtime'] = Last modification date of the file.
+    //     $p_info['comment'] = Comment associated with the file.
+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+    //     $p_info['status'] = status of the action on the file.
+    //     $p_info['crc'] = CRC of the file content.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privConvertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result = 1;
+
+        // ----- Get the interesting attributes
+        $v_temp_path               = PclZipUtilPathReduction($p_header['filename']);
+        $p_info['filename']        = $v_temp_path;
+        $v_temp_path               = PclZipUtilPathReduction($p_header['stored_filename']);
+        $p_info['stored_filename'] = $v_temp_path;
+        $p_info['size']            = $p_header['size'];
+        $p_info['compressed_size'] = $p_header['compressed_size'];
+        $p_info['mtime']           = $p_header['mtime'];
+        $p_info['comment']         = $p_header['comment'];
+        $p_info['folder']          = (($p_header['external'] & 0x00000010) == 0x00000010);
+        $p_info['index']           = $p_header['index'];
+        $p_info['status']          = $p_header['status'];
+        $p_info['crc']             = $p_header['crc'];
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractByRule()
+    // Description :
+    //   Extract a file or directory depending of rules (by index, by name, ...)
+    // Parameters :
+    //   $p_file_list : An array where will be placed the properties of each
+    //                  extracted file
+    //   $p_path : Path to add while writing the extracted files
+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+    //                    extracted files. If the path does not match the file path,
+    //                    the file is extracted with its memorized path.
+    //                    $p_remove_path does not apply to 'list' mode.
+    //                    $p_path and $p_remove_path are commulative.
+    // Return Values :
+    //   1 on success,0 or less on error (see error code list)
+    // --------------------------------------------------------------------------------
+    public function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Magic quotes trick
+        $this->privDisableMagicQuotes();
+
+        // ----- Check the path
+        if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../") && (substr($p_path, 1, 2) != ":/"))) {
+            $p_path = "./" . $p_path;
+        }
+
+        // ----- Reduce the path last (and duplicated) '/'
+        if (($p_path != "./") && ($p_path != "/")) {
+            // ----- Look for the path end '/'
+            while (substr($p_path, -1) == "/") {
+                $p_path = substr($p_path, 0, strlen($p_path) - 1);
+            }
+        }
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+        }
+
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+
+        // ----- Read each entry
+        $j_start = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read next Central dir entry
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd, $v_pos_entry)) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_header = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $this->privSwapBackMagicQuotes();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header['index'] = $i;
+
+            // ----- Store the file position
+            $v_pos_entry = ftell($this->zip_fd);
+
+            // ----- Look for the specific extract rules
+            $v_extract = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_extract = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_extract = true;
+                    }
+                }
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+            $v_extract = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+                    $v_extract = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_extract = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+
+            // ----- Look for no rule, which means extract all the archive
+            } else {
+                $v_extract = true;
+            }
+
+            // ----- Check compression method
+            if (($v_extract) && (($v_header['compression'] != 8) && ($v_header['compression'] != 0))) {
+                $v_header['status'] = 'unsupported_compression';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION, "Filename '" . $v_header['stored_filename'] . "' is " . "compressed by an unsupported compression " . "method (" . $v_header['compression'] . ") ");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Check encrypted files
+            if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+                $v_header['status'] = 'unsupported_encryption';
+
+                // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                    $this->privSwapBackMagicQuotes();
+
+                    PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, "Unsupported encryption for " . " filename '" . $v_header['stored_filename'] . "'");
+
+                    return PclZip::errorCode();
+                }
+            }
+
+            // ----- Look for real extraction
+            if (($v_extract) && ($v_header['status'] != 'ok')) {
+                $v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++]);
+                if ($v_result != 1) {
+                    $this->privCloseFd();
+                    $this->privSwapBackMagicQuotes();
+
+                    return $v_result;
+                }
+
+                $v_extract = false;
+            }
+
+            // ----- Look for real extraction
+            if ($v_extract) {
+
+                // ----- Go to the file position
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+
+                    $this->privSwapBackMagicQuotes();
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Look for extraction as string
+                if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+                    $v_string = '';
+
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Set the file content
+                    $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+                    // ----- Next extracted file
+                    $v_nb_extracted++;
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for extraction in standard output
+                } elseif ((isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    // ----- Extracting the file in standard output
+                    $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+
+                // ----- Look for normal extraction
+                } else {
+                    // ----- Extracting the file
+                    $v_result1 = $this->privExtractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_options);
+                    if ($v_result1 < 1) {
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result1;
+                    }
+
+                    // ----- Get the only interesting attributes
+                    if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                        // ----- Close the zip file
+                        $this->privCloseFd();
+                        $this->privSwapBackMagicQuotes();
+
+                        return $v_result;
+                    }
+
+                    // ----- Look for user callback abort
+                    if ($v_result1 == 2) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //
+    // 1 : ... ?
+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+    // --------------------------------------------------------------------------------
+    public function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for all path to remove
+        if ($p_remove_all_path == true) {
+            // ----- Look for folder entry that not need to be extracted
+            if (($p_entry['external'] & 0x00000010) == 0x00000010) {
+
+                $p_entry['status'] = "filtered";
+
+                return $v_result;
+            }
+
+            // ----- Get the basename of the path
+            $p_entry['filename'] = basename($p_entry['filename']);
+
+        // ----- Look for path to remove
+        } elseif ($p_remove_path != "") {
+            if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+
+                // ----- Change the file status
+                $p_entry['status'] = "filtered";
+
+                // ----- Return
+                return $v_result;
+            }
+
+            $p_remove_path_size = strlen($p_remove_path);
+            if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path) {
+
+                // ----- Remove the path
+                $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+            }
+        }
+
+        // ----- Add the path
+        if ($p_path != '') {
+            $p_entry['filename'] = $p_path . "/" . $p_entry['filename'];
+        }
+
+        // ----- Check a base_dir_restriction
+        if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+            $v_inclusion = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], $p_entry['filename']);
+            if ($v_inclusion == 0) {
+
+                PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, "Filename '" . $p_entry['filename'] . "' is " . "outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Look for specific actions while the file exist
+            if (file_exists($p_entry['filename'])) {
+
+                // ----- Look if file is a directory
+                if (is_dir($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "already_a_directory";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY, "Filename '" . $p_entry['filename'] . "' is " . "already used by an existing directory");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if file is write protected
+                } elseif (!is_writeable($p_entry['filename'])) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "write_protected";
+
+                    // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                    // For historical reason first PclZip implementation does not stop
+                    // when this kind of error occurs.
+                    if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Filename '" . $p_entry['filename'] . "' exists " . "and is write protected");
+
+                        return PclZip::errorCode();
+                    }
+
+                // ----- Look if the extracted file is older
+                } elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+                    // ----- Change the file status
+                    if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER])) && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
+                    } else {
+                        $p_entry['status'] = "newer_exist";
+
+                        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+                        // For historical reason first PclZip implementation does not stop
+                        // when this kind of error occurs.
+                        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR])) && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
+
+                            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, "Newer version of '" . $p_entry['filename'] . "' exists " . "and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                            return PclZip::errorCode();
+                        }
+                    }
+                } else {
+                }
+
+            // ----- Check the directory availability and create it if necessary
+            } else {
+                if ((($p_entry['external'] & 0x00000010) == 0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+                    $v_dir_to_check = $p_entry['filename'];
+                } elseif (!strstr($p_entry['filename'], "/")) {
+                    $v_dir_to_check = "";
+                } else {
+                    $v_dir_to_check = dirname($p_entry['filename']);
+                }
+
+                if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external'] & 0x00000010) == 0x00000010))) != 1) {
+
+                    // ----- Change the file status
+                    $p_entry['status'] = "path_creation_fail";
+
+                    // ----- Return
+                    //return $v_result;
+                    $v_result = 1;
+                }
+            }
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Opening destination file
+                    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                        // ----- Change the file status
+                        $p_entry['status'] = "write_error";
+
+                        // ----- Return
+                        return $v_result;
+                    }
+
+                    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+                    $v_size = $p_entry['compressed_size'];
+                    while ($v_size != 0) {
+                        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+                        $v_buffer    = @fread($this->zip_fd, $v_read_size);
+                        /* Try to speed up the code
+                        $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+                        @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+                        */
+                        @fwrite($v_dest_file, $v_buffer, $v_read_size);
+                        $v_size -= $v_read_size;
+                    }
+
+                    // ----- Closing the destination file
+                    fclose($v_dest_file);
+
+                    // ----- Change the file mtime
+                    touch($p_entry['filename'], $p_entry['mtime']);
+
+                } else {
+                    // ----- TBC
+                    // Need to be finished
+                    if (($p_entry['flag'] & 1) == 1) {
+                        PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \'' . $p_entry['filename'] . '\' is encrypted. Encrypted files are not supported.');
+
+                        return PclZip::errorCode();
+                    }
+
+                    // ----- Look for using temporary file to unzip
+                    if ((!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON]) || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]) && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])))) {
+                        $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+                        if ($v_result < PCLZIP_ERR_NO_ERROR) {
+                            return $v_result;
+                        }
+
+                    // ----- Look for extract in memory
+                    } else {
+
+                        // ----- Read the compressed file in a buffer (one shot)
+                        $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                        // ----- Decompress the file
+                        $v_file_content = @gzinflate($v_buffer);
+                        unset($v_buffer);
+                        if ($v_file_content === false) {
+
+                            // ----- Change the file status
+                            // TBC
+                            $p_entry['status'] = "error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Opening destination file
+                        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+
+                            // ----- Change the file status
+                            $p_entry['status'] = "write_error";
+
+                            return $v_result;
+                        }
+
+                        // ----- Write the uncompressed data
+                        @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+                        unset($v_file_content);
+
+                        // ----- Closing the destination file
+                        @fclose($v_dest_file);
+
+                    }
+
+                    // ----- Change the file mtime
+                    @touch($p_entry['filename'], $p_entry['mtime']);
+                }
+
+                // ----- Look for chmod option
+                if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+                    // ----- Change the mode of the file
+                    @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+                }
+
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileUsingTempFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Creates a temporary file
+        $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.gz';
+        if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+            fclose($v_file);
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary write mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Write gz file format header
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        @fwrite($v_dest_file, $v_binary_data, 10);
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['compressed_size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Write gz file format footer
+        $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+        @fwrite($v_dest_file, $v_binary_data, 8);
+
+        // ----- Close the temporary file
+        @fclose($v_dest_file);
+
+        // ----- Opening destination file
+        if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+            $p_entry['status'] = "write_error";
+
+            return $v_result;
+        }
+
+        // ----- Open the temporary gz file
+        if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
+            @fclose($v_dest_file);
+            $p_entry['status'] = "read_error";
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_gzip_temp_name . '\' in binary read mode');
+
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+        $v_size = $p_entry['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($v_src_file, $v_read_size);
+            //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+        @fclose($v_dest_file);
+        @gzclose($v_src_file);
+
+        // ----- Delete the temporary file
+        @unlink($v_gzip_temp_name);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileInOutput()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileInOutput(&$p_entry, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Trace
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+                    // ----- Read the file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Send the file to the output
+                    echo $v_buffer;
+                    unset($v_buffer);
+                } else {
+
+                    // ----- Read the compressed file in a buffer (one shot)
+                    $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    $v_file_content = gzinflate($v_buffer);
+                    unset($v_buffer);
+
+                    // ----- Send the file to the output
+                    echo $v_file_content;
+                    unset($v_file_content);
+                }
+            }
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privExtractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+    {
+        $v_result = 1;
+
+        // ----- Read the file header
+        $v_header = array();
+        if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Check that the file header is coherent with $p_entry info
+        if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+            // TBC
+        }
+
+        // ----- Look for pre-extract callback
+        if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+            if ($v_result == 0) {
+                // ----- Change the file status
+                $p_entry['status'] = "skipped";
+                $v_result          = 1;
+            }
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                // ----- This status is internal and will be changed in 'skipped'
+                $p_entry['status'] = "aborted";
+                $v_result          = PCLZIP_ERR_USER_ABORTED;
+            }
+
+            // ----- Update the informations
+            // Only some fields can be modified
+            $p_entry['filename'] = $v_local_header['filename'];
+        }
+
+        // ----- Look if extraction should be done
+        if ($p_entry['status'] == 'ok') {
+
+            // ----- Do the extraction (if not a folder)
+            if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
+                // ----- Look for not compressed file
+                //      if ($p_entry['compressed_size'] == $p_entry['size'])
+                if ($p_entry['compression'] == 0) {
+
+                    // ----- Reading the file
+                    $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+                } else {
+
+                    // ----- Reading the file
+                    $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+                    // ----- Decompress the file
+                    if (($p_string = @gzinflate($v_data)) === false) {
+                        // TBC
+                    }
+                }
+
+                // ----- Trace
+            } else {
+                // TBC : error : can not extract a folder in a string
+            }
+
+        }
+
+        // ----- Change abort status
+        if ($p_entry['status'] == "aborted") {
+            $p_entry['status'] = "skipped";
+
+        // ----- Look for post-extract callback
+        } elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+            // ----- Generate a local information
+            $v_local_header = array();
+            $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+            // ----- Swap the content to header
+            $v_local_header['content'] = $p_string;
+            $p_string                  = '';
+
+            // ----- Call the callback
+            // Here I do not use call_user_func() because I need to send a reference to the
+            // header.
+            //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+            $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+            // ----- Swap back the content to header
+            $p_string = $v_local_header['content'];
+            unset($v_local_header['content']);
+
+            // ----- Look for abort result
+            if ($v_result == 2) {
+                $v_result = PCLZIP_ERR_USER_ABORTED;
+            }
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x04034b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 26);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 26) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+        // ----- Get filename
+        $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+        // ----- Get extra_fields
+        if ($v_data['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Extract properties
+        $p_header['version_extracted'] = $v_data['version'];
+        $p_header['compression']       = $v_data['compression'];
+        $p_header['size']              = $v_data['size'];
+        $p_header['compressed_size']   = $v_data['compressed_size'];
+        $p_header['crc']               = $v_data['crc'];
+        $p_header['flag']              = $v_data['flag'];
+        $p_header['filename_len']      = $v_data['filename_len'];
+
+        // ----- Recuperate date in UNIX format
+        $p_header['mdate'] = $v_data['mdate'];
+        $p_header['mtime'] = $v_data['mtime'];
+        if ($p_header['mdate'] && $p_header['mtime']) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // TBC
+        //for (reset($v_data); $key = key($v_data); next($v_data)) {
+        //}
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set the status field
+        $p_header['status'] = "ok";
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadCentralFileHeader(&$p_header)
+    {
+        $v_result = 1;
+
+        // ----- Read the 4 bytes signature
+        $v_binary_data = @fread($this->zip_fd, 4);
+        $v_data        = unpack('Vid', $v_binary_data);
+
+        // ----- Check signature
+        if ($v_data['id'] != 0x02014b50) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read the first 42 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 42);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 42) {
+            $p_header['filename'] = "";
+            $p_header['status']   = "invalid_header";
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+        // ----- Get filename
+        if ($p_header['filename_len'] != 0) {
+            $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        } else {
+            $p_header['filename'] = '';
+        }
+
+        // ----- Get extra
+        if ($p_header['extra_len'] != 0) {
+            $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+        } else {
+            $p_header['extra'] = '';
+        }
+
+        // ----- Get comment
+        if ($p_header['comment_len'] != 0) {
+            $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+        } else {
+            $p_header['comment'] = '';
+        }
+
+        // ----- Extract properties
+
+        // ----- Recuperate date in UNIX format
+        //if ($p_header['mdate'] && $p_header['mtime'])
+        // TBC : bug : this was ignoring time with 0/0/0
+        if (1) {
+            // ----- Extract time
+            $v_hour    = ($p_header['mtime'] & 0xF800) >> 11;
+            $v_minute  = ($p_header['mtime'] & 0x07E0) >> 5;
+            $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
+
+            // ----- Extract date
+            $v_year  = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+            $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+            $v_day   = $p_header['mdate'] & 0x001F;
+
+            // ----- Get UNIX date format
+            $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+        } else {
+            $p_header['mtime'] = time();
+        }
+
+        // ----- Set the stored filename
+        $p_header['stored_filename'] = $p_header['filename'];
+
+        // ----- Set default status to ok
+        $p_header['status'] = 'ok';
+
+        // ----- Look if it is a directory
+        if (substr($p_header['filename'], -1) == '/') {
+            //$p_header['external'] = 0x41FF0010;
+            $p_header['external'] = 0x00000010;
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privCheckFileHeaders()
+    // Description :
+    // Parameters :
+    // Return Values :
+    //   1 on success,
+    //   0 on error;
+    // --------------------------------------------------------------------------------
+    public function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+    {
+        $v_result = 1;
+
+        // ----- Check the static values
+        // TBC
+        if ($p_local_header['filename'] != $p_central_header['filename']) {
+        }
+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+        }
+        if ($p_local_header['flag'] != $p_central_header['flag']) {
+        }
+        if ($p_local_header['compression'] != $p_central_header['compression']) {
+        }
+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+        }
+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+        }
+
+        // ----- Look for flag bit 3
+        if (($p_local_header['flag'] & 8) == 8) {
+            $p_local_header['size']            = $p_central_header['size'];
+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+            $p_local_header['crc']             = $p_central_header['crc'];
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privReadEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privReadEndCentralDir(&$p_central_dir)
+    {
+        $v_result = 1;
+
+        // ----- Go to the end of the zip file
+        $v_size = filesize($this->zipname);
+        @fseek($this->zip_fd, $v_size);
+        if (@ftell($this->zip_fd) != $v_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \'' . $this->zipname . '\'');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- First try : look if this is an archive with no commentaries (most of the time)
+        // in this case the end of central dir is at 22 bytes of the file end
+        $v_found = 0;
+        if ($v_size > 26) {
+            @fseek($this->zip_fd, $v_size - 22);
+            if (($v_pos = @ftell($this->zip_fd)) != ($v_size - 22)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read for bytes
+            $v_binary_data = @fread($this->zip_fd, 4);
+            $v_data        = @unpack('Vid', $v_binary_data);
+
+            // ----- Check signature
+            if ($v_data['id'] == 0x06054b50) {
+                $v_found = 1;
+            }
+
+            $v_pos = ftell($this->zip_fd);
+        }
+
+        // ----- Go back to the maximum possible size of the Central Dir End Record
+        if (!$v_found) {
+            $v_maximum_size = 65557; // 0xFFFF + 22;
+            if ($v_maximum_size > $v_size) {
+                $v_maximum_size = $v_size;
+            }
+            @fseek($this->zip_fd, $v_size - $v_maximum_size);
+            if (@ftell($this->zip_fd) != ($v_size - $v_maximum_size)) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \'' . $this->zipname . '\'');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read byte per byte in order to find the signature
+            $v_pos   = ftell($this->zip_fd);
+            $v_bytes = 0x00000000;
+            while ($v_pos < $v_size) {
+                // ----- Read a byte
+                $v_byte = @fread($this->zip_fd, 1);
+
+                // -----  Add the byte
+                //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+                // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+                // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+
+                // ----- Compare the bytes
+                if ($v_bytes == 0x504b0506) {
+                    $v_pos++;
+                    break;
+                }
+
+                $v_pos++;
+            }
+
+            // ----- Look if not found end of central dir
+            if ($v_pos == $v_size) {
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Read the first 18 bytes of the header
+        $v_binary_data = fread($this->zip_fd, 18);
+
+        // ----- Look for invalid block size
+        if (strlen($v_binary_data) != 18) {
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : " . strlen($v_binary_data));
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Extract the values
+        $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+        // ----- Check the global size
+        if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+            // ----- Removed in release 2.2 see readme file
+            // The check of the file size is a little too strict.
+            // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+            // While decrypted, zip has training 0 bytes
+            if (0) {
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'The central dir is not at the end of the archive.' . ' Some trailing bytes exists after the archive.');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+        }
+
+        // ----- Get comment
+        if ($v_data['comment_size'] != 0) {
+            $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+        } else {
+            $p_central_dir['comment'] = '';
+        }
+
+        $p_central_dir['entries']      = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset']       = $v_data['offset'];
+        $p_central_dir['size']         = $v_data['size'];
+        $p_central_dir['disk']         = $v_data['disk'];
+        $p_central_dir['disk_start']   = $v_data['disk_start'];
+
+        // TBC
+        //for (reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+        //}
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDeleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDeleteByRule(&$p_result_list, &$p_options)
+    {
+        $v_result      = 1;
+        $v_list_detail = array();
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Scan all the files
+        // ----- Start at beginning of Central Dir
+        $v_pos_entry = $v_central_dir['offset'];
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_pos_entry)) {
+            // ----- Close the zip file
+            $this->privCloseFd();
+
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Read each entry
+        $v_header_list = array();
+        $j_start       = 0;
+        for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++) {
+
+            // ----- Read the file header
+            $v_header_list[$v_nb_extracted] = array();
+            if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+
+                return $v_result;
+            }
+
+            // ----- Store the index
+            $v_header_list[$v_nb_extracted]['index'] = $i;
+
+            // ----- Look for the specific extract rules
+            $v_found = false;
+
+            // ----- Look for extract by name rule
+            if ((isset($p_options[PCLZIP_OPT_BY_NAME])) && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+                // ----- Look if the filename is in the list
+                for ($j = 0; ($j < sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+                    // ----- Look for a directory
+                    if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        } elseif ((($v_header_list[$v_nb_extracted]['external'] & 0x00000010) == 0x00000010) /* Indicates a folder */ && ($v_header_list[$v_nb_extracted]['stored_filename'] . '/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                            $v_found = true;
+                        }
+
+                    // ----- Look for a filename
+                    } elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                        $v_found = true;
+                    }
+                }
+
+            // ----- Look for extract by ereg rule
+            // ereg() is deprecated with PHP 5.3
+            /*
+            elseif (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+            && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+            if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+            $v_found = true;
+            }
+            }
+            */
+
+            // ----- Look for extract by preg rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_PREG])) && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+                if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                    $v_found = true;
+                }
+
+            // ----- Look for extract by index rule
+            } elseif ((isset($p_options[PCLZIP_OPT_BY_INDEX])) && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+                // ----- Look if the index is in the list
+                for ($j = $j_start; ($j < sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+                    if (($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i <= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                        $v_found = true;
+                    }
+                    if ($i >= $p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                        $j_start = $j + 1;
+                    }
+
+                    if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
+                        break;
+                    }
+                }
+            } else {
+                $v_found = true;
+            }
+
+            // ----- Look for deletion
+            if ($v_found) {
+                unset($v_header_list[$v_nb_extracted]);
+            } else {
+                $v_nb_extracted++;
+            }
+        }
+
+        // ----- Look if something need to be deleted
+        if ($v_nb_extracted > 0) {
+
+            // ----- Creates a temporay file
+            $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+            // ----- Creates a temporary zip archive
+            $v_temp_zip = new PclZip($v_zip_temp_name);
+
+            // ----- Open the temporary zip file in write mode
+            if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+                $this->privCloseFd();
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Look which file need to be kept
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+
+                // ----- Calculate the position of the header
+                @rewind($this->zip_fd);
+                if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Error log
+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                    // ----- Return
+                    return PclZip::errorCode();
+                }
+
+                // ----- Read the file header
+                $v_local_header = array();
+                if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Check that local file header is same as central file header
+                if ($this->privCheckFileHeaders($v_local_header, $v_header_list[$i]) != 1) {
+                    // TBC
+                }
+                unset($v_local_header);
+
+                // ----- Write the file header
+                if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Read/write the data block
+                if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                    // ----- Close the zip file
+                    $this->privCloseFd();
+                    $v_temp_zip->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+            }
+
+            // ----- Store the offset of the central dir
+            $v_offset = @ftell($v_temp_zip->zip_fd);
+
+            // ----- Re-Create the Central Dir files header
+            for ($i = 0; $i < sizeof($v_header_list); $i++) {
+                // ----- Create the file header
+                if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                    $v_temp_zip->privCloseFd();
+                    $this->privCloseFd();
+                    @unlink($v_zip_temp_name);
+
+                    // ----- Return
+                    return $v_result;
+                }
+
+                // ----- Transform the header to a 'usable' info
+                $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+            }
+
+            // ----- Zip file comment
+            $v_comment = '';
+            if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+                $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+            }
+
+            // ----- Calculate the size of the central header
+            $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
+
+            // ----- Create the central dir footer
+            if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+                // ----- Reset the file list
+                unset($v_header_list);
+                $v_temp_zip->privCloseFd();
+                $this->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Close
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+
+            // ----- Delete the zip file
+            // TBC : I should test the result ...
+            @unlink($this->zipname);
+
+            // ----- Rename the temporary file
+            // TBC : I should test the result ...
+            //@rename($v_zip_temp_name, $this->zipname);
+            PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+            // ----- Destroy the temporary archive
+            unset($v_temp_zip);
+
+        // ----- Remove every files : reset the file
+        } elseif ($v_central_dir['entries'] != 0) {
+            $this->privCloseFd();
+
+            if (($v_result = $this->privOpenFd('wb')) != 1) {
+                return $v_result;
+            }
+
+            if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+                return $v_result;
+            }
+
+            $this->privCloseFd();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDirCheck()
+    // Description :
+    //   Check if a directory exists, if not it creates it and all the parents directory
+    //   which may be useful.
+    // Parameters :
+    //   $p_dir : Directory path to check.
+    // Return Values :
+    //    1 : OK
+    //   -1 : Unable to create directory
+    // --------------------------------------------------------------------------------
+    public function privDirCheck($p_dir, $p_is_dir = false)
+    {
+        $v_result = 1;
+
+        // ----- Remove the final '/'
+        if (($p_is_dir) && (substr($p_dir, -1) == '/')) {
+            $p_dir = substr($p_dir, 0, strlen($p_dir) - 1);
+        }
+
+        // ----- Check the directory availability
+        if ((is_dir($p_dir)) || ($p_dir == "")) {
+            return 1;
+        }
+
+        // ----- Extract parent directory
+        $p_parent_dir = dirname($p_dir);
+
+        // ----- Just a check
+        if ($p_parent_dir != $p_dir) {
+            // ----- Look for parent directory
+            if ($p_parent_dir != "") {
+                if (($v_result = $this->privDirCheck($p_parent_dir)) != 1) {
+                    return $v_result;
+                }
+            }
+        }
+
+        // ----- Create the directory
+        if (!@mkdir($p_dir, 0777)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privMerge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privMerge(&$p_archive_to_add)
+    {
+        $v_result = 1;
+
+        // ----- Look if the archive_to_add exists
+        if (!is_file($p_archive_to_add->zipname)) {
+
+            // ----- Nothing to merge, so merge is a success
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look if the archive exists
+        if (!is_file($this->zipname)) {
+
+            // ----- Do a duplicate
+            $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
+        if (($v_result = $this->privOpenFd('rb')) != 1) {
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir = array();
+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1) {
+            $this->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($this->zip_fd);
+
+        // ----- Open the archive_to_add file
+        if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Read the central directory informations
+        $v_central_dir_to_add = array();
+        if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            return $v_result;
+        }
+
+        // ----- Go to beginning of File
+        @rewind($p_archive_to_add->zip_fd);
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR . uniqid('pclzip-') . '.tmp';
+
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \'' . $v_zip_temp_name . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
+        }
+
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = $v_central_dir['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the files from the archive_to_add into the temporary file
+        $v_size = $v_central_dir_to_add['offset'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_zip_temp_fd);
+
+        // ----- Copy the block of file headers from the old archive
+        $v_size = $v_central_dir['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($this->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Copy the block of file headers from the archive_to_add
+        $v_size = $v_central_dir_to_add['size'];
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_archive_to_add->zip_fd, $v_read_size);
+            @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Merge the file comments
+        $v_comment = $v_central_dir['comment'] . ' ' . $v_central_dir_to_add['comment'];
+
+        // ----- Calculate the size of the (new) central header
+        $v_size = @ftell($v_zip_temp_fd) - $v_offset;
+
+        // ----- Swap the file descriptor
+        // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+        // the following methods on the temporary fil and not the real archive fd
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Create the central dir footer
+        if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries'] + $v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1) {
+            $this->privCloseFd();
+            $p_archive_to_add->privCloseFd();
+            @fclose($v_zip_temp_fd);
+            $this->zip_fd = null;
+
+            // ----- Reset the file list
+            unset($v_header_list);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Swap back the file descriptor
+        $v_swap        = $this->zip_fd;
+        $this->zip_fd  = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
+
+        // ----- Close
+        $this->privCloseFd();
+        $p_archive_to_add->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+        // ----- Return
+        return $v_result;
+    }
+    // --------------------------------------------------------------------------------
+
+    // --------------------------------------------------------------------------------
+    // Function : privDuplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDuplicate($p_archive_filename)
+    {
+        $v_result = 1;
+
+        // ----- Look if the $p_archive_filename exists
+        if (!is_file($p_archive_filename)) {
+
+            // ----- Nothing to duplicate, so duplicate is a success.
+            $v_result = 1;
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Open the zip file
         if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
+            // ----- Return
+            return $v_result;
         }
 
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
+        // ----- Open the temporary file in write mode
+        if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
+            $this->privCloseFd();
+
+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \'' . $p_archive_filename . '\' in binary write mode');
+
+            // ----- Return
+            return PclZip::errorCode();
         }
 
+        // ----- Copy the files from the archive to the temporary file
+        // TBC : Here I should better append the file and go back to erase the central dir
+        $v_size = filesize($p_archive_filename);
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
+
+        // ----- Close
         $this->privCloseFd();
+
+        // ----- Close the temporary file
+        @fclose($v_zip_temp_fd);
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorLog()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorLog($p_error_code = 0, $p_error_string = '')
     {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclError($p_error_code, $p_error_string);
+        } else {
+            $this->error_code   = $p_error_code;
+            $this->error_string = $p_error_string;
         }
-      }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
+    // --------------------------------------------------------------------------------
+    // Function : privErrorReset()
+    // Description :
+    // Parameters :
+    // --------------------------------------------------------------------------------
+    public function privErrorReset()
     {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
+        if (PCLZIP_ERROR_EXTERNAL == 1) {
+            PclErrorReset();
+        } else {
+            $this->error_code   = 0;
+            $this->error_string = '';
+        }
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privDisableMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privDisableMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if already done
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Get and memorize the magic_quote value
+        $this->magic_quotes_status = @get_magic_quotes_runtime();
+
+        // ----- Disable magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime(0);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
 
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
+    // --------------------------------------------------------------------------------
+    // Function : privSwapBackMagicQuotes()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // --------------------------------------------------------------------------------
+    public function privSwapBackMagicQuotes()
     {
+        $v_result = 1;
 
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+        // ----- Look if function exists
+        if ((!function_exists("get_magic_quotes_runtime")) || (!function_exists("set_magic_quotes_runtime"))) {
+            return $v_result;
+        }
 
-      // ----- Return
-      return $v_result;
+        // ----- Look if something to do
+        if ($this->magic_quotes_status != -1) {
+            return $v_result;
+        }
+
+        // ----- Swap back magic_quotes
+        if ($this->magic_quotes_status == 1) {
+            @set_magic_quotes_runtime($this->magic_quotes_status);
+        }
+
+        // ----- Return
+        return $v_result;
     }
+    // --------------------------------------------------------------------------------
+}
 
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
+// End of class
+// --------------------------------------------------------------------------------
 
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-        || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-    }
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-    }
-
-    // ----- Get and memorize the magic_quote value
-    $this->magic_quotes_status = @get_magic_quotes_runtime();
-
-    // ----- Disable magic_quotes
-    if ($this->magic_quotes_status == 1) {
-      @set_magic_quotes_runtime(0);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-        || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-    }
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-    }
-
-    // ----- Swap back magic_quotes
-    if ($this->magic_quotes_status == 1) {
-      @set_magic_quotes_runtime($this->magic_quotes_status);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathReduction()
+// Description :
+// Parameters :
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilPathReduction($p_dir)
+{
     $v_result = "";
 
     // ----- Look for not empty path
     if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
+        // ----- Explode path by directory names
+        $v_list = explode("/", $p_dir);
 
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-          $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-          // ----- First '/' i.e. root slash
-          if ($i == 0) {
-            $v_result = "/".$v_result;
-            if ($v_skip > 0) {
-                // ----- It is an invalid path, so the path is not modified
-                // TBC
-                $v_result = $p_dir;
-                $v_skip = 0;
+        // ----- Study directories from last to first
+        $v_skip = 0;
+        for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+            // ----- Look for current path
+            if ($v_list[$i] == ".") {
+                // ----- Ignore this directory
+                // Should be the first $i=0, but no check is done
+            } elseif ($v_list[$i] == "..") {
+                $v_skip++;
+            } elseif ($v_list[$i] == "") {
+                // ----- First '/' i.e. root slash
+                if ($i == 0) {
+                    $v_result = "/" . $v_result;
+                    if ($v_skip > 0) {
+                        // ----- It is an invalid path, so the path is not modified
+                        // TBC
+                        $v_result = $p_dir;
+                        $v_skip   = 0;
+                    }
+
+                // ----- Last '/' i.e. indicates a directory
+                } elseif ($i == (sizeof($v_list) - 1)) {
+                    $v_result = $v_list[$i];
+
+                // ----- Double '/' inside the path
+                } else {
+                    // ----- Ignore only the double '//' in path,
+                    // but not the first and last '/'
+                }
+            } else {
+                // ----- Look for item to skip
+                if ($v_skip > 0) {
+                    $v_skip--;
+                } else {
+                    $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? "/" . $v_result : "");
+                }
             }
-          }
-          // ----- Last '/' i.e. indicates a directory
-          else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-          }
-          // ----- Double '/' inside the path
-          else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-          }
         }
-        else {
-          // ----- Look for item to skip
-          if ($v_skip > 0) {
-            $v_skip--;
-          }
-          else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-          }
-        }
-      }
 
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
+        // ----- Look for skip
+        if ($v_skip > 0) {
+            while ($v_skip > 0) {
+                $v_result = '../' . $v_result;
+                $v_skip--;
+            }
         }
-      }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilPathInclusion()
+// Description :
+//   This function indicates if the path $p_path is under the $p_dir tree. Or,
+//   said in an other way, if the file or sub-dir $p_path is inside the dir
+//   $p_dir.
+//   The function indicates also if the path is exactly the same as the dir.
+//   This function supports path with duplicated '/' like '//', but does not
+//   support '.' or '..' statements.
+// Parameters :
+// Return Values :
+//   0 if $p_path is not inside directory $p_dir
+//   1 if $p_path is inside directory $p_dir
+//   2 if $p_path is exactly the same as $p_dir
+// --------------------------------------------------------------------------------
+function PclZipUtilPathInclusion($p_dir, $p_path)
+{
     $v_result = 1;
 
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    if (($p_dir == '.') || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    if (($p_path == '.') || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
+        $p_path = PclZipUtilTranslateWinPath(getcwd(), false) . '/' . substr($p_path, 1);
     }
 
     // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
+    $v_list_dir       = explode("/", $p_dir);
+    $v_list_dir_size  = sizeof($v_list_dir);
+    $v_list_path      = explode("/", $p_path);
     $v_list_path_size = sizeof($v_list_path);
 
     // ----- Study directories paths
@@ -5499,193 +5234,182 @@
     $j = 0;
     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
 
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
+        // ----- Look for empty dir (path reduction)
+        if ($v_list_dir[$i] == '') {
+            $i++;
+            continue;
+        }
+        if ($v_list_path[$j] == '') {
+            $j++;
+            continue;
+        }
+
+        // ----- Compare the items
+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
+            $v_result = 0;
+        }
+
+        // ----- Next items
         $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
         $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
     }
 
     // ----- Look if everything seems to be the same
     if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+        // ----- Skip all the empty items
+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
+            $i++;
+        }
 
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+            // ----- There are exactly the same
+            $v_result = 2;
+        } elseif ($i < $v_list_dir_size) {
+            // ----- The path is shorter than the dir
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilCopyBlock()
+// Description :
+// Parameters :
+//   $p_mode : read/write compression mode
+//             0 : src & dest normal
+//             1 : src gzip, dest normal
+//             2 : src normal, dest gzip
+//             3 : src & dest gzip
+// Return Values :
+// --------------------------------------------------------------------------------
+function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
+{
     $v_result = 1;
 
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
+    if ($p_mode == 0) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 1) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @fwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 2) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @fread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
+    } elseif ($p_mode == 3) {
+        while ($p_size != 0) {
+            $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer    = @gzread($p_src, $v_read_size);
+            @gzwrite($p_dest, $v_buffer, $v_read_size);
+            $p_size -= $v_read_size;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilRename()
+// Description :
+//   This function tries to do a simple rename() function. If it fails, it
+//   tries to copy the $p_src file in a new $p_dest file and then unlink the
+//   first one.
+// Parameters :
+//   $p_src : Old filename
+//   $p_dest : New filename
+// Return Values :
+//   1 on success, 0 on failure.
+// --------------------------------------------------------------------------------
+function PclZipUtilRename($p_src, $p_dest)
+{
     $v_result = 1;
 
     // ----- Try to rename the files
     if (!@rename($p_src, $p_dest)) {
 
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilOptionText()
+// Description :
+//   Translate option value in text. Mainly for debug purpose.
+// Parameters :
+//   $p_option : the option value.
+// Return Values :
+//   The option text value.
+// --------------------------------------------------------------------------------
+function PclZipUtilOptionText($p_option)
+{
 
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
         $v_prefix = substr($v_key, 0, 10);
-        if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-            && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
+        if ((($v_prefix == 'PCLZIP_OPT') || ($v_prefix == 'PCLZIP_CB_') || ($v_prefix == 'PCLZIP_ATT')) && ($v_list[$v_key] == $p_option)) {
+            return $v_key;
         }
     }
 
     $v_result = 'Unknown';
 
     return $v_result;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
 
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
+// --------------------------------------------------------------------------------
+// Function : PclZipUtilTranslateWinPath()
+// Description :
+//   Translate windows path by replacing '\' by '/' and optionally removing
+//   drive letter.
+// Parameters :
+//   $p_path : path to translate.
+//   $p_remove_disk_letter : true | false
+// Return Values :
+//   The path translated.
+// --------------------------------------------------------------------------------
+function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter = true)
+{
     if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
+        // ----- Look for potential disk letter
+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+            $p_path = substr($p_path, $v_position + 1);
+        }
+        // ----- Change potential windows directory separator
+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+            $p_path = strtr($p_path, '\\', '/');
+        }
     }
+
     return $p_path;
-  }
-  // --------------------------------------------------------------------------------
+}
+// --------------------------------------------------------------------------------
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index 4dc4af4e..d73f6c33 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -37,7 +37,7 @@ use PhpOffice\PhpWord\Settings;
 class ZipArchive
 {
     /** @const int Flags for open method */
-    const CREATE    = 1; // Emulate \ZipArchive::CREATE
+    const CREATE = 1; // Emulate \ZipArchive::CREATE
     const OVERWRITE = 8; // Emulate \ZipArchive::OVERWRITE
 
     /**
@@ -150,10 +150,10 @@ class ZipArchive
     /**
      * Close the active archive
      *
-     * @return bool
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      *
+     * @return bool
+     *
      * @codeCoverageIgnore Can't find any test case. Uncomment when found.
      */
     public function close()
@@ -183,9 +183,9 @@ class ZipArchive
 
         if (!$this->usePclzip) {
             return $this->zip->extractTo($destination, $entries);
-        } else {
-            return $this->pclzipExtractTo($destination, $entries);
         }
+
+        return $this->pclzipExtractTo($destination, $entries);
     }
 
     /**
@@ -301,6 +301,7 @@ class ZipArchive
         // Extract all files
         if (is_null($entries)) {
             $result = $zip->extract(PCLZIP_OPT_PATH, $destination);
+
             return ($result > 0) ? true : false;
         }
 
@@ -360,9 +361,9 @@ class ZipArchive
         $list = $zip->listContent();
         if (isset($list[$index])) {
             return $list[$index]['filename'];
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index 5c399a16..1a5d33ad 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,7 +28,7 @@ use PhpOffice\PhpWord\Shared\AbstractEnum;
  * @since 0.13.0
  *
  * @see \PhpOffice\PhpWord\SimpleType\JcTable For table alignment modes available since ISO/IEC-29500:2008.
- * @link http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
  *
  * @codeCoverageIgnore
  */
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index 865b25a8..e1af89ad 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
index 9d24a2b3..480d8539 100644
--- a/src/PhpWord/SimpleType/NumberFormat.php
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/Zoom.php b/src/PhpWord/SimpleType/Zoom.php
index 3b78fdf9..111e4ea1 100644
--- a/src/PhpWord/SimpleType/Zoom.php
+++ b/src/PhpWord/SimpleType/Zoom.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 57d9d692..1939aaba 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -126,8 +126,6 @@ class Style
      * Reset styles.
      *
      * @since 0.10.0
-     *
-     * @return void
      */
     public static function resetStyles()
     {
@@ -165,9 +163,9 @@ class Style
     {
         if (isset(self::$styles[$styleName])) {
             return self::$styles[$styleName];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php
index e2b6dce9..76ebd591 100644
--- a/src/PhpWord/Style/AbstractStyle.php
+++ b/src/PhpWord/Style/AbstractStyle.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -138,10 +138,11 @@ abstract class AbstractStyle
     {
         if ($substyleObject !== null) {
             $method = "get{$substyleProperty}";
+
             return $substyleObject->$method();
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -242,12 +243,12 @@ abstract class AbstractStyle
     protected function setIntVal($value, $default = null)
     {
         if (is_string($value) && (preg_match('/[^\d]/', $value) == 0)) {
-            $value = intval($value);
+            $value = (int) $value;
         }
         if (!is_numeric($value)) {
             $value = $default;
         } else {
-            $value = intval($value);
+            $value = (int) $value;
         }
 
         return $value;
@@ -263,7 +264,7 @@ abstract class AbstractStyle
     protected function setFloatVal($value, $default = null)
     {
         if (is_string($value) && (preg_match('/[^\d\.\,]/', $value) == 0)) {
-            $value = floatval($value);
+            $value = (float) $value;
         }
         if (!is_numeric($value)) {
             $value = $default;
@@ -279,14 +280,13 @@ abstract class AbstractStyle
      * @param array $enum
      * @param mixed $default
      *
-     * @return mixed
-     *
      * @throws \InvalidArgumentException
+     * @return mixed
      */
     protected function setEnumVal($value = null, $enum = array(), $default = null)
     {
         if ($value != null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
-            throw new \InvalidArgumentException("Invalid style value: {$value} Options:".join(',', $enum));
+            throw new \InvalidArgumentException("Invalid style value: {$value} Options:" . implode(',', $enum));
         } elseif ($value === null || trim($value) == '') {
             $value = $default;
         }
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index d3bc2e57..5c62afcd 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -81,7 +81,7 @@ class Border extends AbstractStyle
     /**
      * Get border size
      *
-     * @return integer[]
+     * @return int[]
      */
     public function getBorderSize()
     {
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index 7bab8b56..0c4ca2e1 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -72,7 +72,7 @@ class Cell extends Border
     /**
      * colspan
      *
-     * @var integer
+     * @var int
      */
     private $gridSpan;
 
@@ -150,9 +150,9 @@ class Cell extends Border
     {
         if ($this->shading !== null) {
             return $this->shading->getFill();
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -169,7 +169,7 @@ class Cell extends Border
     /**
      * Get grid span (colspan).
      *
-     * @return integer
+     * @return int
      */
     public function getGridSpan()
     {
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 8e1f4b61..694fcddc 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,7 +24,6 @@ namespace PhpOffice\PhpWord\Style;
  */
 class Chart extends AbstractStyle
 {
-
     /**
      * Width (in EMU)
      *
diff --git a/src/PhpWord/Style/Extrusion.php b/src/PhpWord/Style/Extrusion.php
index d8c5e65f..11c03eda 100644
--- a/src/PhpWord/Style/Extrusion.php
+++ b/src/PhpWord/Style/Extrusion.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * 3D extrusion style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-o_CT_Extrusion.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-o_CT_Extrusion.html
  * @since 0.12.0
  */
 class Extrusion extends AbstractStyle
diff --git a/src/PhpWord/Style/Fill.php b/src/PhpWord/Style/Fill.php
index cf6ffb41..9b473009 100644
--- a/src/PhpWord/Style/Fill.php
+++ b/src/PhpWord/Style/Fill.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,9 +20,9 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Fill style
  *
- * There are still lot of interesting things for this style that can be added, including gradient. See @link.
+ * There are still lot of interesting things for this style that can be added, including gradient. See @see .
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Fill.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Fill.html
  * @since 0.12.0
  */
 class Fill extends AbstractStyle
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 19f2758d..76b03ac6 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -162,7 +162,7 @@ class Font extends AbstractStyle
      * Small caps
      *
      * @var bool
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_smallCaps-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_smallCaps-1.html
      */
     private $smallCaps = false;
 
@@ -170,7 +170,7 @@ class Font extends AbstractStyle
      * All caps
      *
      * @var bool
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_caps-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_caps-1.html
      */
     private $allCaps = false;
 
@@ -186,7 +186,7 @@ class Font extends AbstractStyle
      *
      * @var int
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_w-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_w-1.html
      */
     private $scale;
 
@@ -195,7 +195,7 @@ class Font extends AbstractStyle
      *
      * @var int|float
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_spacing-2.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_spacing-2.html
      */
     private $spacing;
 
@@ -204,7 +204,7 @@ class Font extends AbstractStyle
      *
      * @var int|float
      * @since 0.12.0
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_kern-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_kern-1.html
      */
     private $kerning;
 
@@ -224,12 +224,12 @@ class Font extends AbstractStyle
 
     /**
      * Right to left languages
-     * @var boolean
+     * @var bool
      */
     private $rtl = false;
 
     /**
-     * Languages 
+     * Languages
      * @var \PhpOffice\PhpWord\Style\Language
      */
     private $lang;
@@ -812,7 +812,7 @@ class Font extends AbstractStyle
             $value = new Language($value);
         }
         $this->setObjectVal($value, 'Language', $this->lang);
-        
+
         return $this;
     }
 
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index 0a99146b..a8e1c69d 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Image.php b/src/PhpWord/Style/Image.php
index f2c88b5f..c3f1863c 100644
--- a/src/PhpWord/Style/Image.php
+++ b/src/PhpWord/Style/Image.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
diff --git a/src/PhpWord/Style/Indentation.php b/src/PhpWord/Style/Indentation.php
index 0408929b..9621714c 100644
--- a/src/PhpWord/Style/Indentation.php
+++ b/src/PhpWord/Style/Indentation.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Paragraph indentation style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Ind.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Ind.html
  * @since 0.10.0
  */
 class Indentation extends AbstractStyle
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 4e9220fd..e09421e0 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
@@ -25,7 +26,6 @@ namespace PhpOffice\PhpWord\Style;
  */
 final class Language extends AbstractStyle
 {
-
     const EN_US = 'en-US';
     const EN_US_ID = 1033;
 
@@ -89,7 +89,8 @@ final class Language extends AbstractStyle
     private $bidirectional;
 
     /**
-     * 
+     * Constructor
+     *
      * @param string|null $latin
      * @param string|null $eastAsia
      * @param string|null $bidirectional
@@ -118,6 +119,7 @@ final class Language extends AbstractStyle
     {
         $this->validateLocale($latin);
         $this->latin = $latin;
+
         return $this;
     }
 
@@ -142,6 +144,7 @@ final class Language extends AbstractStyle
     public function setLangId($langId)
     {
         $this->langId = $langId;
+
         return $this;
     }
 
@@ -166,6 +169,7 @@ final class Language extends AbstractStyle
     {
         $this->validateLocale($eastAsia);
         $this->eastAsia = $eastAsia;
+
         return $this;
     }
 
@@ -190,6 +194,7 @@ final class Language extends AbstractStyle
     {
         $this->validateLocale($bidirectional);
         $this->bidirectional = $bidirectional;
+
         return $this;
     }
 
@@ -205,9 +210,9 @@ final class Language extends AbstractStyle
 
     /**
      * Validates that the language passed is in the format xx-xx
-     * 
+     *
      * @param string $locale
-     * @return boolean
+     * @return bool
      */
     private function validateLocale($locale)
     {
diff --git a/src/PhpWord/Style/Line.php b/src/PhpWord/Style/Line.php
index f8cc4026..16d15950 100644
--- a/src/PhpWord/Style/Line.php
+++ b/src/PhpWord/Style/Line.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Style;
 
 /**
@@ -55,7 +56,7 @@ class Line extends Image
     /**
      * flip Line
      *
-     * @var boolean
+     * @var bool
      */
     private $flip = false;
 
@@ -104,7 +105,7 @@ class Line extends Image
     /**
      * Get flip
      *
-     * @return boolean
+     * @return bool
      */
     public function isFlip()
     {
@@ -114,7 +115,7 @@ class Line extends Image
     /**
      * Set flip
      *
-     * @param boolean $value
+     * @param bool $value
      * @return self
      */
     public function setFlip($value = false)
@@ -143,7 +144,7 @@ class Line extends Image
     public function setConnectorType($value = null)
     {
         $enum = array(
-            self::CONNECTOR_TYPE_STRAIGHT
+            self::CONNECTOR_TYPE_STRAIGHT,
         );
         $this->connectorType = $this->setEnumVal($value, $enum, $this->connectorType);
 
@@ -216,7 +217,7 @@ class Line extends Image
     {
         $enum = array(
             self::ARROW_STYLE_BLOCK, self::ARROW_STYLE_CLASSIC, self::ARROW_STYLE_DIAMOND,
-            self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL
+            self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL,
         );
         $this->beginArrow = $this->setEnumVal($value, $enum, $this->beginArrow);
 
@@ -243,7 +244,7 @@ class Line extends Image
     {
         $enum = array(
             self::ARROW_STYLE_BLOCK, self::ARROW_STYLE_CLASSIC, self::ARROW_STYLE_DIAMOND,
-            self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL
+            self::ARROW_STYLE_OPEN, self::ARROW_STYLE_OVAL,
         );
         $this->endArrow = $this->setEnumVal($value, $enum, $this->endArrow);
 
@@ -271,7 +272,7 @@ class Line extends Image
         $enum = array(
             self::DASH_STYLE_DASH, self::DASH_STYLE_DASH_DOT, self::DASH_STYLE_LONG_DASH,
             self::DASH_STYLE_LONG_DASH_DOT, self::DASH_STYLE_LONG_DASH_DOT_DOT, self::DASH_STYLE_ROUND_DOT,
-            self::DASH_STYLE_SQUARE_DOT
+            self::DASH_STYLE_SQUARE_DOT,
         );
         $this->dash = $this->setEnumVal($value, $enum, $this->dash);
 
diff --git a/src/PhpWord/Style/LineNumbering.php b/src/PhpWord/Style/LineNumbering.php
index e125f477..b5f3c263 100644
--- a/src/PhpWord/Style/LineNumbering.php
+++ b/src/PhpWord/Style/LineNumbering.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,14 +20,14 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Line numbering style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_LineNumber.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_LineNumber.html
  * @since 0.10.0
  */
 class LineNumbering extends AbstractStyle
 {
     /** @const string Line numbering restart setting http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html */
-    const LINE_NUMBERING_CONTINUOUS  = 'continuous';
-    const LINE_NUMBERING_NEW_PAGE    = 'newPage';
+    const LINE_NUMBERING_CONTINUOUS = 'continuous';
+    const LINE_NUMBERING_NEW_PAGE = 'newPage';
     const LINE_NUMBERING_NEW_SECTION = 'newSection';
 
     /**
@@ -55,7 +55,7 @@ class LineNumbering extends AbstractStyle
      * Line numbering restart setting continuous|newPage|newSection
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_restart-1.html
      */
     private $restart;
 
diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php
index 61a8349b..444341dc 100644
--- a/src/PhpWord/Style/ListItem.php
+++ b/src/PhpWord/Style/ListItem.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -38,7 +38,7 @@ class ListItem extends AbstractStyle
     /**
      * Legacy list type
      *
-     * @var integer
+     * @var int
      */
     private $listType;
 
@@ -53,7 +53,7 @@ class ListItem extends AbstractStyle
     /**
      * Numbering definition instance ID
      *
-     * @var integer
+     * @var int
      * @since 0.10.0
      */
     private $numId;
@@ -75,7 +75,7 @@ class ListItem extends AbstractStyle
     /**
      * Get List Type
      *
-     * @return integer
+     * @return int
      */
     public function getListType()
     {
@@ -85,7 +85,7 @@ class ListItem extends AbstractStyle
     /**
      * Set legacy list type for version < 0.10.0
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setListType($value = self::TYPE_BULLET_FILLED)
@@ -93,7 +93,7 @@ class ListItem extends AbstractStyle
         $enum = array(
             self::TYPE_SQUARE_FILLED, self::TYPE_BULLET_FILLED,
             self::TYPE_BULLET_EMPTY, self::TYPE_NUMBER,
-            self::TYPE_NUMBER_NESTED, self::TYPE_ALPHANUM
+            self::TYPE_NUMBER_NESTED, self::TYPE_ALPHANUM,
         );
         $this->listType = $this->setEnumVal($value, $enum, $this->listType);
         $this->getListTypeStyle();
@@ -132,7 +132,7 @@ class ListItem extends AbstractStyle
     /**
      * Get numbering Id
      *
-     * @return integer
+     * @return int
      */
     public function getNumId()
     {
@@ -151,6 +151,7 @@ class ListItem extends AbstractStyle
         $numStyle = "PHPWordList{$this->listType}";
         if (Style::getStyle($numStyle) !== null) {
             $this->setNumStyle($numStyle);
+
             return;
         }
 
@@ -160,7 +161,7 @@ class ListItem extends AbstractStyle
         // Legacy level information
         $listTypeStyles = array(
             self::TYPE_SQUARE_FILLED => array(
-                'type' => 'hybridMultilevel',
+                'type'   => 'hybridMultilevel',
                 'levels' => array(
                     0 => '1, bullet, , left, 720, 720, 360, Wingdings, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
@@ -174,7 +175,7 @@ class ListItem extends AbstractStyle
                 ),
             ),
             self::TYPE_BULLET_FILLED => array(
-                'type' => 'hybridMultilevel',
+                'type'   => 'hybridMultilevel',
                 'levels' => array(
                     0 => '1, bullet, , left, 720, 720, 360, Symbol, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
@@ -188,7 +189,7 @@ class ListItem extends AbstractStyle
                 ),
             ),
             self::TYPE_BULLET_EMPTY => array(
-                'type' => 'hybridMultilevel',
+                'type'   => 'hybridMultilevel',
                 'levels' => array(
                     0 => '1, bullet, o, left, 720, 720, 360, Courier New, default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
@@ -202,7 +203,7 @@ class ListItem extends AbstractStyle
                 ),
             ),
             self::TYPE_NUMBER => array(
-                'type' => 'hybridMultilevel',
+                'type'   => 'hybridMultilevel',
                 'levels' => array(
                     0 => '1, decimal, %1., left, 720, 720, 360, , default',
                     1 => '1, bullet, o, left, 1440, 1440, 360, Courier New, default',
@@ -216,7 +217,7 @@ class ListItem extends AbstractStyle
                 ),
             ),
             self::TYPE_NUMBER_NESTED => array(
-                'type' => 'multilevel',
+                'type'   => 'multilevel',
                 'levels' => array(
                     0 => '1, decimal, %1., left, 360, 360, 360, , ',
                     1 => '1, decimal, %1.%2., left, 792, 792, 432, , ',
@@ -230,7 +231,7 @@ class ListItem extends AbstractStyle
                 ),
             ),
             self::TYPE_ALPHANUM => array(
-                'type' => 'multilevel',
+                'type'   => 'multilevel',
                 'levels' => array(
                     0 => '1, decimal, %1., left, 720, 720, 360, , ',
                     1 => '1, lowerLetter, %2., left, 1440, 1440, 360, , ',
diff --git a/src/PhpWord/Style/Numbering.php b/src/PhpWord/Style/Numbering.php
index 0d4fd85d..80ed5dca 100644
--- a/src/PhpWord/Style/Numbering.php
+++ b/src/PhpWord/Style/Numbering.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,9 +20,9 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Numbering style
  *
- * @link http://www.schemacentral.com/sc/ooxml/e-w_numbering.html
- * @link http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html
- * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_numbering.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
  * @since 0.10.0
  */
 class Numbering extends AbstractStyle
@@ -31,7 +31,7 @@ class Numbering extends AbstractStyle
      * Numbering definition instance ID
      *
      * @var int
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
      */
     private $numId;
 
@@ -39,7 +39,7 @@ class Numbering extends AbstractStyle
      * Multilevel type singleLevel|multilevel|hybridMultilevel
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_val-67.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_val-67.html
      */
     private $type;
 
@@ -53,7 +53,7 @@ class Numbering extends AbstractStyle
     /**
      * Get Id
      *
-     * @return integer
+     * @return int
      */
     public function getNumId()
     {
@@ -63,7 +63,7 @@ class Numbering extends AbstractStyle
     /**
      * Set Id
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setNumId($value)
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 9da1a2b1..33c151e4 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,7 @@ use PhpOffice\PhpWord\SimpleType\NumberFormat;
 /**
  * Numbering level definition
  *
- * @link http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html
+ * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html
  * @since 0.10.0
  */
 class NumberingLevel extends AbstractStyle
@@ -31,15 +31,15 @@ class NumberingLevel extends AbstractStyle
     /**
      * Level number, 0 to 8 (total 9 levels)
      *
-     * @var integer
+     * @var int
      */
     private $level = 0;
 
     /**
      * Starting value w:start
      *
-     * @var integer
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_start-1.html
+     * @var int
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_start-1.html
      */
     private $start = 1;
 
@@ -47,15 +47,15 @@ class NumberingLevel extends AbstractStyle
      * Numbering format w:numFmt, one of PhpOffice\PhpWord\SimpleType\NumberFormat
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_NumberFormat.html
      */
     private $format;
 
     /**
      * Restart numbering level symbol w:lvlRestart
      *
-     * @var integer
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lvlRestart-1.html
+     * @var int
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlRestart-1.html
      */
     private $restart;
 
@@ -63,7 +63,7 @@ class NumberingLevel extends AbstractStyle
      * Related paragraph style
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_pStyle-2.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_pStyle-2.html
      */
     private $pStyle;
 
@@ -71,7 +71,7 @@ class NumberingLevel extends AbstractStyle
      * Content between numbering symbol and paragraph text w:suff
      *
      * @var string tab|space|nothing
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_suff-1.html
      */
     private $suffix = 'tab';
 
@@ -79,7 +79,7 @@ class NumberingLevel extends AbstractStyle
      * Numbering level text e.g. %1 for nonbullet or bullet character
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lvlText-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lvlText-1.html
      */
     private $text;
 
@@ -93,21 +93,21 @@ class NumberingLevel extends AbstractStyle
     /**
      * Left
      *
-     * @var integer
+     * @var int
      */
     private $left;
 
     /**
      * Hanging
      *
-     * @var integer
+     * @var int
      */
     private $hanging;
 
     /**
      * Tab position
      *
-     * @var integer
+     * @var int
      */
     private $tabPos;
 
@@ -122,14 +122,14 @@ class NumberingLevel extends AbstractStyle
      * Hint default|eastAsia|cs
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_hint-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_hint-1.html
      */
     private $hint;
 
     /**
      * Get level
      *
-     * @return integer
+     * @return int
      */
     public function getLevel()
     {
@@ -139,19 +139,20 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set level
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setLevel($value)
     {
         $this->level = $this->setIntVal($value, $this->level);
+
         return $this;
     }
 
     /**
      * Get start
      *
-     * @return integer
+     * @return int
      */
     public function getStart()
     {
@@ -161,12 +162,13 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set start
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setStart($value)
     {
         $this->start = $this->setIntVal($value, $this->start);
+
         return $this;
     }
 
@@ -189,13 +191,14 @@ class NumberingLevel extends AbstractStyle
     public function setFormat($value)
     {
         $this->format = $this->setEnumVal($value, NumberFormat::values(), $this->format);
+
         return $this;
     }
 
     /**
      * Get restart
      *
-     * @return integer
+     * @return int
      */
     public function getRestart()
     {
@@ -205,12 +208,13 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set restart
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setRestart($value)
     {
         $this->restart = $this->setIntVal($value, $this->restart);
+
         return $this;
     }
 
@@ -233,6 +237,7 @@ class NumberingLevel extends AbstractStyle
     public function setPStyle($value)
     {
         $this->pStyle = $value;
+
         return $this;
     }
 
@@ -256,6 +261,7 @@ class NumberingLevel extends AbstractStyle
     {
         $enum = array('tab', 'space', 'nothing');
         $this->suffix = $this->setEnumVal($value, $enum, $this->suffix);
+
         return $this;
     }
 
@@ -278,6 +284,7 @@ class NumberingLevel extends AbstractStyle
     public function setText($value)
     {
         $this->text = $value;
+
         return $this;
     }
 
@@ -336,7 +343,7 @@ class NumberingLevel extends AbstractStyle
     /**
      * Get left
      *
-     * @return integer
+     * @return int
      */
     public function getLeft()
     {
@@ -346,19 +353,20 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set left
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setLeft($value)
     {
         $this->left = $this->setIntVal($value, $this->left);
+
         return $this;
     }
 
     /**
      * Get hanging
      *
-     * @return integer
+     * @return int
      */
     public function getHanging()
     {
@@ -368,19 +376,20 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set hanging
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setHanging($value)
     {
         $this->hanging = $this->setIntVal($value, $this->hanging);
+
         return $this;
     }
 
     /**
      * Get tab
      *
-     * @return integer
+     * @return int
      */
     public function getTabPos()
     {
@@ -390,12 +399,13 @@ class NumberingLevel extends AbstractStyle
     /**
      * Set tab
      *
-     * @param integer $value
+     * @param int $value
      * @return self
      */
     public function setTabPos($value)
     {
         $this->tabPos = $this->setIntVal($value, $this->tabPos);
+
         return $this;
     }
 
@@ -418,6 +428,7 @@ class NumberingLevel extends AbstractStyle
     public function setFont($value)
     {
         $this->font = $value;
+
         return $this;
     }
 
diff --git a/src/PhpWord/Style/Outline.php b/src/PhpWord/Style/Outline.php
index 8628c4c5..fb7e028a 100644
--- a/src/PhpWord/Style/Outline.php
+++ b/src/PhpWord/Style/Outline.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,8 +20,8 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Outline defines the line/border of the object
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Stroke.html
- * @link http://www.w3.org/TR/1998/NOTE-VML-19980513#_Toc416858395
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Stroke.html
+ * @see  http://www.w3.org/TR/1998/NOTE-VML-19980513#_Toc416858395
  * @since 0.12.0
  */
 class Outline extends AbstractStyle
@@ -29,7 +29,7 @@ class Outline extends AbstractStyle
     /**
      * Line style constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeLineStyle.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeLineStyle.html
      * @const string
      */
     const LINE_SINGLE = 'single';
@@ -41,7 +41,7 @@ class Outline extends AbstractStyle
     /**
      * Line style constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
      * @const string
      */
     const ENDCAP_FLAT = 'flat';
@@ -51,7 +51,7 @@ class Outline extends AbstractStyle
     /**
      * Arrowhead type constants
      *
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeArrowType.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeArrowType.html
      * @const string
      */
     const ARROW_NONE = 'none';
@@ -100,7 +100,7 @@ class Outline extends AbstractStyle
      * End cap
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-v_ST_StrokeEndCap.html
      */
     private $endCap;
 
@@ -226,7 +226,7 @@ class Outline extends AbstractStyle
     public function setLine($value = null)
     {
         $enum = array(self::LINE_SINGLE, self::LINE_THIN_THIN, self::LINE_THIN_THICK,
-            self::LINE_THICK_THIN, self::LINE_THICK_BETWEEN_THIN);
+            self::LINE_THICK_THIN, self::LINE_THICK_BETWEEN_THIN, );
         $this->line = $this->setEnumVal($value, $enum, null);
 
         return $this;
@@ -275,7 +275,7 @@ class Outline extends AbstractStyle
     public function setStartArrow($value = null)
     {
         $enum = array(self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
-            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN);
+            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, );
         $this->startArrow = $this->setEnumVal($value, $enum, null);
 
         return $this;
@@ -300,7 +300,7 @@ class Outline extends AbstractStyle
     public function setEndArrow($value = null)
     {
         $enum = array(self::ARROW_NONE, self::ARROW_BLOCK, self::ARROW_CLASSIC,
-            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN);
+            self::ARROW_OVAL, self::ARROW_DIAMOND, self::ARROW_OPEN, );
         $this->endArrow = $this->setEnumVal($value, $enum, null);
 
         return $this;
diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index eb0bcd77..2fbf59d2 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 169f2cda..f665048b 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -46,7 +46,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  * - Borders
  * - Background
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_PPr.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_PPr.html
  */
 class Paragraph extends Border
 {
@@ -157,7 +157,7 @@ class Paragraph extends Border
      * @var \PhpOffice\PhpWord\Style\Shading
      */
     private $shading;
-    
+
     /**
      * Ignore Spacing Above and Below When Using Identical Styles
      *
@@ -420,7 +420,7 @@ class Paragraph extends Border
     /**
      * Get space before paragraph
      *
-     * @return integer
+     * @return int
      */
     public function getSpaceBefore()
     {
@@ -441,7 +441,7 @@ class Paragraph extends Border
     /**
      * Get space after paragraph
      *
-     * @return integer
+     * @return int
      */
     public function getSpaceAfter()
     {
@@ -495,22 +495,22 @@ class Paragraph extends Border
      *
      * @param int|float|string $lineHeight
      *
-     * @return self
-     *
      * @throws \PhpOffice\PhpWord\Exception\InvalidStyleException
+     * @return self
      */
     public function setLineHeight($lineHeight)
     {
         if (is_string($lineHeight)) {
-            $lineHeight = floatval(preg_replace('/[^0-9\.\,]/', '', $lineHeight));
+            $lineHeight = (float) (preg_replace('/[^0-9\.\,]/', '', $lineHeight));
         }
 
-        if ((!is_integer($lineHeight) && !is_float($lineHeight)) || !$lineHeight) {
+        if ((!is_int($lineHeight) && !is_float($lineHeight)) || !$lineHeight) {
             throw new InvalidStyleException('Line height must be a valid number');
         }
 
         $this->lineHeight = $lineHeight;
         $this->setSpacing($lineHeight * self::LINE_HEIGHT);
+
         return $this;
     }
 
@@ -767,7 +767,7 @@ class Paragraph extends Border
     public function setContextualSpacing($contextualSpacing)
     {
         $this->contextualSpacing = $contextualSpacing;
-        
+
         return $this;
     }
 
diff --git a/src/PhpWord/Style/Row.php b/src/PhpWord/Style/Row.php
index 5be03b69..b56c6f5f 100644
--- a/src/PhpWord/Style/Row.php
+++ b/src/PhpWord/Style/Row.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index be8a3aad..476846f5 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -48,7 +48,7 @@ class Section extends Border
      * Page Orientation
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/a-w_orient-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/a-w_orient-1.html
      */
     private $orientation = self::ORIENTATION_PORTRAIT;
 
@@ -105,7 +105,7 @@ class Section extends Border
      * Page gutter spacing
      *
      * @var int|float
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_pgMar-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_pgMar-1.html
      */
     private $gutter = self::DEFAULT_GUTTER;
 
@@ -162,7 +162,7 @@ class Section extends Border
      * Line numbering
      *
      * @var \PhpOffice\PhpWord\Style\LineNumbering
-     * @link http://www.schemacentral.com/sc/ooxml/e-w_lnNumType-1.html
+     * @see  http://www.schemacentral.com/sc/ooxml/e-w_lnNumType-1.html
      */
     private $lineNumbering;
 
@@ -504,6 +504,7 @@ class Section extends Border
     public function setPageNumberingStart($pageNumberingStart = null)
     {
         $this->pageNumberingStart = $pageNumberingStart;
+
         return $this;
     }
 
@@ -572,6 +573,7 @@ class Section extends Border
     public function setBreakType($value = null)
     {
         $this->breakType = $value;
+
         return $this;
     }
 
diff --git a/src/PhpWord/Style/Shading.php b/src/PhpWord/Style/Shading.php
index ab4fce82..eeb055b2 100644
--- a/src/PhpWord/Style/Shading.php
+++ b/src/PhpWord/Style/Shading.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Shading style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Shd.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Shd.html
  * @since 0.10.0
  */
 class Shading extends AbstractStyle
@@ -29,7 +29,7 @@ class Shading extends AbstractStyle
      * Pattern constants (partly)
      *
      * @const string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     const PATTERN_CLEAR = 'clear'; // No pattern
     const PATTERN_SOLID = 'solid'; // 100% fill pattern
@@ -43,7 +43,7 @@ class Shading extends AbstractStyle
      * Shading pattern
      *
      * @var string
-     * @link http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
+     * @see  http://www.schemacentral.com/sc/ooxml/t-w_ST_Shd.html
      */
     private $pattern = self::PATTERN_CLEAR;
 
@@ -91,7 +91,7 @@ class Shading extends AbstractStyle
     {
         $enum = array(
             self::PATTERN_CLEAR, self::PATTERN_SOLID, self::PATTERN_HSTRIPE,
-            self::PATTERN_VSTRIPE, self::PATTERN_DSTRIPE, self::PATTERN_HCROSS, self::PATTERN_DCROSS
+            self::PATTERN_VSTRIPE, self::PATTERN_DSTRIPE, self::PATTERN_HCROSS, self::PATTERN_DCROSS,
         );
         $this->pattern = $this->setEnumVal($value, $enum, $this->pattern);
 
diff --git a/src/PhpWord/Style/Shadow.php b/src/PhpWord/Style/Shadow.php
index f8f693a9..71d1e3e0 100644
--- a/src/PhpWord/Style/Shadow.php
+++ b/src/PhpWord/Style/Shadow.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Shadow style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-v_CT_Shadow.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-v_CT_Shadow.html
  * @since 0.12.0
  */
 class Shadow extends AbstractStyle
diff --git a/src/PhpWord/Style/Shape.php b/src/PhpWord/Style/Shape.php
index 01b61588..fc84241d 100644
--- a/src/PhpWord/Style/Shape.php
+++ b/src/PhpWord/Style/Shape.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index 8d7cfeb2..e0eee374 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 /**
  * Spacing between lines and above/below paragraph style
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Spacing.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Spacing.html
  * @since 0.10.0
  */
 class Spacing extends AbstractStyle
diff --git a/src/PhpWord/Style/TOC.php b/src/PhpWord/Style/TOC.php
index eb4b2253..938e6de1 100644
--- a/src/PhpWord/Style/TOC.php
+++ b/src/PhpWord/Style/TOC.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Tab.php b/src/PhpWord/Style/Tab.php
index 33e518c8..09e49e02 100644
--- a/src/PhpWord/Style/Tab.php
+++ b/src/PhpWord/Style/Tab.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,25 +27,25 @@ class Tab extends AbstractStyle
      *
      * @const string
      */
-    const TAB_STOP_CLEAR   = 'clear';
-    const TAB_STOP_LEFT    = 'left';
-    const TAB_STOP_CENTER  = 'center';
-    const TAB_STOP_RIGHT   = 'right';
+    const TAB_STOP_CLEAR = 'clear';
+    const TAB_STOP_LEFT = 'left';
+    const TAB_STOP_CENTER = 'center';
+    const TAB_STOP_RIGHT = 'right';
     const TAB_STOP_DECIMAL = 'decimal';
-    const TAB_STOP_BAR     = 'bar';
-    const TAB_STOP_NUM     = 'num';
+    const TAB_STOP_BAR = 'bar';
+    const TAB_STOP_NUM = 'num';
 
     /**
      * Tab leader types
      *
      * @const string
      */
-    const TAB_LEADER_NONE       = 'none';
-    const TAB_LEADER_DOT        = 'dot';
-    const TAB_LEADER_HYPHEN     = 'hyphen';
+    const TAB_LEADER_NONE = 'none';
+    const TAB_LEADER_DOT = 'dot';
+    const TAB_LEADER_HYPHEN = 'hyphen';
     const TAB_LEADER_UNDERSCORE = 'underscore';
-    const TAB_LEADER_HEAVY      = 'heavy';
-    const TAB_LEADER_MIDDLEDOT  = 'middleDot';
+    const TAB_LEADER_HEAVY = 'heavy';
+    const TAB_LEADER_MIDDLEDOT = 'middleDot';
 
     /**
      * Tab stop type
@@ -73,19 +73,19 @@ class Tab extends AbstractStyle
      * must conform to the values put forth in the schema. If they do not
      * they will be changed to default values.
      *
-     * @param string $type Defaults to 'clear' if value is not possible.
-     * @param int $position Must be numeric; otherwise defaults to 0.
-     * @param string $leader Defaults to null if value is not possible.
+     * @param string $type Defaults to 'clear' if value is not possible
+     * @param int $position Must be numeric; otherwise defaults to 0
+     * @param string $leader Defaults to null if value is not possible
      */
     public function __construct($type = null, $position = 0, $leader = null)
     {
         $stopTypes = array(
-            self::TAB_STOP_CLEAR, self::TAB_STOP_LEFT,self::TAB_STOP_CENTER,
-            self::TAB_STOP_RIGHT, self::TAB_STOP_DECIMAL, self::TAB_STOP_BAR, self::TAB_STOP_NUM
+            self::TAB_STOP_CLEAR, self::TAB_STOP_LEFT, self::TAB_STOP_CENTER,
+            self::TAB_STOP_RIGHT, self::TAB_STOP_DECIMAL, self::TAB_STOP_BAR, self::TAB_STOP_NUM,
         );
         $leaderTypes = array(
             self::TAB_LEADER_NONE, self::TAB_LEADER_DOT, self::TAB_LEADER_HYPHEN,
-            self::TAB_LEADER_UNDERSCORE, self::TAB_LEADER_HEAVY, self::TAB_LEADER_MIDDLEDOT
+            self::TAB_LEADER_UNDERSCORE, self::TAB_LEADER_HEAVY, self::TAB_LEADER_MIDDLEDOT,
         );
 
         $this->type = $this->setEnumVal($type, $stopTypes, $this->type);
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index a542af7b..a3d454f3 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -133,15 +133,7 @@ class Table extends Border
         if ($firstRowStyle !== null && is_array($firstRowStyle)) {
             $this->firstRowStyle = clone $this;
             $this->firstRowStyle->isFirstRow = true;
-            unset($this->firstRowStyle->firstRowStyle);
-            unset($this->firstRowStyle->borderInsideHSize);
-            unset($this->firstRowStyle->borderInsideHColor);
-            unset($this->firstRowStyle->borderInsideVSize);
-            unset($this->firstRowStyle->borderInsideVColor);
-            unset($this->firstRowStyle->cellMarginTop);
-            unset($this->firstRowStyle->cellMarginLeft);
-            unset($this->firstRowStyle->cellMarginRight);
-            unset($this->firstRowStyle->cellMarginBottom);
+            unset($this->firstRowStyle->firstRowStyle, $this->firstRowStyle->borderInsideHSize, $this->firstRowStyle->borderInsideHColor, $this->firstRowStyle->borderInsideVSize, $this->firstRowStyle->borderInsideVColor, $this->firstRowStyle->cellMarginTop, $this->firstRowStyle->cellMarginLeft, $this->firstRowStyle->cellMarginRight, $this->firstRowStyle->cellMarginBottom);
             $this->firstRowStyle->setStyleByArray($firstRowStyle);
         }
 
@@ -190,7 +182,7 @@ class Table extends Border
     /**
      * Get TLRBHV Border Size
      *
-     * @return integer[]
+     * @return int[]
      */
     public function getBorderSize()
     {
@@ -428,7 +420,7 @@ class Table extends Border
     /**
      * Get cell margin
      *
-     * @return integer[]
+     * @return int[]
      */
     public function getCellMargin()
     {
@@ -436,7 +428,7 @@ class Table extends Border
             $this->cellMarginTop,
             $this->cellMarginLeft,
             $this->cellMarginRight,
-            $this->cellMarginBottom
+            $this->cellMarginBottom,
         );
     }
 
diff --git a/src/PhpWord/Style/TextBox.php b/src/PhpWord/Style/TextBox.php
index 6783cd18..91adc0af 100644
--- a/src/PhpWord/Style/TextBox.php
+++ b/src/PhpWord/Style/TextBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -70,7 +70,6 @@ class TextBox extends Image
      * Set margin top.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginTop($value = null)
     {
@@ -91,7 +90,6 @@ class TextBox extends Image
      * Set margin left.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginLeft($value = null)
     {
@@ -112,7 +110,6 @@ class TextBox extends Image
      * Set margin right.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginRight($value = null)
     {
@@ -133,7 +130,6 @@ class TextBox extends Image
      * Set margin bottom.
      *
      * @param int $value
-     * @return void
      */
     public function setInnerMarginBottom($value = null)
     {
@@ -154,7 +150,6 @@ class TextBox extends Image
      * Set TLRB cell margin.
      *
      * @param int $value Margin in twips
-     * @return void
      */
     public function setInnerMargin($value = null)
     {
@@ -167,7 +162,7 @@ class TextBox extends Image
     /**
      * Get cell margin
      *
-     * @return integer[]
+     * @return int[]
      */
     public function getInnerMargin()
     {
@@ -197,7 +192,6 @@ class TextBox extends Image
      * Set border size.
      *
      * @param int $value Size in points
-     * @return void
      */
     public function setBorderSize($value = null)
     {
@@ -218,7 +212,6 @@ class TextBox extends Image
      * Set border color.
      *
      * @param string $value
-     * @return void
      */
     public function setBorderColor($value = null)
     {
diff --git a/src/PhpWord/Template.php b/src/PhpWord/Template.php
index 87ccd8ed..a4769927 100644
--- a/src/PhpWord/Template.php
+++ b/src/PhpWord/Template.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 2f6d6258..c46038ee 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -37,35 +37,35 @@ class TemplateProcessor
     protected $zipClass;
 
     /**
-     * @var string Temporary document filename (with path).
+     * @var string Temporary document filename (with path)
      */
     protected $tempDocumentFilename;
 
     /**
-     * Content of main document part (in XML format) of the temporary document.
+     * Content of main document part (in XML format) of the temporary document
      *
      * @var string
      */
     protected $tempDocumentMainPart;
 
     /**
-     * Content of headers (in XML format) of the temporary document.
+     * Content of headers (in XML format) of the temporary document
      *
      * @var string[]
      */
     protected $tempDocumentHeaders = array();
 
     /**
-     * Content of footers (in XML format) of the temporary document.
+     * Content of footers (in XML format) of the temporary document
      *
      * @var string[]
      */
     protected $tempDocumentFooters = array();
 
     /**
-     * @since 0.12.0 Throws CreateTemporaryFileException and CopyFileException instead of Exception.
+     * @since 0.12.0 Throws CreateTemporaryFileException and CopyFileException instead of Exception
      *
-     * @param string $documentTemplate The fully qualified template filename.
+     * @param string $documentTemplate The fully qualified template filename
      *
      * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
      * @throws \PhpOffice\PhpWord\Exception\CopyFileException
@@ -107,9 +107,9 @@ class TemplateProcessor
      * @param string $xml
      * @param \XSLTProcessor $xsltProcessor
      *
-     * @return string
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return string
      */
     protected function transformSingleXml($xml, $xsltProcessor)
     {
@@ -155,8 +155,6 @@ class TemplateProcessor
      * @param array $xslOptions
      * @param string $xslOptionsUri
      *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     public function applyXslStyleSheet($xslDomDocument, $xslOptions = array(), $xslOptionsUri = '')
@@ -204,9 +202,7 @@ class TemplateProcessor
     /**
      * @param mixed $search
      * @param mixed $replace
-     * @param integer $limit
-     *
-     * @return void
+     * @param int $limit
      */
     public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT)
     {
@@ -260,9 +256,7 @@ class TemplateProcessor
      * Clone a table row in a template document.
      *
      * @param string $search
-     * @param integer $numberOfClones
-     *
-     * @return void
+     * @param int $numberOfClones
      *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
@@ -274,7 +268,7 @@ class TemplateProcessor
 
         $tagPos = strpos($this->tempDocumentMainPart, $search);
         if (!$tagPos) {
-            throw new Exception("Can not clone row, template variable not found or variable contains markup.");
+            throw new Exception('Can not clone row, template variable not found or variable contains markup.');
         }
 
         $rowStart = $this->findRowStart($tagPos);
@@ -319,8 +313,8 @@ class TemplateProcessor
      * Clone a block.
      *
      * @param string $blockname
-     * @param integer $clones
-     * @param boolean $replace
+     * @param int $clones
+     * @param bool $replace
      *
      * @return string|null
      */
@@ -357,8 +351,6 @@ class TemplateProcessor
      *
      * @param string $blockname
      * @param string $replacement
-     *
-     * @return void
      */
     public function replaceBlock($blockname, $replacement)
     {
@@ -381,8 +373,6 @@ class TemplateProcessor
      * Delete a block of text.
      *
      * @param string $blockname
-     *
-     * @return void
      */
     public function deleteBlock($blockname)
     {
@@ -392,9 +382,9 @@ class TemplateProcessor
     /**
      * Saves the result document.
      *
-     * @return string
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return string
      */
     public function save()
     {
@@ -422,8 +412,6 @@ class TemplateProcessor
      * @since 0.8.0
      *
      * @param string $fileName
-     *
-     * @return void
      */
     public function saveAs($fileName)
     {
@@ -447,7 +435,7 @@ class TemplateProcessor
      * Finds parts of broken macros and sticks them together.
      * Macros, while being edited, could be implicitly broken by some of the word processors.
      *
-     * @param string $documentPart The document part in XML representation.
+     * @param string $documentPart The document part in XML representation
      *
      * @return string
      */
@@ -472,7 +460,7 @@ class TemplateProcessor
      * @param mixed $search
      * @param mixed $replace
      * @param string $documentPartXML
-     * @param integer $limit
+     * @param int $limit
      *
      * @return string
      */
@@ -481,10 +469,10 @@ class TemplateProcessor
         // Note: we can't use the same function for both cases here, because of performance considerations.
         if (self::MAXIMUM_REPLACEMENTS_DEFAULT === $limit) {
             return str_replace($search, $replace, $documentPartXML);
-        } else {
-            $regExpEscaper = new RegExp();
-            return preg_replace($regExpEscaper->escape($search), $replace, $documentPartXML, $limit);
         }
+        $regExpEscaper = new RegExp();
+
+        return preg_replace($regExpEscaper->escape($search), $replace, $documentPartXML, $limit);
     }
 
     /**
@@ -504,7 +492,7 @@ class TemplateProcessor
     /**
      * Get the name of the header file for $index.
      *
-     * @param integer $index
+     * @param int $index
      *
      * @return string
      */
@@ -524,7 +512,7 @@ class TemplateProcessor
     /**
      * Get the name of the footer file for $index.
      *
-     * @param integer $index
+     * @param int $index
      *
      * @return string
      */
@@ -536,11 +524,11 @@ class TemplateProcessor
     /**
      * Find the start position of the nearest table row before $offset.
      *
-     * @param integer $offset
-     *
-     * @return integer
+     * @param int $offset
      *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return int
      */
     protected function findRowStart($offset)
     {
@@ -559,9 +547,9 @@ class TemplateProcessor
     /**
      * Find the end position of the nearest table row after $offset.
      *
-     * @param integer $offset
+     * @param int $offset
      *
-     * @return integer
+     * @return int
      */
     protected function findRowEnd($offset)
     {
@@ -571,8 +559,8 @@ class TemplateProcessor
     /**
      * Get a slice of a string.
      *
-     * @param integer $startPosition
-     * @param integer $endPosition
+     * @param int $startPosition
+     * @param int $endPosition
      *
      * @return string
      */
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 78ec5acd..09a00990 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -96,17 +96,15 @@ abstract class AbstractWriter implements WriterInterface
     /**
      * Get PhpWord object
      *
-     * @return \PhpOffice\PhpWord\PhpWord
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @return \PhpOffice\PhpWord\PhpWord
      */
     public function getPhpWord()
     {
         if (!is_null($this->phpWord)) {
             return $this->phpWord;
-        } else {
-            throw new Exception("No PhpWord assigned.");
         }
+        throw new Exception('No PhpWord assigned.');
     }
 
     /**
@@ -118,6 +116,7 @@ abstract class AbstractWriter implements WriterInterface
     public function setPhpWord(PhpWord $phpWord = null)
     {
         $this->phpWord = $phpWord;
+
         return $this;
     }
 
@@ -131,9 +130,9 @@ abstract class AbstractWriter implements WriterInterface
     {
         if ($partName != '' && isset($this->writerParts[strtolower($partName)])) {
             return $this->writerParts[strtolower($partName)];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -152,9 +151,8 @@ abstract class AbstractWriter implements WriterInterface
      * @param bool $value
      * @param string $directory
      *
-     * @return self
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @return self
      */
     public function setUseDiskCaching($value = false, $directory = null)
     {
@@ -236,8 +234,6 @@ abstract class AbstractWriter implements WriterInterface
     /**
      * Cleanup temporary file.
      *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\CopyFileException
      */
     protected function cleanupTempFile()
@@ -257,8 +253,6 @@ abstract class AbstractWriter implements WriterInterface
 
     /**
      * Clear temporary directory.
-     *
-     * @return void
      */
     protected function clearTempDir()
     {
@@ -272,9 +266,9 @@ abstract class AbstractWriter implements WriterInterface
      *
      * @param string $filename
      *
-     * @return \PhpOffice\PhpWord\Shared\ZipArchive
-     *
      * @throws \Exception
+     *
+     * @return \PhpOffice\PhpWord\Shared\ZipArchive
      */
     protected function getZipArchive($filename)
     {
@@ -305,9 +299,9 @@ abstract class AbstractWriter implements WriterInterface
      *
      * @param string $filename
      *
-     * @return resource
-     *
      * @throws \Exception
+     *
+     * @return resource
      */
     protected function openFile($filename)
     {
@@ -330,7 +324,6 @@ abstract class AbstractWriter implements WriterInterface
      *
      * @param resource $fileHandle
      * @param string $content
-     * @return void
      */
     protected function writeFile($fileHandle, $content)
     {
@@ -344,7 +337,6 @@ abstract class AbstractWriter implements WriterInterface
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param mixed $elements
-     * @return void
      */
     protected function addFilesToPackage(ZipArchive $zip, $elements)
     {
@@ -380,7 +372,6 @@ abstract class AbstractWriter implements WriterInterface
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zipPackage
      * @param string $source
      * @param string $target
-     * @return void
      */
     protected function addFileToPackage($zipPackage, $source, $target)
     {
@@ -390,7 +381,7 @@ abstract class AbstractWriter implements WriterInterface
             $source = substr($source, 6);
             list($zipFilename, $imageFilename) = explode('#', $source);
 
-            $zip = new ZipArchive;
+            $zip = new ZipArchive();
             if ($zip->open($zipFilename) !== false) {
                 if ($zip->locateName($imageFilename)) {
                     $zip->extractTo($this->getTempDir(), $imageFilename);
@@ -411,17 +402,16 @@ abstract class AbstractWriter implements WriterInterface
      * Delete directory.
      *
      * @param string $dir
-     * @return void
      */
     private function deleteDir($dir)
     {
         foreach (scandir($dir) as $file) {
             if ($file === '.' || $file === '..') {
                 continue;
-            } elseif (is_file($dir . "/" . $file)) {
-                unlink($dir . "/" . $file);
-            } elseif (is_dir($dir . "/" . $file)) {
-                $this->deleteDir($dir . "/" . $file);
+            } elseif (is_file($dir . '/' . $file)) {
+                unlink($dir . '/' . $file);
+            } elseif (is_dir($dir . '/' . $file)) {
+                $this->deleteDir($dir . '/' . $file);
             }
         }
 
diff --git a/src/PhpWord/Writer/HTML.php b/src/PhpWord/Writer/HTML.php
index 5668f184..9b098dd8 100644
--- a/src/PhpWord/Writer/HTML.php
+++ b/src/PhpWord/Writer/HTML.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -30,7 +30,7 @@ class HTML extends AbstractWriter implements WriterInterface
     /**
      * Is the current writer creating PDF?
      *
-     * @var boolean
+     * @var bool
      */
     protected $isPdf = false;
 
@@ -65,8 +65,6 @@ class HTML extends AbstractWriter implements WriterInterface
      *
      * @param string $filename
      *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     public function save($filename = null)
@@ -119,7 +117,6 @@ class HTML extends AbstractWriter implements WriterInterface
      *
      * @param int $noteId
      * @param string $noteMark
-     * @return void
      */
     public function addNote($noteId, $noteMark)
     {
diff --git a/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index 294d6de7..f6e06258 100644
--- a/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -78,7 +78,6 @@ abstract class AbstractElement
      * Set without paragraph.
      *
      * @param bool $value
-     * @return void
      */
     public function setWithoutP($value)
     {
diff --git a/src/PhpWord/Writer/HTML/Element/Container.php b/src/PhpWord/Writer/HTML/Element/Container.php
index 88384a12..677b6173 100644
--- a/src/PhpWord/Writer/HTML/Element/Container.php
+++ b/src/PhpWord/Writer/HTML/Element/Container.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Endnote.php b/src/PhpWord/Writer/HTML/Element/Endnote.php
index b049e437..c4a3e436 100644
--- a/src/PhpWord/Writer/HTML/Element/Endnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Endnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Footnote.php b/src/PhpWord/Writer/HTML/Element/Footnote.php
index b5aa0a0a..60b246f8 100644
--- a/src/PhpWord/Writer/HTML/Element/Footnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Footnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index 24e35957..3e516b53 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Link.php b/src/PhpWord/Writer/HTML/Element/Link.php
index bff57cfc..bdea985a 100644
--- a/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/src/PhpWord/Writer/HTML/Element/Link.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/ListItem.php b/src/PhpWord/Writer/HTML/Element/ListItem.php
index d8b1e4ed..02b25eb9 100644
--- a/src/PhpWord/Writer/HTML/Element/ListItem.php
+++ b/src/PhpWord/Writer/HTML/Element/ListItem.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/PageBreak.php b/src/PhpWord/Writer/HTML/Element/PageBreak.php
index 8b332dcf..5cab2724 100644
--- a/src/PhpWord/Writer/HTML/Element/PageBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/PageBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -39,6 +39,6 @@ class PageBreak extends TextBreak
             return '<pagebreak style="page-break-before: always;" pagebreak="true"></pagebreak>';
         }
 
-        return "";
+        return '';
     }
 }
diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 9025f01a..c7d8670b 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index 87451595..ed1ba4a3 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -89,7 +89,6 @@ class Text extends AbstractElement
      * Set opening text.
      *
      * @param string $value
-     * @return void
      */
     public function setOpeningText($value)
     {
@@ -100,7 +99,6 @@ class Text extends AbstractElement
      * Set closing text.
      *
      * @param string $value
-     * @return void
      */
     public function setClosingText($value)
     {
@@ -141,7 +139,7 @@ class Text extends AbstractElement
                 $content .= $this->closingText;
             }
 
-            $content .= "</p>" . PHP_EOL;
+            $content .= '</p>' . PHP_EOL;
         }
 
         return $content;
@@ -177,8 +175,6 @@ class Text extends AbstractElement
 
     /**
      * Get font style.
-     *
-     * @return void
      */
     private function getFontStyle()
     {
@@ -194,7 +190,7 @@ class Text extends AbstractElement
         if ($style) {
             $attribute = $fStyleIsObject ? 'style' : 'class';
             $this->openingTags = "<span {$attribute}=\"{$style}\">";
-            $this->closingTags = "</span>";
+            $this->closingTags = '</span>';
         }
     }
 }
diff --git a/src/PhpWord/Writer/HTML/Element/TextBreak.php b/src/PhpWord/Writer/HTML/Element/TextBreak.php
index 9b23d739..93ab924a 100644
--- a/src/PhpWord/Writer/HTML/Element/TextBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/TextBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/TextRun.php b/src/PhpWord/Writer/HTML/Element/TextRun.php
index 492f7597..d7461539 100644
--- a/src/PhpWord/Writer/HTML/Element/TextRun.php
+++ b/src/PhpWord/Writer/HTML/Element/TextRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index 23c29938..ee8f271b 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 584e4489..7b6e0c3e 100644
--- a/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -35,12 +35,12 @@ abstract class AbstractPart
      * @var \Zend\Escaper\Escaper
      */
     protected $escaper;
-    
+
     public function __construct()
     {
         $this->escaper = new Escaper();
     }
-    
+
     /**
      * @return string
      */
@@ -48,8 +48,6 @@ abstract class AbstractPart
 
     /**
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     *
-     * @return void
      */
     public function setParentWriter(AbstractWriter $writer = null)
     {
@@ -57,16 +55,15 @@ abstract class AbstractPart
     }
 
     /**
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     *
+     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
      */
     public function getParentWriter()
     {
         if ($this->parentWriter !== null) {
             return $this->parentWriter;
-        } else {
-            throw new Exception('No parent WriterInterface assigned.');
         }
+        throw new Exception('No parent WriterInterface assigned.');
     }
 }
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
index 0d852a57..eea17350 100644
--- a/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -66,7 +66,7 @@ class Body extends AbstractPart
         $content = '';
 
         if (!empty($notes)) {
-            $content .= "<hr />" . PHP_EOL;
+            $content .= '<hr />' . PHP_EOL;
             foreach ($notes as $noteId => $noteMark) {
                 list($noteType, $noteTypeId) = explode('-', $noteMark);
                 $method = 'get' . ($noteType == 'endnote' ? 'Endnotes' : 'Footnotes');
diff --git a/src/PhpWord/Writer/HTML/Part/Head.php b/src/PhpWord/Writer/HTML/Part/Head.php
index fa4c3833..f4d63014 100644
--- a/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/src/PhpWord/Writer/HTML/Part/Head.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -48,7 +48,7 @@ class Head extends AbstractPart
             'keywords'    => '',
             'category'    => '',
             'company'     => '',
-            'manager'     => ''
+            'manager'     => '',
         );
         $title = $docProps->getTitle();
         $title = ($title != '') ? $title : 'PHPWord';
@@ -60,11 +60,11 @@ class Head extends AbstractPart
         $content .= '<title>' . $title . '</title>' . PHP_EOL;
         foreach ($propertiesMapping as $key => $value) {
             $value = ($value == '') ? $key : $value;
-            $method = "get" . $key;
+            $method = 'get' . $key;
             if ($docProps->$method() != '') {
                 $content .= '<meta name="' . $value . '"'
                           . ' content="' . (Settings::isOutputEscapingEnabled() ? $this->escaper->escapeHtmlAttr($docProps->$method()) : $docProps->$method()) . '"'
-                          .' />' . PHP_EOL;
+                          . ' />' . PHP_EOL;
             }
         }
         $content .= $this->writeStyles();
@@ -86,22 +86,22 @@ class Head extends AbstractPart
         $defaultStyles = array(
             '*' => array(
                 'font-family' => Settings::getDefaultFontName(),
-                'font-size' => Settings::getDefaultFontSize() . 'pt',
+                'font-size'   => Settings::getDefaultFontSize() . 'pt',
             ),
             'a.NoteRef' => array(
                 'text-decoration' => 'none',
             ),
             'hr' => array(
-                'height' => '1px',
-                'padding' => '0',
-                'margin' => '1em 0',
-                'border' => '0',
+                'height'     => '1px',
+                'padding'    => '0',
+                'margin'     => '1em 0',
+                'border'     => '0',
                 'border-top' => '1px solid #CCC',
             ),
             'table' => array(
-                'border' => '1px solid black',
+                'border'         => '1px solid black',
                 'border-spacing' => '0px',
-                'width' => '100%',
+                'width '         => '100%',
             ),
             'td' => array(
                 'border' => '1px solid black',
@@ -123,11 +123,11 @@ class Head extends AbstractPart
                     } else {
                         $name = '.' . $name;
                     }
-                    $css .= "{$name} {" . $styleWriter->write() . '}'  . PHP_EOL;
+                    $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
                 } elseif ($style instanceof Paragraph) {
                     $styleWriter = new ParagraphStyleWriter($style);
                     $name = '.' . $name;
-                    $css .= "{$name} {" . $styleWriter->write() . '}'  . PHP_EOL;
+                    $css .= "{$name} {" . $styleWriter->write() . '}' . PHP_EOL;
                 }
             }
         }
diff --git a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
index 10a0a9ad..fa27c085 100644
--- a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -59,7 +59,6 @@ abstract class AbstractStyle
      * Set parent writer.
      *
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     * @return void
      */
     public function setParentWriter($writer)
     {
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
index c202af93..cb96cf64 100644
--- a/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Generic.php b/src/PhpWord/Writer/HTML/Style/Generic.php
index e3d2b352..73830707 100644
--- a/src/PhpWord/Writer/HTML/Style/Generic.php
+++ b/src/PhpWord/Writer/HTML/Style/Generic.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Image.php b/src/PhpWord/Writer/HTML/Style/Image.php
index 36a9feca..178b1434 100644
--- a/src/PhpWord/Writer/HTML/Style/Image.php
+++ b/src/PhpWord/Writer/HTML/Style/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index 593c6dca..e264ead0 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -49,11 +49,9 @@ class Paragraph extends AbstractStyle
                 case Jc::LEFT:
                     $textAlign = 'left';
                     break;
-
                 case Jc::CENTER:
                     $textAlign = 'center';
                     break;
-
                 case Jc::END:
                 case Jc::MEDIUM_KASHIDA:
                 case Jc::HIGH_KASHIDA:
@@ -61,14 +59,12 @@ class Paragraph extends AbstractStyle
                 case Jc::RIGHT:
                     $textAlign = 'right';
                     break;
-
                 case Jc::BOTH:
                 case Jc::DISTRIBUTE:
                 case Jc::THAI_DISTRIBUTE:
                 case Jc::JUSTIFY:
                     $textAlign = 'justify';
                     break;
-
                 default:
                     $textAlign = 'left';
                     break;
diff --git a/src/PhpWord/Writer/ODText.php b/src/PhpWord/Writer/ODText.php
index 40bc6c2f..7158874c 100644
--- a/src/PhpWord/Writer/ODText.php
+++ b/src/PhpWord/Writer/ODText.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -63,7 +63,6 @@ class ODText extends AbstractWriter implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename
-     * @return void
      */
     public function save($filename = null)
     {
diff --git a/src/PhpWord/Writer/ODText/Element/AbstractElement.php b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
index 0ca43e4f..481995ff 100644
--- a/src/PhpWord/Writer/ODText/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Container.php b/src/PhpWord/Writer/ODText/Element/Container.php
index 212cd184..112e71e8 100644
--- a/src/PhpWord/Writer/ODText/Element/Container.php
+++ b/src/PhpWord/Writer/ODText/Element/Container.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Image.php b/src/PhpWord/Writer/ODText/Element/Image.php
index c6b16cfc..2c0b4727 100644
--- a/src/PhpWord/Writer/ODText/Element/Image.php
+++ b/src/PhpWord/Writer/ODText/Element/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Link.php b/src/PhpWord/Writer/ODText/Element/Link.php
index cb0226a3..c996ab59 100644
--- a/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/src/PhpWord/Writer/ODText/Element/Link.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index f6a2f845..cdc2a0e3 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index cff68481..3b06217d 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -47,42 +47,42 @@ class Text extends AbstractElement
         if ($fStyleIsObject) {
             // Don't never be the case, because I browse all sections for cleaning all styles not declared
             throw new Exception('PhpWord : $fStyleIsObject wouldn\'t be an object');
-        } else {
-            if (!$this->withoutP) {
-                $xmlWriter->startElement('text:p'); // text:p
+        }
+
+        if (!$this->withoutP) {
+            $xmlWriter->startElement('text:p'); // text:p
+        }
+        if (empty($fontStyle)) {
+            if (empty($paragraphStyle)) {
+                $xmlWriter->writeAttribute('text:style-name', 'P1');
+            } elseif (is_string($paragraphStyle)) {
+                $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
             }
-            if (empty($fontStyle)) {
-                if (empty($paragraphStyle)) {
-                    $xmlWriter->writeAttribute('text:style-name', 'P1');
-                } elseif (is_string($paragraphStyle)) {
-                    $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
-                }
-                if (Settings::isOutputEscapingEnabled()) {
-                    $xmlWriter->text($element->getText());
-                } else {
-                    $xmlWriter->writeRaw($element->getText());
-                }
+            if (Settings::isOutputEscapingEnabled()) {
+                $xmlWriter->text($element->getText());
             } else {
-                if (empty($paragraphStyle)) {
-                    $xmlWriter->writeAttribute('text:style-name', 'Standard');
-                } elseif (is_string($paragraphStyle)) {
-                    $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
-                }
-                // text:span
-                $xmlWriter->startElement('text:span');
-                if (is_string($fontStyle)) {
-                    $xmlWriter->writeAttribute('text:style-name', $fontStyle);
-                }
-                if (Settings::isOutputEscapingEnabled()) {
-                    $xmlWriter->text($element->getText());
-                } else {
-                    $xmlWriter->writeRaw($element->getText());
-                }
-                $xmlWriter->endElement();
+                $xmlWriter->writeRaw($element->getText());
             }
-            if (!$this->withoutP) {
-                $xmlWriter->endElement(); // text:p
+        } else {
+            if (empty($paragraphStyle)) {
+                $xmlWriter->writeAttribute('text:style-name', 'Standard');
+            } elseif (is_string($paragraphStyle)) {
+                $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
             }
+            // text:span
+            $xmlWriter->startElement('text:span');
+            if (is_string($fontStyle)) {
+                $xmlWriter->writeAttribute('text:style-name', $fontStyle);
+            }
+            if (Settings::isOutputEscapingEnabled()) {
+                $xmlWriter->text($element->getText());
+            } else {
+                $xmlWriter->writeRaw($element->getText());
+            }
+            $xmlWriter->endElement();
+        }
+        if (!$this->withoutP) {
+            $xmlWriter->endElement(); // text:p
         }
     }
 }
diff --git a/src/PhpWord/Writer/ODText/Element/TextBreak.php b/src/PhpWord/Writer/ODText/Element/TextBreak.php
index b0f5009e..f7642e3b 100644
--- a/src/PhpWord/Writer/ODText/Element/TextBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/TextBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/TextRun.php b/src/PhpWord/Writer/ODText/Element/TextRun.php
index 03717016..f5c855fe 100644
--- a/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index b20ba944..bf9bf9d6 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/AbstractPart.php b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
index dc377e0f..74412fd4 100644
--- a/src/PhpWord/Writer/ODText/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -37,7 +37,6 @@ abstract class AbstractPart extends Word2007AbstractPart
      * Write common root attributes.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     protected function writeCommonRootAttributes(XMLWriter $xmlWriter)
     {
@@ -74,7 +73,6 @@ abstract class AbstractPart extends Word2007AbstractPart
      * Write font faces declaration.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     protected function writeFontFaces(XMLWriter $xmlWriter)
     {
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index 61f8e7e2..8ae4dca9 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -111,7 +111,6 @@ class Content extends AbstractPart
      * @since 0.11.0
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeAutoStyles(XMLWriter $xmlWriter)
     {
@@ -121,7 +120,6 @@ class Content extends AbstractPart
         foreach ($this->autoStyles as $element => $styles) {
             $writerClass = 'PhpOffice\\PhpWord\\Writer\\ODText\\Style\\' . $element;
             foreach ($styles as $style) {
-
                 /** @var \PhpOffice\PhpWord\Writer\ODText\Style\AbstractStyle $styleWriter Type hint */
                 $styleWriter = new $writerClass($xmlWriter, $style);
                 $styleWriter->write();
@@ -135,7 +133,6 @@ class Content extends AbstractPart
      * Write automatic styles.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeTextStyles(XMLWriter $xmlWriter)
     {
@@ -169,7 +166,6 @@ class Content extends AbstractPart
      * Get automatic styles.
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
-     * @return void
      */
     private function getAutoStyles(PhpWord $phpWord)
     {
@@ -192,7 +188,6 @@ class Content extends AbstractPart
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $container
      * @param int &$paragraphStyleCount
      * @param int &$fontStyleCount
-     * @return void
      * @todo Simplify the logic
      */
     private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyleCount)
@@ -226,7 +221,6 @@ class Content extends AbstractPart
      * @param \PhpOffice\PhpWord\Element\Text &$element
      * @param int &$paragraphStyleCount
      * @param int &$fontStyleCount
-     * @return void
      */
     private function getElementStyle(&$element, &$paragraphStyleCount, &$fontStyleCount)
     {
@@ -234,15 +228,14 @@ class Content extends AbstractPart
         $paragraphStyle = $element->getParagraphStyle();
         $phpWord = $this->getParentWriter()->getPhpWord();
 
-        // Font
         if ($fontStyle instanceof Font) {
+            // Font
             $fontStyleCount++;
             $style = $phpWord->addFontStyle("T{$fontStyleCount}", $fontStyle);
             $style->setAuto();
             $element->setFontStyle("T{$fontStyleCount}");
-
-        // Paragraph
         } elseif ($paragraphStyle instanceof Paragraph) {
+            // Paragraph
             $paragraphStyleCount++;
             $style = $phpWord->addParagraphStyle("P{$paragraphStyleCount}", array());
             $style->setAuto();
diff --git a/src/PhpWord/Writer/ODText/Part/Manifest.php b/src/PhpWord/Writer/ODText/Part/Manifest.php
index 237c1a11..d916ccdf 100644
--- a/src/PhpWord/Writer/ODText/Part/Manifest.php
+++ b/src/PhpWord/Writer/ODText/Part/Manifest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Meta.php b/src/PhpWord/Writer/ODText/Part/Meta.php
index f16db161..72d03ae6 100644
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -90,7 +90,6 @@ class Meta extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $property
      * @param string $value
-     * @return void
      *
      * @todo Handle other `$type`: double|date|dateTime|duration|boolean (4th arguments)
      */
diff --git a/src/PhpWord/Writer/ODText/Part/Mimetype.php b/src/PhpWord/Writer/ODText/Part/Mimetype.php
index 7cf78b4b..6e45b848 100644
--- a/src/PhpWord/Writer/ODText/Part/Mimetype.php
+++ b/src/PhpWord/Writer/ODText/Part/Mimetype.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index ee22aaab..e12928d3 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -64,7 +64,6 @@ class Styles extends AbstractPart
      * Write default styles.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeDefault(XMLWriter $xmlWriter)
     {
@@ -114,7 +113,6 @@ class Styles extends AbstractPart
      * Write named styles.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeNamed(XMLWriter $xmlWriter)
     {
@@ -132,11 +130,11 @@ class Styles extends AbstractPart
             }
         }
     }
+
     /**
      * Write page layout styles.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writePageLayout(XMLWriter $xmlWriter)
     {
@@ -144,7 +142,7 @@ class Styles extends AbstractPart
         $xmlWriter->writeAttribute('style:name', 'Mpm1');
 
         $xmlWriter->startElement('style:page-layout-properties');
-        $xmlWriter->writeAttribute('fo:page-width', "21.001cm");
+        $xmlWriter->writeAttribute('fo:page-width', '21.001cm');
         $xmlWriter->writeAttribute('fo:page-height', '29.7cm');
         $xmlWriter->writeAttribute('style:num-format', '1');
         $xmlWriter->writeAttribute('style:print-orientation', 'portrait');
@@ -175,7 +173,6 @@ class Styles extends AbstractPart
 
         $xmlWriter->endElement(); // style:page-layout-properties
 
-
         $xmlWriter->startElement('style:header-style');
         $xmlWriter->endElement(); // style:header-style
 
@@ -189,7 +186,6 @@ class Styles extends AbstractPart
      * Write master style.
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeMaster(XMLWriter $xmlWriter)
     {
diff --git a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
index 7bc49cb3..26b9905b 100644
--- a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Font.php b/src/PhpWord/Writer/ODText/Style/Font.php
index 5d8e5753..50de32ad 100644
--- a/src/PhpWord/Writer/ODText/Style/Font.php
+++ b/src/PhpWord/Writer/ODText/Style/Font.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Font extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Image.php b/src/PhpWord/Writer/ODText/Style/Image.php
index 447f449c..b85d4d70 100644
--- a/src/PhpWord/Writer/ODText/Style/Image.php
+++ b/src/PhpWord/Writer/ODText/Style/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Image extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 1d821810..a047ad32 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Paragraph extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/ODText/Style/Section.php b/src/PhpWord/Writer/ODText/Style/Section.php
index 79d57adb..bef023e9 100644
--- a/src/PhpWord/Writer/ODText/Style/Section.php
+++ b/src/PhpWord/Writer/ODText/Style/Section.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Section extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -40,7 +38,7 @@ class Section extends AbstractStyle
 
         $xmlWriter->startElement('style:style');
         $xmlWriter->writeAttribute('style:name', $style->getStyleName());
-        $xmlWriter->writeAttribute('style:family', "section");
+        $xmlWriter->writeAttribute('style:family', 'section');
         $xmlWriter->startElement('style:section-properties');
 
         $xmlWriter->startElement('style:columns');
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index ff3cc423..7d66899a 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Table extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/PDF.php b/src/PhpWord/Writer/PDF.php
index 5e5d9d71..45fe8f35 100644
--- a/src/PhpWord/Writer/PDF.php
+++ b/src/PhpWord/Writer/PDF.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PhpWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -47,7 +47,7 @@ class PDF
         $pdfLibraryName = Settings::getPdfRendererName();
         $pdfLibraryPath = Settings::getPdfRendererPath();
         if (is_null($pdfLibraryName) || is_null($pdfLibraryPath)) {
-            throw new Exception("PDF rendering library or library path has not been defined.");
+            throw new Exception('PDF rendering library or library path has not been defined.');
         }
 
         $includePath = str_replace('\\', '/', get_include_path());
diff --git a/src/PhpWord/Writer/PDF/AbstractRenderer.php b/src/PhpWord/Writer/PDF/AbstractRenderer.php
index 2778aa52..7b668e0b 100644
--- a/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PhpWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -83,15 +83,17 @@ abstract class AbstractRenderer extends HTML
     public function __construct(PhpWord $phpWord)
     {
         parent::__construct($phpWord);
-        $includeFile = Settings::getPdfRendererPath() . '/' . $this->includeFile;
-        if (file_exists($includeFile)) {
-            /** @noinspection PhpIncludeInspection Dynamic includes */
-            require_once $includeFile;
-        } else {
-            // @codeCoverageIgnoreStart
-            // Can't find any test case. Uncomment when found.
-            throw new Exception('Unable to load PDF Rendering library');
-            // @codeCoverageIgnoreEnd
+        if ($this->includeFile != null) {
+            $includeFile = Settings::getPdfRendererPath() . '/' . $this->includeFile;
+            if (file_exists($includeFile)) {
+                /** @noinspection PhpIncludeInspection Dynamic includes */
+                require_once $includeFile;
+            } else {
+                // @codeCoverageIgnoreStart
+                // Can't find any test case. Uncomment when found.
+                throw new Exception('Unable to load PDF Rendering library');
+                // @codeCoverageIgnoreEnd
+            }
         }
     }
 
@@ -141,6 +143,7 @@ abstract class AbstractRenderer extends HTML
     public function setPaperSize($value = 9)
     {
         $this->paperSize = $value;
+
         return $this;
     }
 
@@ -163,6 +166,7 @@ abstract class AbstractRenderer extends HTML
     public function setOrientation($value = 'default')
     {
         $this->orientation = $value;
+
         return $this;
     }
 
@@ -171,9 +175,8 @@ abstract class AbstractRenderer extends HTML
      *
      * @param string $filename Name of the file to save as
      *
-     * @return resource
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @return resource
      */
     protected function prepareForSave($filename = null)
     {
@@ -194,8 +197,6 @@ abstract class AbstractRenderer extends HTML
      *
      * @param resource $fileHandle
      *
-     * @return void
-     *
      * @throws Exception
      */
     protected function restoreStateAfterSave($fileHandle)
diff --git a/src/PhpWord/Writer/PDF/DomPDF.php b/src/PhpWord/Writer/PDF/DomPDF.php
index e31f3aae..be282d20 100644
--- a/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/src/PhpWord/Writer/PDF/DomPDF.php
@@ -10,19 +10,20 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PhpWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\Writer\PDF;
 
+use Dompdf\Dompdf as DompdfLib;
 use PhpOffice\PhpWord\Writer\WriterInterface;
 
 /**
  * DomPDF writer
  *
- * @link https://github.com/dompdf/dompdf
+ * @see  https://github.com/dompdf/dompdf
  * @since 0.10.0
  */
 class DomPDF extends AbstractRenderer implements WriterInterface
@@ -32,13 +33,12 @@ class DomPDF extends AbstractRenderer implements WriterInterface
      *
      * @var string
      */
-    protected $includeFile = 'dompdf_config.inc.php';
+    protected $includeFile = null;
 
     /**
      * Save PhpWord to file.
      *
      * @param string $filename Name of the file to save as
-     * @return void
      */
     public function save($filename = null)
     {
@@ -49,9 +49,9 @@ class DomPDF extends AbstractRenderer implements WriterInterface
         $orientation = 'portrait';
 
         //  Create PDF
-        $pdf = new \DOMPDF();
-        $pdf->set_paper(strtolower($paperSize), $orientation);
-        $pdf->load_html($this->getContent());
+        $pdf = new DompdfLib();
+        $pdf->setPaper(strtolower($paperSize), $orientation);
+        $pdf->loadHtml(str_replace(PHP_EOL, '', $this->getContent()));
         $pdf->render();
 
         //  Write to file
diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index 028ffac7..80c2eccf 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PhpWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,7 +22,7 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
 /**
  * MPDF writer
  *
- * @link http://www.mpdf1.com/
+ * @see  http://www.mpdf1.com/
  * @since 0.11.0
  */
 class MPDF extends AbstractRenderer implements WriterInterface
@@ -38,7 +38,6 @@ class MPDF extends AbstractRenderer implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename Name of the file to save as
-     * @return void
      */
     public function save($filename = null)
     {
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index e1e19006..3b82511a 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PhpWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
  *
  * @deprecated 0.13.0 Use `DomPDF` or `MPDF` instead.
  *
- * @link http://www.tcpdf.org/
+ * @see  http://www.tcpdf.org/
  * @since 0.11.0
  */
 class TCPDF extends AbstractRenderer implements WriterInterface
diff --git a/src/PhpWord/Writer/RTF.php b/src/PhpWord/Writer/RTF.php
index 887b1c67..7756253a 100644
--- a/src/PhpWord/Writer/RTF.php
+++ b/src/PhpWord/Writer/RTF.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -58,9 +58,6 @@ class RTF extends AbstractWriter implements WriterInterface
      * Save content to file.
      *
      * @param string $filename
-     *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     public function save($filename = null)
@@ -121,7 +118,6 @@ class RTF extends AbstractWriter implements WriterInterface
      * Set last paragraph style.
      *
      * @param mixed $value
-     * @return void
      */
     public function setLastParagraphStyle($value = '')
     {
diff --git a/src/PhpWord/Writer/RTF/Element/AbstractElement.php b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
index 289733dc..1013ee36 100644
--- a/src/PhpWord/Writer/RTF/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -59,8 +59,6 @@ abstract class AbstractElement extends HTMLAbstractElement
 
     /**
      * Get font and paragraph styles.
-     *
-     * @return void
      */
     protected function getStyles()
     {
@@ -112,6 +110,7 @@ abstract class AbstractElement extends HTMLAbstractElement
 
         $styleWriter = new ParagraphStyleWriter($this->paragraphStyle);
         $styleWriter->setNestedLevel($this->element->getNestedLevel());
+
         return $styleWriter->write();
     }
 
@@ -125,9 +124,9 @@ abstract class AbstractElement extends HTMLAbstractElement
     {
         if (Settings::isOutputEscapingEnabled()) {
             return $this->escaper->escape($text);
-        } else {
-            return CommonText::toUnicode($text); // todo: replace with `return $text;` later.
         }
+
+        return CommonText::toUnicode($text); // todo: replace with `return $text;` later.
     }
 
     /**
diff --git a/src/PhpWord/Writer/RTF/Element/Container.php b/src/PhpWord/Writer/RTF/Element/Container.php
index 7a1b0b07..4850c8bf 100644
--- a/src/PhpWord/Writer/RTF/Element/Container.php
+++ b/src/PhpWord/Writer/RTF/Element/Container.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Image.php b/src/PhpWord/Writer/RTF/Element/Image.php
index e950d30b..fb96baff 100644
--- a/src/PhpWord/Writer/RTF/Element/Image.php
+++ b/src/PhpWord/Writer/RTF/Element/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Link.php b/src/PhpWord/Writer/RTF/Element/Link.php
index f106d57d..91a75720 100644
--- a/src/PhpWord/Writer/RTF/Element/Link.php
+++ b/src/PhpWord/Writer/RTF/Element/Link.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/ListItem.php b/src/PhpWord/Writer/RTF/Element/ListItem.php
index b2ba612d..e628bffd 100644
--- a/src/PhpWord/Writer/RTF/Element/ListItem.php
+++ b/src/PhpWord/Writer/RTF/Element/ListItem.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/PageBreak.php b/src/PhpWord/Writer/RTF/Element/PageBreak.php
index ac2bb8ec..0adbe06e 100644
--- a/src/PhpWord/Writer/RTF/Element/PageBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/PageBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Table.php b/src/PhpWord/Writer/RTF/Element/Table.php
index c65d7248..d0bc0845 100644
--- a/src/PhpWord/Writer/RTF/Element/Table.php
+++ b/src/PhpWord/Writer/RTF/Element/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Text.php b/src/PhpWord/Writer/RTF/Element/Text.php
index b5a28adf..2fac0520 100644
--- a/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/src/PhpWord/Writer/RTF/Element/Text.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/TextBreak.php b/src/PhpWord/Writer/RTF/Element/TextBreak.php
index 0f76aea2..2009fcff 100644
--- a/src/PhpWord/Writer/RTF/Element/TextBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/TextBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/TextRun.php b/src/PhpWord/Writer/RTF/Element/TextRun.php
index f63f338d..d4e56765 100644
--- a/src/PhpWord/Writer/RTF/Element/TextRun.php
+++ b/src/PhpWord/Writer/RTF/Element/TextRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Title.php b/src/PhpWord/Writer/RTF/Element/Title.php
index 894f52cc..18bad9fd 100644
--- a/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/src/PhpWord/Writer/RTF/Element/Title.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 04fb4cfd..7569a105 100644
--- a/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -48,8 +48,6 @@ abstract class AbstractPart
 
     /**
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     *
-     * @return void
      */
     public function setParentWriter(AbstractWriter $writer = null)
     {
@@ -57,16 +55,14 @@ abstract class AbstractPart
     }
 
     /**
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
      */
     public function getParentWriter()
     {
         if ($this->parentWriter !== null) {
             return $this->parentWriter;
-        } else {
-            throw new Exception('No parent WriterInterface assigned.');
         }
+        throw new Exception('No parent WriterInterface assigned.');
     }
 }
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
index 97b2f1b6..465872ea 100644
--- a/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Writer\RTF\Style\Section as SectionStyleWriter;
  * RTF document part writer
  *
  * @since 0.11.0
- * @link http://www.biblioscape.com/rtf15_spec.htm#Heading24
+ * @see  http://www.biblioscape.com/rtf15_spec.htm#Heading24
  */
 class Document extends AbstractPart
 {
@@ -54,9 +54,13 @@ class Document extends AbstractPart
     {
         $docProps = $this->getParentWriter()->getPhpWord()->getDocInfo();
         $properties = array('title', 'subject', 'category', 'keywords', 'comment',
-            'author', 'operator', 'creatim', 'revtim', 'company', 'manager');
-        $mapping = array('comment' => 'description', 'author' => 'creator', 'operator' => 'lastModifiedBy',
-            'creatim' => 'created', 'revtim' => 'modified');
+            'author', 'operator', 'creatim', 'revtim', 'company', 'manager', );
+        $mapping = array(
+            'comment'  => 'description',
+            'author'   => 'creator',
+            'operator' => 'lastModifiedBy',
+            'creatim'  => 'created',
+            'revtim'   => 'modified', );
         $dateFields = array('creatim', 'revtim');
 
         $content = '';
diff --git a/src/PhpWord/Writer/RTF/Part/Header.php b/src/PhpWord/Writer/RTF/Part/Header.php
index 56a50349..73f1351f 100644
--- a/src/PhpWord/Writer/RTF/Part/Header.php
+++ b/src/PhpWord/Writer/RTF/Part/Header.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,7 +33,7 @@ use PhpOffice\PhpWord\Style\Font;
  * - List table (not supported yet)
  *
  * @since 0.11.0
- * @link http://www.biblioscape.com/rtf15_spec.htm#Heading6
+ * @see  http://www.biblioscape.com/rtf15_spec.htm#Heading6
  */
 class Header extends AbstractPart
 {
@@ -181,8 +181,6 @@ class Header extends AbstractPart
 
     /**
      * Register all fonts and colors in both named and inline styles to appropriate header table.
-     *
-     * @return void
      */
     private function registerFont()
     {
@@ -213,7 +211,6 @@ class Header extends AbstractPart
      * Register border colors.
      *
      * @param \PhpOffice\PhpWord\Style\Border $style
-     * @return void
      */
     private function registerBorderColor($style)
     {
@@ -229,7 +226,6 @@ class Header extends AbstractPart
      * Register fonts and colors.
      *
      * @param \PhpOffice\PhpWord\Style\AbstractStyle $style
-     * @return void
      */
     private function registerFontItems($style)
     {
@@ -249,7 +245,6 @@ class Header extends AbstractPart
      * @param array &$table
      * @param string $value
      * @param string $default
-     * @return void
      */
     private function registerTableItem(&$table, $value, $default = null)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
index 417be9cf..80523610 100644
--- a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/Border.php b/src/PhpWord/Writer/RTF/Style/Border.php
index 9f7ee2c0..e63d767f 100644
--- a/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/src/PhpWord/Writer/RTF/Style/Border.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -103,8 +103,7 @@ class Border extends AbstractStyle
     /**
      * Set sizes.
      *
-     * @param integer[] $value
-     * @return void
+     * @param int[] $value
      */
     public function setSizes($value)
     {
@@ -115,7 +114,6 @@ class Border extends AbstractStyle
      * Set colors.
      *
      * @param string[] $value
-     * @return void
      */
     public function setColors($value)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/Font.php b/src/PhpWord/Writer/RTF/Style/Font.php
index 6567ec33..3338368a 100644
--- a/src/PhpWord/Writer/RTF/Style/Font.php
+++ b/src/PhpWord/Writer/RTF/Style/Font.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -62,7 +62,7 @@ class Font extends AbstractStyle
         $content .= $this->getValueIf($style->isSuperScript(), '\super');
         $content .= $this->getValueIf($style->isSubScript(), '\sub');
 
-        return $content .  ' ';
+        return $content . ' ';
     }
 
     /**
@@ -70,7 +70,6 @@ class Font extends AbstractStyle
      *
      *
      * @param int $value
-     * @return void
      */
     public function setNameIndex($value = 0)
     {
@@ -81,7 +80,6 @@ class Font extends AbstractStyle
      * Set font color index.
      *
      * @param int $value
-     * @return void
      */
     public function setColorIndex($value = 0)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index 046adc8c..61b61fd7 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -74,7 +74,6 @@ class Paragraph extends AbstractStyle
      * Set nested level.
      *
      * @param int $value
-     * @return void
      */
     public function setNestedLevel($value)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index dcdc0aaf..8f073716 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index bb7b521f..fcef982f 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -92,7 +92,6 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Save document by name.
      *
      * @param string $filename
-     * @return void
      */
     public function save($filename = null)
     {
@@ -170,7 +169,6 @@ class Word2007 extends AbstractWriter implements WriterInterface
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param string $docPart
-     * @return void
      */
     private function addHeaderFooterMedia(ZipArchive $zip, $docPart)
     {
@@ -197,16 +195,15 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * @param \PhpOffice\PhpWord\Element\Section &$section
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param string $elmType header|footer
-     * @param integer &$rId
-     * @return void
+     * @param int &$rId
      */
     private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elmType, &$rId)
     {
         $getFunction = $elmType == 'header' ? 'getHeaders' : 'getFooters';
         $elmCount = ($section->getSectionId() - 1) * 3;
         $elements = $section->$getFunction();
+        /** @var \PhpOffice\PhpWord\Element\AbstractElement $element Type hint */
         foreach ($elements as &$element) {
-            /** @var \PhpOffice\PhpWord\Element\AbstractElement $element Type hint */
             $elmCount++;
             $element->setRelationId(++$rId);
             $elmFile = "{$elmType}{$elmCount}.xml"; // e.g. footer1.xml
@@ -223,9 +220,8 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Add footnotes/endnotes
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
-     * @param integer &$rId
+     * @param int &$rId
      * @param string $noteType
-     * @return void
      */
     private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote')
     {
@@ -261,14 +257,13 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Add comments
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
-     * @param integer &$rId
-     * @return void
+     * @param int &$rId
      */
     private function addComments(ZipArchive $zip, &$rId)
     {
         $phpWord = $this->getPhpWord();
         $collection = $phpWord->getComments();
-        $partName = "comments";
+        $partName = 'comments';
 
         // Add comment relations and contents
         /** @var \PhpOffice\PhpWord\Collection\AbstractCollection $collection Type hint */
@@ -285,8 +280,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Add chart.
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
-     * @param integer &$rId
-     * @return void
+     * @param int &$rId
      */
     private function addChart(ZipArchive $zip, &$rId)
     {
@@ -295,6 +289,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
         $collection = $phpWord->getCharts();
         $index = 0;
         if ($collection->countItems() > 0) {
+            /** @var \PhpOffice\PhpWord\Element\Chart $chart */
             foreach ($collection->getItems() as $chart) {
                 $index++;
                 $rId++;
@@ -307,7 +302,6 @@ class Word2007 extends AbstractWriter implements WriterInterface
                 $this->relationships[] = array('target' => $filename, 'type' => 'chart', 'rID' => $rId);
 
                 // word/charts/chartN.xml
-                /** @var \PhpOffice\PhpWord\Element\Chart $chart */
                 $chart->setRelationId($rId);
                 $writerPart = $this->getWriterPart('Chart');
                 $writerPart->setElement($chart);
@@ -320,7 +314,6 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Register content types for each media.
      *
      * @param array $media
-     * @return void
      */
     private function registerContentTypes($media)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 305a768e..07ffc286 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -92,7 +92,6 @@ abstract class AbstractElement
      * Start w:p DOM element.
      *
      * @uses \PhpOffice\PhpWord\Writer\Word2007\Element\PageBreak::write()
-     * @return void
      */
     protected function startElementP()
     {
@@ -108,8 +107,6 @@ abstract class AbstractElement
 
     /**
      * End w:p DOM element.
-     *
-     * @return void
      */
     protected function endElementP()
     {
@@ -121,8 +118,6 @@ abstract class AbstractElement
 
     /**
      * Writes the w:commentRangeStart DOM element
-     *
-     * @return void
      */
     protected function writeCommentRangeStart()
     {
@@ -139,8 +134,6 @@ abstract class AbstractElement
 
     /**
      * Writes the w:commentRangeEnd DOM element
-     *
-     * @return void
      */
     protected function writeCommentRangeEnd()
     {
@@ -171,8 +164,6 @@ abstract class AbstractElement
 
     /**
      * Write ending.
-     *
-     * @return void
      */
     protected function writeParagraphStyle()
     {
@@ -181,20 +172,16 @@ abstract class AbstractElement
 
     /**
      * Write ending.
-     *
-     * @return void
      */
     protected function writeFontStyle()
     {
         $this->writeTextStyle('Font');
     }
 
-
     /**
      * Write text style.
      *
      * @param string $styleType Font|Paragraph
-     * @return void
      */
     private function writeTextStyle($styleType)
     {
@@ -202,12 +189,12 @@ abstract class AbstractElement
         $class = "PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\{$styleType}";
         $styleObject = $this->element->$method();
 
+        /** @var \PhpOffice\PhpWord\Writer\Word2007\Style\AbstractStyle $styleWriter Type Hint */
         $styleWriter = new $class($this->xmlWriter, $styleObject);
         if (method_exists($styleWriter, 'setIsInline')) {
             $styleWriter->setIsInline(true);
         }
 
-        /** @var \PhpOffice\PhpWord\Writer\Word2007\Style\AbstractStyle $styleWriter */
         $styleWriter->write();
     }
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Bookmark.php b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
index 424fb0ab..4b0b78a7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Bookmark.php
+++ b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -41,7 +41,7 @@ class Bookmark extends AbstractElement
         $xmlWriter->writeAttribute('w:id', $rId);
         $xmlWriter->writeAttribute('w:name', $element->getName());
         $xmlWriter->endElement();
-        
+
         $xmlWriter->startElement('w:bookmarkEnd');
         $xmlWriter->writeAttribute('w:id', $rId);
         $xmlWriter->endElement();
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index ecdde362..591799ab 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Chart extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index 7424985c..31dcb867 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class CheckBox extends Text
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -66,17 +64,17 @@ class CheckBox extends Text
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
         $xmlWriter->text(' FORMCHECKBOX ');
-        $xmlWriter->endElement();// w:instrText
+        $xmlWriter->endElement(); // w:instrText
         $xmlWriter->endElement(); // w:r
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:fldChar');
         $xmlWriter->writeAttribute('w:fldCharType', 'separate');
-        $xmlWriter->endElement();// w:fldChar
+        $xmlWriter->endElement(); // w:fldChar
         $xmlWriter->endElement(); // w:r
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:fldChar');
         $xmlWriter->writeAttribute('w:fldCharType', 'end');
-        $xmlWriter->endElement();// w:fldChar
+        $xmlWriter->endElement(); // w:fldChar
         $xmlWriter->endElement(); // w:r
 
         $xmlWriter->startElement('w:r');
diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
index 0efd0ebc..47dae29b 100644
--- a/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -38,8 +38,6 @@ class Container extends AbstractElement
 
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Endnote.php b/src/PhpWord/Writer/Word2007/Element/Endnote.php
index 9363489e..ebfe35c1 100644
--- a/src/PhpWord/Writer/Word2007/Element/Endnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Endnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 9fc45b21..75d4983f 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,13 +26,11 @@ class Field extends Text
 {
     /**
      * Write field element.
-     *
-     * @return void
      */
     public function write()
     {
         $xmlWriter = $this->getXmlWriter();
-        $element   = $this->getElement();
+        $element = $this->getElement();
         if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
             return;
         }
@@ -65,7 +63,6 @@ class Field extends Text
 
         if ($element->getText() != null) {
             if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
-
                 $containerWriter = new Container($xmlWriter, $element->getText(), true);
                 $containerWriter->write();
 
@@ -110,17 +107,17 @@ class Field extends Text
     private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
     {
         $propertiesAndOptions = '';
-        $properties  = $element->getProperties();
+        $properties = $element->getProperties();
         foreach ($properties as $propkey => $propval) {
             switch ($propkey) {
                 case 'format':
-                    $propertiesAndOptions.= '\* ' . $propval . ' ';
+                    $propertiesAndOptions .= '\* ' . $propval . ' ';
                     break;
                 case 'numformat':
-                    $propertiesAndOptions.= '\# ' . $propval . ' ';
+                    $propertiesAndOptions .= '\# ' . $propval . ' ';
                     break;
                 case 'dateformat':
-                    $propertiesAndOptions.= '\@ "' . $propval . '" ';
+                    $propertiesAndOptions .= '\@ "' . $propval . '" ';
                     break;
             }
         }
@@ -129,27 +126,28 @@ class Field extends Text
         foreach ($options as $option) {
             switch ($option) {
                 case 'PreserveFormat':
-                    $propertiesAndOptions.= '\* MERGEFORMAT ';
+                    $propertiesAndOptions .= '\* MERGEFORMAT ';
                     break;
                 case 'LunarCalendar':
-                    $propertiesAndOptions.= '\h ';
+                    $propertiesAndOptions .= '\h ';
                     break;
                 case 'SakaEraCalendar':
-                    $propertiesAndOptions.= '\s ';
+                    $propertiesAndOptions .= '\s ';
                     break;
                 case 'LastUsedFormat':
-                    $propertiesAndOptions.= '\l ';
+                    $propertiesAndOptions .= '\l ';
                     break;
                 case 'Bold':
-                    $propertiesAndOptions.= '\b ';
+                    $propertiesAndOptions .= '\b ';
                     break;
                 case 'Italic':
-                    $propertiesAndOptions.= '\i ';
+                    $propertiesAndOptions .= '\i ';
                     break;
                 default:
-                    $propertiesAndOptions.= $option .' ';
+                    $propertiesAndOptions .= $option . ' ';
             }
         }
+
         return $propertiesAndOptions;
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Footnote.php b/src/PhpWord/Writer/Word2007/Element/Footnote.php
index 53fcd6a0..65ef40c7 100644
--- a/src/PhpWord/Writer/Word2007/Element/Footnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,8 +33,6 @@ class Footnote extends Text
 
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index 27df756f..91fb28ab 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,7 +27,7 @@ use PhpOffice\PhpWord\Settings;
  * Note: DropDown is active when document protection is set to `forms`
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFData.html
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class FormField extends Text
@@ -37,8 +37,6 @@ class FormField extends Text
 
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -80,7 +78,7 @@ class FormField extends Text
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
         $xmlWriter->text("{$instruction}");
-        $xmlWriter->endElement();// w:instrText
+        $xmlWriter->endElement(); // w:instrText
         $xmlWriter->endElement(); // w:r
 
         $xmlWriter->startElement('w:r');
@@ -111,10 +109,9 @@ class FormField extends Text
     /**
      * Write textinput.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFTextInput.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFTextInput.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
-     * @return void
      */
     private function writeTextInput(XMLWriter $xmlWriter, FormFieldElement $element)
     {
@@ -128,10 +125,9 @@ class FormField extends Text
     /**
      * Write checkbox.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFCheckBox.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFCheckBox.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
-     * @return void
      */
     private function writeCheckBox(XMLWriter $xmlWriter, FormFieldElement $element)
     {
@@ -152,10 +148,9 @@ class FormField extends Text
     /**
      * Write dropdown.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_FFDDList.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_FFDDList.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\FormField $element
-     * @return void
      */
     private function writeDropDown(XMLWriter $xmlWriter, FormFieldElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index edf32739..7e33f75e 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -30,8 +30,6 @@ class Image extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -50,8 +48,6 @@ class Image extends AbstractElement
 
     /**
      * Write image element.
-     *
-     * @return void
      */
     private function writeImage(XMLWriter $xmlWriter, ImageElement $element)
     {
@@ -86,8 +82,6 @@ class Image extends AbstractElement
 
     /**
      * Write watermark element.
-     *
-     * @return void
      */
     private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index ebc5d395..9b1a160d 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -22,19 +22,16 @@ use PhpOffice\PhpWord\Writer\Word2007\Style\Line as LineStyleWriter;
 
 /**
  * Line element writer
- *
  */
 class Line extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
         $xmlWriter = $this->getXmlWriter();
-        $element   = $this->getElement();
+        $element = $this->getElement();
         if (!$element instanceof LineElement) {
             return;
         }
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index 5f7ad278..8ea3f53c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Link extends Text
 {
     /**
      * Write link element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItem.php b/src/PhpWord/Writer/Word2007/Element/ListItem.php
index 53644ffa..c1aa0ce3 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItem.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItem.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class ListItem extends AbstractElement
 {
     /**
      * Write list item element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
index 1ac17a98..e6ed2b46 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class ListItemRun extends AbstractElement
 {
     /**
      * Write list item element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/Object.php
index fc0532cd..8231ec0c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/Object.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Object extends AbstractElement
 {
     /**
      * Write object element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/PageBreak.php b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
index 363a8c2c..04ff29d4 100644
--- a/src/PhpWord/Writer/Word2007/Element/PageBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,7 +28,6 @@ class PageBreak extends AbstractElement
      * Write element.
      *
      * @usedby \PhpOffice\PhpWord\Writer\Word2007\Element\AbstractElement::startElementP()
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
index 2c775d14..0dafa4a0 100644
--- a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,7 +29,7 @@ class ParagraphAlignment
     /**
      * @since 0.13.0
      *
-     * @param string $value Any value provided by Jc simple type.
+     * @param string $value Any value provided by Jc simple type
      *
      * @see \PhpOffice\PhpWord\SimpleType\Jc For the allowed values of $value parameter.
      */
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 82c6f87b..92b9ea40 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class PreserveText extends Text
 {
     /**
      * Write preserve text element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 313bf7e0..e77f87e9 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,15 +24,13 @@ use PhpOffice\PhpWord\Element\SDT as SDTElement;
  * Structured document tag element writer
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtBlock.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtBlock.html
  * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
  */
 class SDT extends Text
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -70,10 +68,9 @@ class SDT extends Text
     /**
      * Write combo box.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtComboBox.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeComboBox(XMLWriter $xmlWriter, SDTElement $element)
     {
@@ -90,10 +87,9 @@ class SDT extends Text
     /**
      * Write drop down list.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDropDownList.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element)
     {
@@ -103,10 +99,9 @@ class SDT extends Text
     /**
      * Write date.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
+     * @see  http://www.datypic.com/sc/ooxml/t-w_CT_SdtDate.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\SDT $element
-     * @return void
      */
     private function writeDate(XMLWriter $xmlWriter, SDTElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index a589af6c..e384db06 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -32,8 +32,6 @@ class Shape extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -81,7 +79,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeArc(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -96,7 +93,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeCurve(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -112,7 +108,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeLine(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -127,7 +122,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writePolyline(XMLWriter $xmlWriter, ShapeStyle $style)
     {
@@ -139,7 +133,6 @@ class Shape extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Shape $style
-     * @return void
      */
     private function writeRoundRect(XMLWriter $xmlWriter, ShapeStyle $style)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index 996edb64..a679188f 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -34,8 +34,6 @@ class TOC extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -71,7 +69,6 @@ class TOC extends AbstractElement
      * @param \PhpOffice\PhpWord\Element\TOC $element
      * @param \PhpOffice\PhpWord\Element\Title $title
      * @param bool $writeFieldMark
-     * @return void
      */
     private function writeTitle(XMLWriter $xmlWriter, TOCElement $element, $title, $writeFieldMark)
     {
@@ -143,7 +140,6 @@ class TOC extends AbstractElement
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\TOC $element
      * @param int $indent
-     * @return void
      */
     private function writeStyle(XMLWriter $xmlWriter, TOCElement $element, $indent)
     {
@@ -189,7 +185,6 @@ class TOC extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\TOC $element
-     * @return void
      */
     private function writeFieldMark(XMLWriter $xmlWriter, TOCElement $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index 093666ee..c0590772 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -36,8 +36,6 @@ class Table extends AbstractElement
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
@@ -75,7 +73,6 @@ class Table extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Table $element
-     * @return void
      */
     private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
     {
@@ -112,7 +109,6 @@ class Table extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Row $row
-     * @return void
      */
     private function writeRow(XMLWriter $xmlWriter, RowElement $row)
     {
@@ -139,11 +135,9 @@ class Table extends AbstractElement
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Cell $cell
-     * @return void
      */
     private function writeCell(XMLWriter $xmlWriter, CellElement $cell)
     {
-
         $xmlWriter->startElement('w:tc');
 
         // Write style
diff --git a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
index 45459a38..44450fd6 100644
--- a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,7 +29,7 @@ class TableAlignment
     /**
      * @since 0.13.0
      *
-     * @param string $value Any value provided by JcTable simple type.
+     * @param string $value Any value provided by JcTable simple type
      *
      * @see \PhpOffice\PhpWord\SimpleType\JcTable For the allowed values of $value parameter.
      */
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 2df4892b..694a834a 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Text extends AbstractElement
 {
     /**
      * Write text element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index e83fe0c9..3780c698 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class TextBox extends Image
 {
     /**
      * Write element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBreak.php b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
index a9e6f613..161a528e 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class TextBreak extends Text
 {
     /**
      * Write text break element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/TextRun.php b/src/PhpWord/Writer/Word2007/Element/TextRun.php
index 1e95ab5c..9fd70b13 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextRun.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class TextRun extends Text
 {
     /**
      * Write textrun element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 925d4c43..63ed94de 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Title extends AbstractElement
 {
     /**
      * Write title element.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 26734aa0..0b9d8b88 100644
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -50,7 +50,6 @@ abstract class AbstractPart
      * Set parent writer.
      *
      * @param \PhpOffice\PhpWord\Writer\AbstractWriter $writer
-     * @return void
      */
     public function setParentWriter(AbstractWriter $writer = null)
     {
@@ -60,17 +59,15 @@ abstract class AbstractPart
     /**
      * Get parent writer
      *
-     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
+     * @return \PhpOffice\PhpWord\Writer\AbstractWriter
      */
     public function getParentWriter()
     {
         if (!is_null($this->parentWriter)) {
             return $this->parentWriter;
-        } else {
-            throw new Exception('No parent WriterInterface assigned.');
         }
+        throw new Exception('No parent WriterInterface assigned.');
     }
 
     /**
@@ -88,8 +85,8 @@ abstract class AbstractPart
         }
         if ($useDiskCaching) {
             return new XMLWriter(XMLWriter::STORAGE_DISK, $this->parentWriter->getDiskCachingDirectory(), Settings::hasCompatibility());
-        } else {
-            return new XMLWriter(XMLWriter::STORAGE_MEMORY, './', Settings::hasCompatibility());
         }
+
+        return new XMLWriter(XMLWriter::STORAGE_MEMORY, './', Settings::hasCompatibility());
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 86045b9a..2f162108 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,14 +24,14 @@ use PhpOffice\PhpWord\Element\Chart as ChartElement;
  * Word2007 chart part writer: word/charts/chartx.xml
  *
  * @since 0.12.0
- * @link http://www.datypic.com/sc/ooxml/e-draw-chart_chartSpace.html
+ * @see  http://www.datypic.com/sc/ooxml/e-draw-chart_chartSpace.html
  */
 class Chart extends AbstractPart
 {
     /**
      * Chart element
      *
-     * @var \PhpOffice\PhpWord\Element\Chart $element
+     * @var \PhpOffice\PhpWord\Element\Chart
      */
     private $element;
 
@@ -62,7 +62,6 @@ class Chart extends AbstractPart
      * Set chart element.
      *
      * @param \PhpOffice\PhpWord\Element\Chart $element
-     * @return void
      */
     public function setElement(ChartElement $element)
     {
@@ -95,9 +94,8 @@ class Chart extends AbstractPart
     /**
      * Write chart
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_Chart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_Chart.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writeChart(XMLWriter $xmlWriter)
     {
@@ -113,16 +111,15 @@ class Chart extends AbstractPart
     /**
      * Write plot area.
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PlotArea.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PieChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_DoughnutChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_BarChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_LineChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_AreaChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_RadarChart.html
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_ScatterChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PlotArea.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_PieChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_DoughnutChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_BarChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_LineChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_AreaChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_RadarChart.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_ScatterChart.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @return void
      */
     private function writePlotArea(XMLWriter $xmlWriter)
     {
@@ -135,7 +132,7 @@ class Chart extends AbstractPart
 
         // Chart
         $chartType = $this->options['type'];
-        $chartType .= $style->is3d() && !isset($this->options['no3d'])? '3D' : '';
+        $chartType .= $style->is3d() && !isset($this->options['no3d']) ? '3D' : '';
         $chartType .= 'Chart';
         $xmlWriter->startElement("c:{$chartType}");
 
@@ -182,7 +179,6 @@ class Chart extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param bool $scatter
-     * @return void
      */
     private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
     {
@@ -221,13 +217,12 @@ class Chart extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $type
      * @param array $values
-     * @return void
      */
     private function writeSeriesItem(XMLWriter $xmlWriter, $type, $values)
     {
         $types = array(
-            'cat' => array('c:cat', 'c:strLit'),
-            'val' => array('c:val', 'c:numLit'),
+            'cat'  => array('c:cat', 'c:strLit'),
+            'val'  => array('c:val', 'c:numLit'),
             'xVal' => array('c:xVal', 'c:strLit'),
             'yVal' => array('c:yVal', 'c:numLit'),
         );
@@ -258,10 +253,9 @@ class Chart extends AbstractPart
     /**
      * Write axis
      *
-     * @link http://www.datypic.com/sc/ooxml/t-draw-chart_CT_CatAx.html
+     * @see  http://www.datypic.com/sc/ooxml/t-draw-chart_CT_CatAx.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $type
-     * @return void
      */
     private function writeAxis(XMLWriter $xmlWriter, $type)
     {
@@ -301,10 +295,9 @@ class Chart extends AbstractPart
     /**
      * Write shape
      *
-     * @link http://www.datypic.com/sc/ooxml/t-a_CT_ShapeProperties.html
+     * @see  http://www.datypic.com/sc/ooxml/t-a_CT_ShapeProperties.html
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param bool $line
-     * @return void
      */
     private function writeShape(XMLWriter $xmlWriter, $line = false)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index 73314785..b2b49864 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -72,7 +72,6 @@ class Comments extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Comment $comment
-     * @return void
      */
     protected function writeComment(XMLWriter $xmlWriter, Comment $comment)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 7a03243e..9be988d3 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -36,20 +36,20 @@ class ContentTypes extends AbstractPart
         $contentTypes = $parentWriter->getContentTypes();
 
         $openXMLPrefix = 'application/vnd.openxmlformats-';
-        $wordMLPrefix  = $openXMLPrefix . 'officedocument.wordprocessingml.';
-        $drawingMLPrefix  = $openXMLPrefix . 'officedocument.drawingml.';
+        $wordMLPrefix = $openXMLPrefix . 'officedocument.wordprocessingml.';
+        $drawingMLPrefix = $openXMLPrefix . 'officedocument.drawingml.';
         $overrides = array(
             '/docProps/core.xml'     => $openXMLPrefix . 'package.core-properties+xml',
             '/docProps/app.xml'      => $openXMLPrefix . 'officedocument.extended-properties+xml',
             '/docProps/custom.xml'   => $openXMLPrefix . 'officedocument.custom-properties+xml',
-            '/word/document.xml'     => $wordMLPrefix  . 'document.main+xml',
-            '/word/styles.xml'       => $wordMLPrefix  . 'styles+xml',
-            '/word/numbering.xml'    => $wordMLPrefix  . 'numbering+xml',
-            '/word/settings.xml'     => $wordMLPrefix  . 'settings+xml',
+            '/word/document.xml'     => $wordMLPrefix . 'document.main+xml',
+            '/word/styles.xml'       => $wordMLPrefix . 'styles+xml',
+            '/word/numbering.xml'    => $wordMLPrefix . 'numbering+xml',
+            '/word/settings.xml'     => $wordMLPrefix . 'settings+xml',
             '/word/theme/theme1.xml' => $openXMLPrefix . 'officedocument.theme+xml',
-            '/word/webSettings.xml'  => $wordMLPrefix  . 'webSettings+xml',
-            '/word/fontTable.xml'    => $wordMLPrefix  . 'fontTable+xml',
-            '/word/comments.xml'     => $wordMLPrefix  . 'comments+xml',
+            '/word/webSettings.xml'  => $wordMLPrefix . 'webSettings+xml',
+            '/word/fontTable.xml'    => $wordMLPrefix . 'fontTable+xml',
+            '/word/comments.xml'     => $wordMLPrefix . 'comments+xml',
         );
 
         $defaults = $contentTypes['default'];
@@ -82,8 +82,7 @@ class ContentTypes extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter XML Writer
      * @param array $parts
-     * @param boolean $isDefault
-     * @return void
+     * @param bool $isDefault
      */
     private function writeContentType(XMLWriter $xmlWriter, $parts, $isDefault)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
index adfe752f..dbd55187 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
index afb6f286..fdabee36 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index 63ed8ede..212e9d27 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index 11e3f510..72e4fcd8 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -56,7 +56,6 @@ class Document extends AbstractPart
 
         $xmlWriter->startElement('w:body');
 
-
         if ($sectionCount > 0) {
             foreach ($sections as $section) {
                 $currentSection++;
@@ -83,7 +82,6 @@ class Document extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Section $section
-     * @return void
      */
     private function writeSection(XMLWriter $xmlWriter, Section $section)
     {
@@ -99,7 +97,6 @@ class Document extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Section $section
-     * @return void
      */
     private function writeSectionSettings(XMLWriter $xmlWriter, Section $section)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Endnotes.php b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
index bc15cf1e..289119db 100644
--- a/src/PhpWord/Writer/Word2007/Part/Endnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/FontTable.php b/src/PhpWord/Writer/Word2007/Part/FontTable.php
index 08f0ad0e..065a318e 100644
--- a/src/PhpWord/Writer/Word2007/Part/FontTable.php
+++ b/src/PhpWord/Writer/Word2007/Part/FontTable.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Footer.php b/src/PhpWord/Writer/Word2007/Part/Footer.php
index 3e4e4fee..cfc9dd40 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footer.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footer.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
index fd692149..c9e3bcac 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -137,7 +137,6 @@ class Footnotes extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Element\Footnote|\PhpOffice\PhpWord\Element\Endnote $element
-     * @return void
      */
     protected function writeNote(XMLWriter $xmlWriter, $element)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Header.php b/src/PhpWord/Writer/Word2007/Part/Header.php
index 438e503e..5853d92f 100644
--- a/src/PhpWord/Writer/Word2007/Part/Header.php
+++ b/src/PhpWord/Writer/Word2007/Part/Header.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Numbering.php b/src/PhpWord/Writer/Word2007/Part/Numbering.php
index c5c9b4c7..6233a6b7 100644
--- a/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -99,7 +99,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      */
     private function writeLevel(XMLWriter $xmlWriter, NumberingLevel $level)
     {
@@ -140,7 +139,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      * @todo Use paragraph style writer
      */
     private function writeParagraph(XMLWriter $xmlWriter, NumberingLevel $level)
@@ -173,7 +171,6 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\NumberingLevel $level
-     * @return void
      * @todo Use font style writer
      */
     private function writeFont(XMLWriter $xmlWriter, NumberingLevel $level)
diff --git a/src/PhpWord/Writer/Word2007/Part/Rels.php b/src/PhpWord/Writer/Word2007/Part/Rels.php
index 4a3b5b67..154c7e89 100644
--- a/src/PhpWord/Writer/Word2007/Part/Rels.php
+++ b/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -53,7 +53,6 @@ class Rels extends AbstractPart
      * @param array $xmlRels
      * @param array $mediaRels
      * @param int $relId
-     * @return void
      */
     protected function writeRels(XMLWriter $xmlWriter, $xmlRels = array(), $mediaRels = array(), $relId = 1)
     {
@@ -80,7 +79,6 @@ class Rels extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param int $relId
      * @param array $mediaRel
-     * @return void
      */
     private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel)
     {
@@ -109,8 +107,6 @@ class Rels extends AbstractPart
      * @param string $target Relationship target
      * @param string $targetMode Relationship target mode
      *
-     * @return void
-     *
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
     private function writeRel(XMLWriter $xmlWriter, $relId, $type, $target, $targetMode = '')
@@ -128,7 +124,7 @@ class Rels extends AbstractPart
             }
             $xmlWriter->endElement();
         } else {
-            throw new Exception("Invalid parameters passed.");
+            throw new Exception('Invalid parameters passed.');
         }
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
index c60dba28..505aa223 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsPart.php b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
index e8939c7f..e639c041 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index eca70d29..b205619d 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Style\Language;
 /**
  * Word2007 settings part writer: word/settings.xml
  *
- * @link http://www.schemacentral.com/sc/ooxml/t-w_CT_Settings.html
+ * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Settings.html
  */
 class Settings extends AbstractPart
 {
@@ -71,7 +71,6 @@ class Settings extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $settingKey
      * @param array|string $settingValue
-     * @return void
      */
     protected function writeSetting($xmlWriter, $settingKey, $settingValue)
     {
@@ -96,49 +95,46 @@ class Settings extends AbstractPart
 
     /**
      * Get settings.
-     *
-     * @return void
      */
     private function getSettings()
     {
-
         /** @var \PhpOffice\PhpWord\Metadata\Settings $documentSettings */
         $documentSettings = $this->getParentWriter()->getPhpWord()->getSettings();
 
         // Default settings
         $this->settings = array(
-            'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
-            'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
+            'w:defaultTabStop'          => array('@attributes' => array('w:val' => '708')),
+            'w:hyphenationZone'         => array('@attributes' => array('w:val' => '425')),
             'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
-            'w:decimalSymbol' => array('@attributes' => array('w:val' => $documentSettings->getDecimalSymbol())),
-            'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
-            'w:compat' => array(),
-            'm:mathPr' => array(
-                'm:mathFont' => array('@attributes' => array('m:val' => 'Cambria Math')),
-                'm:brkBin' => array('@attributes' => array('m:val' => 'before')),
-                'm:brkBinSub' => array('@attributes' => array('m:val' => '--')),
-                'm:smallFrac' => array('@attributes' => array('m:val' => 'off')),
-                'm:dispDef' => '',
-                'm:lMargin' => array('@attributes' => array('m:val' => '0')),
-                'm:rMargin' => array('@attributes' => array('m:val' => '0')),
-                'm:defJc' => array('@attributes' => array('m:val' => 'centerGroup')),
+            'w:decimalSymbol'           => array('@attributes' => array('w:val' => $documentSettings->getDecimalSymbol())),
+            'w:listSeparator'           => array('@attributes' => array('w:val' => ';')),
+            'w:compat'                  => array(),
+            'm:mathPr'                  => array(
+                'm:mathFont'   => array('@attributes' => array('m:val' => 'Cambria Math')),
+                'm:brkBin'     => array('@attributes' => array('m:val' => 'before')),
+                'm:brkBinSub'  => array('@attributes' => array('m:val' => '--')),
+                'm:smallFrac'  => array('@attributes' => array('m:val' => 'off')),
+                'm:dispDef'    => '',
+                'm:lMargin'    => array('@attributes' => array('m:val' => '0')),
+                'm:rMargin'    => array('@attributes' => array('m:val' => '0')),
+                'm:defJc'      => array('@attributes' => array('m:val' => 'centerGroup')),
                 'm:wrapIndent' => array('@attributes' => array('m:val' => '1440')),
-                'm:intLim' => array('@attributes' => array('m:val' => 'subSup')),
-                'm:naryLim' => array('@attributes' => array('m:val' => 'undOvr')),
+                'm:intLim'     => array('@attributes' => array('m:val' => 'subSup')),
+                'm:naryLim'    => array('@attributes' => array('m:val' => 'undOvr')),
             ),
             'w:clrSchemeMapping' => array(
                 '@attributes' => array(
-                    'w:bg1' => 'light1',
-                    'w:t1' => 'dark1',
-                    'w:bg2' => 'light2',
-                    'w:t2' => 'dark2',
-                    'w:accent1' => 'accent1',
-                    'w:accent2' => 'accent2',
-                    'w:accent3' => 'accent3',
-                    'w:accent4' => 'accent4',
-                    'w:accent5' => 'accent5',
-                    'w:accent6' => 'accent6',
-                    'w:hyperlink' => 'hyperlink',
+                    'w:bg1'               => 'light1',
+                    'w:t1'                => 'dark1',
+                    'w:bg2'               => 'light2',
+                    'w:t2'                => 'dark2',
+                    'w:accent1'           => 'accent1',
+                    'w:accent2'           => 'accent2',
+                    'w:accent3'           => 'accent3',
+                    'w:accent4'           => 'accent4',
+                    'w:accent5'           => 'accent5',
+                    'w:accent6'           => 'accent6',
+                    'w:hyperlink'         => 'hyperlink',
                     'w:followedHyperlink' => 'followedHyperlink',
                 ),
             ),
@@ -163,7 +159,7 @@ class Settings extends AbstractPart
      * Adds a boolean attribute to the settings array
      *
      * @param string $settingName
-     * @param boolean $booleanValue
+     * @param bool $booleanValue
      */
     private function setOnOffValue($settingName, $booleanValue)
     {
@@ -180,7 +176,6 @@ class Settings extends AbstractPart
      * Get protection settings.
      *
      * @param \PhpOffice\PhpWord\Metadata\Protection $documentProtection
-     * @return void
      */
     private function setDocumentProtection($documentProtection)
     {
@@ -188,8 +183,8 @@ class Settings extends AbstractPart
             $this->settings['w:documentProtection'] = array(
                 '@attributes' => array(
                     'w:enforcement' => 1,
-                    'w:edit' => $documentProtection->getEditing(),
-                )
+                    'w:edit'        => $documentProtection->getEditing(),
+                ),
             );
         }
     }
@@ -205,8 +200,8 @@ class Settings extends AbstractPart
             $this->settings['w:proofState'] = array(
                 '@attributes' => array(
                     'w:spelling' => $proofState->getSpelling(),
-                    'w:grammar' => $proofState->getGrammar()
-                )
+                    'w:grammar'  => $proofState->getGrammar(),
+                ),
             );
         }
     }
@@ -219,11 +214,11 @@ class Settings extends AbstractPart
     private function setRevisionView(TrackChangesView $trackChangesView = null)
     {
         if ($trackChangesView != null) {
-            $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true': 'false';
-            $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true': 'false';
-            $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true': 'false';
-            $revisionView['w:formatting'] = $trackChangesView->hasFormatting() ? 'true': 'false';
-            $revisionView['w:inkAnnotations'] = $trackChangesView->hasInkAnnotations() ? 'true': 'false';
+            $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true' : 'false';
+            $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true' : 'false';
+            $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true' : 'false';
+            $revisionView['w:formatting'] = $trackChangesView->hasFormatting() ? 'true' : 'false';
+            $revisionView['w:inkAnnotations'] = $trackChangesView->hasInkAnnotations() ? 'true' : 'false';
 
             $this->settings['w:revisionView'] = array('@attributes' => $revisionView);
         }
@@ -231,7 +226,7 @@ class Settings extends AbstractPart
 
     /**
      * Sets the language
-     * 
+     *
      * @param Language $language
      */
     private function setThemeFontLang(Language $language = null)
@@ -261,8 +256,6 @@ class Settings extends AbstractPart
 
     /**
      * Get compatibility setting.
-     *
-     * @return void
      */
     private function getCompatibility()
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 7795d56b..126cda4f 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -79,7 +79,6 @@ class Styles extends AbstractPart
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\AbstractStyle[] $styles
-     * @return void
      */
     private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
     {
@@ -154,7 +153,6 @@ class Styles extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $styleName
      * @param \PhpOffice\PhpWord\Style\Font $style
-     * @return void
      */
     private function writeFontStyle(XMLWriter $xmlWriter, $styleName, FontStyle $style)
     {
@@ -179,7 +177,7 @@ class Styles extends AbstractPart
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
             $xmlWriter->endElement();
-        } else if (!is_null($paragraphStyle)) {
+        } elseif (!is_null($paragraphStyle)) {
             // if type is 'paragraph' it should have a styleId
             $xmlWriter->writeAttribute('w:styleId', $styleName);
         }
@@ -217,7 +215,6 @@ class Styles extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $styleName
      * @param \PhpOffice\PhpWord\Style\Paragraph $style
-     * @return void
      */
     private function writeParagraphStyle(XMLWriter $xmlWriter, $styleName, ParagraphStyle $style)
     {
@@ -250,7 +247,6 @@ class Styles extends AbstractPart
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $styleName
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeTableStyle(XMLWriter $xmlWriter, $styleName, TableStyle $style)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Theme.php b/src/PhpWord/Writer/Word2007/Part/Theme.php
index e9b16bfc..c264140e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Theme.php
+++ b/src/PhpWord/Writer/Word2007/Part/Theme.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -48,7 +48,6 @@ class Theme extends AbstractPart
         return $str;
     }
 
-
     /**
      * Write color scheme
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index ce42063d..9f18e356 100644
--- a/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index 0b8b0a52..d7756933 100644
--- a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -88,11 +88,11 @@ abstract class AbstractStyle
     protected function convertTwip($value, $default = 0)
     {
         $factors = array(
-            Settings::UNIT_CM => 567,
-            Settings::UNIT_MM => 56.7,
-            Settings::UNIT_INCH => 1440,
+            Settings::UNIT_CM    => 567,
+            Settings::UNIT_MM    => 56.7,
+            Settings::UNIT_INCH  => 1440,
             Settings::UNIT_POINT => 20,
-            Settings::UNIT_PICA => 240,
+            Settings::UNIT_PICA  => 240,
         );
         $unit = Settings::getMeasurementUnit();
         $factor = 1;
@@ -109,12 +109,11 @@ abstract class AbstractStyle
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $name
      * @param mixed $value
-     * @return void
      */
     protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
     {
         if ($value !== null) {
-            $class = "PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\" . $name;
+            $class = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\' . $name;
 
             /** @var \PhpOffice\PhpWord\Writer\Word2007\Style\AbstractStyle $writer */
             $writer = new $class($xmlWriter, $value);
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index c9156de1..c2cf1c7c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,8 +33,6 @@ class Cell extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -93,7 +91,6 @@ class Cell extends AbstractStyle
      * Set width.
      *
      * @param int $value
-     * @return void
      */
     public function setWidth($value = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index 3ecd76e4..e3a86a58 100644
--- a/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Extrusion extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -37,7 +35,7 @@ class Extrusion extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $xmlWriter->startElement("o:extrusion");
+        $xmlWriter->startElement('o:extrusion');
         $xmlWriter->writeAttribute('on', 't');
         $xmlWriter->writeAttributeIf($style->getType() !== null, 'type', $style->getType());
         $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
diff --git a/src/PhpWord/Writer/Word2007/Style/Fill.php b/src/PhpWord/Writer/Word2007/Style/Fill.php
index 7ce68106..de64313b 100644
--- a/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Fill extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 2248a448..0cb3209f 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,8 +33,6 @@ class Font extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -54,8 +52,6 @@ class Font extends AbstractStyle
 
     /**
      * Write full style.
-     *
-     * @return void
      */
     private function writeStyle()
     {
@@ -139,7 +135,7 @@ class Font extends AbstractStyle
             $styleWriter = new Shading($xmlWriter, $shading);
             $styleWriter->write();
         }
-        
+
         // RTL
         if ($this->isInline === true) {
             $styleName = $style->getStyleName();
@@ -153,7 +149,6 @@ class Font extends AbstractStyle
      * Set is inline.
      *
      * @param bool $value
-     * @return void
      */
     public function setIsInline($value)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 9c6ddaef..da5aee1e 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -30,8 +30,6 @@ class Frame extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -62,7 +60,7 @@ class Frame extends AbstractStyle
 
         $styles = array_merge($sizeStyles, $posStyles);
 
-       // zIndex for infront & behind wrap
+        // zIndex for infront & behind wrap
         $wrap = $style->getWrap();
         if ($wrap !== null && isset($zIndices[$wrap])) {
             $styles['z-index'] = $zIndices[$wrap];
@@ -77,8 +75,6 @@ class Frame extends AbstractStyle
 
     /**
      * Write alignment.
-     *
-     * @return void
      */
     public function writeAlignment()
     {
@@ -108,7 +104,6 @@ class Frame extends AbstractStyle
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Frame $style
      * @param string $wrap
-     * @return void
      */
     private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
     {
@@ -129,8 +124,8 @@ class Frame extends AbstractStyle
             $vPos = $style->getVPosRelTo();
 
             if ($pos == FrameStyle::POS_ABSOLUTE) {
-                $xmlWriter->writeAttribute('anchorx', "page");
-                $xmlWriter->writeAttribute('anchory', "page");
+                $xmlWriter->writeAttribute('anchorx', 'page');
+                $xmlWriter->writeAttribute('anchory', 'page');
             } elseif ($pos == FrameStyle::POS_RELATIVE) {
                 if (isset($relativePositions[$hPos])) {
                     $xmlWriter->writeAttribute('anchorx', $relativePositions[$hPos]);
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
index 3bbe751e..271b99df 100644
--- a/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Indentation.php b/src/PhpWord/Writer/Word2007/Style/Indentation.php
index a7edaee1..c5a598ff 100644
--- a/src/PhpWord/Writer/Word2007/Style/Indentation.php
+++ b/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Indentation extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
index 3407c252..f065e521 100644
--- a/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -21,14 +21,11 @@ use PhpOffice\PhpWord\Style\Line as LineStyle;
 
 /**
  * Line style writer
- *
  */
 class Line extends Frame
 {
     /**
      * Write Line stroke.
-     *
-     * @return void
      * @todo Merge with `Stroke` style
      */
     public function writeStroke()
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index 592fb7bb..3ed577c6 100644
--- a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,9 +26,6 @@ class LineNumbering extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
-     *
      * The w:start seems to be zero based so we have to decrement by one
      */
     public function write()
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index 68ba70d2..3d877384 100644
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,7 +29,7 @@ class MarginBorder extends AbstractStyle
     /**
      * Sizes
      *
-     * @var integer[]
+     * @var int[]
      */
     private $sizes = array();
 
@@ -49,8 +49,6 @@ class MarginBorder extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -76,7 +74,6 @@ class MarginBorder extends AbstractStyle
      * @param string $side
      * @param int $width
      * @param string $color
-     * @return void
      */
     private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null)
     {
@@ -105,8 +102,7 @@ class MarginBorder extends AbstractStyle
     /**
      * Set sizes.
      *
-     * @param integer[] $value
-     * @return void
+     * @param int[] $value
      */
     public function setSizes($value)
     {
@@ -117,7 +113,6 @@ class MarginBorder extends AbstractStyle
      * Set colors.
      *
      * @param string[] $value
-     * @return void
      */
     public function setColors($value)
     {
@@ -128,7 +123,6 @@ class MarginBorder extends AbstractStyle
      * Set attributes.
      *
      * @param array $value
-     * @return void
      */
     public function setAttributes($value)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Outline.php b/src/PhpWord/Writer/Word2007/Style/Outline.php
index 620720b3..9ae61f39 100644
--- a/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Outline extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -37,7 +35,7 @@ class Outline extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $xmlWriter->startElement("v:stroke");
+        $xmlWriter->startElement('v:stroke');
         $xmlWriter->writeAttribute('on', 't');
         $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
         $xmlWriter->writeAttributeIf($style->getWeight() !== null, 'weight', $style->getWeight() . $style->getUnit());
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 32f8abba..707bf031 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -45,8 +45,6 @@ class Paragraph extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -70,8 +68,6 @@ class Paragraph extends AbstractStyle
 
     /**
      * Write full style.
-     *
-     * @return void
      */
     private function writeStyle()
     {
@@ -146,12 +142,11 @@ class Paragraph extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Tab[] $tabs
-     * @return void
      */
     private function writeTabs(XMLWriter $xmlWriter, $tabs)
     {
         if (!empty($tabs)) {
-            $xmlWriter->startElement("w:tabs");
+            $xmlWriter->startElement('w:tabs');
             foreach ($tabs as $tab) {
                 $styleWriter = new Tab($xmlWriter, $tab);
                 $styleWriter->write();
@@ -165,7 +160,6 @@ class Paragraph extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param array $numbering
-     * @return void
      */
     private function writeNumbering(XMLWriter $xmlWriter, $numbering)
     {
@@ -194,7 +188,6 @@ class Paragraph extends AbstractStyle
      * Set without w:pPr.
      *
      * @param bool $value
-     * @return void
      */
     public function setWithoutPPR($value)
     {
@@ -205,7 +198,6 @@ class Paragraph extends AbstractStyle
      * Set is inline.
      *
      * @param bool $value
-     * @return void
      */
     public function setIsInline($value)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Row.php b/src/PhpWord/Writer/Word2007/Style/Row.php
index e8b7e1a5..f57094db 100644
--- a/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -31,8 +31,6 @@ class Row extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -60,7 +58,6 @@ class Row extends AbstractStyle
      * Set height.
      *
      * @param int $value
-     * @return void
      */
     public function setHeight($value = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
index 60b5d869..ef50c111 100644
--- a/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class Section extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index c3594b24..a8e6592a 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Shading extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Shadow.php b/src/PhpWord/Writer/Word2007/Style/Shadow.php
index 239c161d..5efc38c4 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Shadow extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -37,7 +35,7 @@ class Shadow extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $xmlWriter->startElement("v:shadow");
+        $xmlWriter->startElement('v:shadow');
         $xmlWriter->writeAttribute('on', 't');
         $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
         $xmlWriter->writeAttributeIf($style->getOffset() !== null, 'offset', $style->getOffset());
diff --git a/src/PhpWord/Writer/Word2007/Style/Shape.php b/src/PhpWord/Writer/Word2007/Style/Shape.php
index 4ed1469d..aad42ae7 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Shape extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
index bd2d06aa..8db78161 100644
--- a/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Spacing extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
index 9867023f..7b0a0ab5 100644
--- a/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,8 +26,6 @@ class Tab extends AbstractStyle
 {
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -37,9 +35,9 @@ class Tab extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $xmlWriter->startElement("w:tab");
-        $xmlWriter->writeAttribute("w:val", $style->getType());
-        $xmlWriter->writeAttribute("w:leader", $style->getLeader());
+        $xmlWriter->startElement('w:tab');
+        $xmlWriter->writeAttribute('w:val', $style->getType());
+        $xmlWriter->writeAttribute('w:leader', $style->getLeader());
         $xmlWriter->writeAttribute('w:pos', $this->convertTwip($style->getPosition()));
         $xmlWriter->endElement();
     }
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 570e85bb..620e4fbf 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -35,8 +35,6 @@ class Table extends AbstractStyle
 
     /**
      * Write style.
-     *
-     * @return void
      */
     public function write()
     {
@@ -62,7 +60,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -100,7 +97,6 @@ class Table extends AbstractStyle
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param int $width
      * @param string $unit
-     * @return void
      */
     private function writeWidth(XMLWriter $xmlWriter, $width, $unit)
     {
@@ -115,7 +111,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeMargin(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -135,7 +130,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeBorder(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -156,7 +150,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -176,7 +169,6 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param \PhpOffice\PhpWord\Style\Table $style
-     * @return void
      */
     private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
     {
@@ -194,7 +186,6 @@ class Table extends AbstractStyle
      * Set width.
      *
      * @param int $value
-     * @return void
      */
     public function setWidth($value = null)
     {
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
index f8f94da3..cd92f845 100644
--- a/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -28,8 +28,6 @@ class TextBox extends Frame
 {
     /**
      * Writer inner margin.
-     *
-     * @return void
      */
     public function writeInnerMargin()
     {
@@ -46,8 +44,6 @@ class TextBox extends Frame
 
     /**
      * Writer border.
-     *
-     * @return void
      */
     public function writeBorder()
     {
diff --git a/src/PhpWord/Writer/WriterInterface.php b/src/PhpWord/Writer/WriterInterface.php
index 1ccdf321..b5f08199 100644
--- a/src/PhpWord/Writer/WriterInterface.php
+++ b/src/PhpWord/Writer/WriterInterface.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Collection/CollectionTest.php b/tests/PhpWord/Collection/CollectionTest.php
index 4b2fa0ca..22f89b72 100644
--- a/tests/PhpWord/Collection/CollectionTest.php
+++ b/tests/PhpWord/Collection/CollectionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index aa46d89b..55e22e6f 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -10,14 +10,13 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
 namespace PhpOffice\PhpWord\ComplexType;
 
-use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
@@ -52,7 +51,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
      */
     public function testWrongPos()
     {
-        $footnoteProp= new FootnoteProperties();
+        $footnoteProp = new FootnoteProperties();
         $footnoteProp->setPos(NumberFormat::LOWER_ROMAN);
     }
 
@@ -63,7 +62,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
      */
     public function testWrongNumFmt()
     {
-        $footnoteProp= new FootnoteProperties();
+        $footnoteProp = new FootnoteProperties();
         $footnoteProp->setNumFmt(FootnoteProperties::POSITION_DOC_END);
     }
 
@@ -74,7 +73,7 @@ class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
      */
     public function testWrongNumRestart()
     {
-        $footnoteProp= new FootnoteProperties();
+        $footnoteProp = new FootnoteProperties();
         $footnoteProp->setNumRestart(NumberFormat::LOWER_ROMAN);
     }
 }
diff --git a/tests/PhpWord/ComplexType/ProofStateTest.php b/tests/PhpWord/ComplexType/ProofStateTest.php
index 0b7e74ca..e807ca2f 100644
--- a/tests/PhpWord/ComplexType/ProofStateTest.php
+++ b/tests/PhpWord/ComplexType/ProofStateTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\ComplexType;
 
 /**
@@ -23,13 +24,12 @@ namespace PhpOffice\PhpWord\ComplexType;
  */
 class ProofStateTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Tests the getters and setters
      */
     public function testGetSet()
     {
-        $pState= new ProofState();
+        $pState = new ProofState();
         $pState->setGrammar(ProofState::CLEAN);
         $pState->setSpelling(ProofState::DIRTY);
 
@@ -55,7 +55,7 @@ class ProofStateTest extends \PHPUnit_Framework_TestCase
      */
     public function testWrongSpelling()
     {
-        $pState= new ProofState();
+        $pState = new ProofState();
         $pState->setSpelling('Wrong');
     }
 }
diff --git a/tests/PhpWord/Element/AbstractElementTest.php b/tests/PhpWord/Element/AbstractElementTest.php
index 83f209e4..458b94c8 100644
--- a/tests/PhpWord/Element/AbstractElementTest.php
+++ b/tests/PhpWord/Element/AbstractElementTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/BookmarkTest.php b/tests/PhpWord/Element/BookmarkTest.php
new file mode 100644
index 00000000..da86a62e
--- /dev/null
+++ b/tests/PhpWord/Element/BookmarkTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Test class for PhpOffice\PhpWord\Element\Footer
+ *
+ * @runTestsInSeparateProcesses
+ */
+class BookmarkTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * New instance
+     */
+    public function testConstruct()
+    {
+        $bookmarkName = 'test';
+        $oBookmark = new Bookmark($bookmarkName);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Bookmark', $oBookmark);
+        $this->assertEquals($bookmarkName, $oBookmark->getName());
+    }
+}
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index f1d6a280..aff208c4 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index 183d22db..fb71b8c2 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index db9ec902..fd2c814d 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -80,4 +80,24 @@ class CommentTest extends \PHPUnit_Framework_TestCase
         $oComment->setRelationId($iVal);
         $this->assertEquals($iVal, $oComment->getRelationId());
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExceptionOnCommentStartOnComment()
+    {
+        $dummyComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment->setCommentRangeStart($dummyComment);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExceptionOnCommentEndOnComment()
+    {
+        $dummyComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment = new Comment('Test User', new \DateTime(), 'my_initials');
+        $oComment->setCommentRangeEnd($dummyComment);
+    }
 }
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index 6f5ebbbf..1bd0c216 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/FooterTest.php b/tests/PhpWord/Element/FooterTest.php
index 33a211d3..2938ae5e 100644
--- a/tests/PhpWord/Element/FooterTest.php
+++ b/tests/PhpWord/Element/FooterTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/FootnoteTest.php b/tests/PhpWord/Element/FootnoteTest.php
index a3f3b4d8..b02ab5c6 100644
--- a/tests/PhpWord/Element/FootnoteTest.php
+++ b/tests/PhpWord/Element/FootnoteTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index f75910aa..13ace285 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -228,7 +228,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase
     /**
      * Add footnote exception
      *
-     * @expectedException BadMethodCallException
+     * @expectedException \BadMethodCallException
      */
     public function testAddFootnoteException()
     {
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 974e868c..80e0bcfc 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -133,9 +133,9 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     {
         //disable ssl verification, never do this in real application, you should pass the certiciate instead!!!
         $arrContextOptions = array(
-            "ssl" => array(
-                "verify_peer" => false,
-                "verify_peer_name" => false,
+            'ssl' => array(
+                'verify_peer'      => false,
+                'verify_peer_name' => false,
             ),
         );
         stream_context_set_default($arrContextOptions);
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index a7b15b08..a6e3f79b 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index 40f07a1f..48b576c3 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -49,7 +49,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
         $oLink = new Link(
             'https://github.com/PHPOffice/PHPWord',
             'PHPWord on GitHub',
-            array('color' => '0000FF', 'underline' => Font::UNDERLINE_SINGLE),
+            array('color'      => '0000FF', 'underline' => Font::UNDERLINE_SINGLE),
             array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)
         );
 
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 91609357..0c4c1ac9 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index 2dc4f65c..775a97d4 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index 44516b61..51ed19b5 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -26,9 +26,22 @@ namespace PhpOffice\PhpWord\Element;
 class ObjectTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Create new instance with supported files
+     * Create new instance with supported files, 4 character extention
      */
     public function testConstructWithSupportedFiles()
+    {
+        $src = __DIR__ . '/../_files/documents/reader.docx';
+        $oObject = new Object($src);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
+        $this->assertEquals($src, $oObject->getSource());
+    }
+
+    /**
+     * Create new instance with supported files
+     */
+    public function testConstructWithSupportedFilesLong()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
         $oObject = new Object($src);
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index 3d8b1db6..69a71204 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/PreserveTextTest.php b/tests/PhpWord/Element/PreserveTextTest.php
index 33e2272a..a47cc77c 100644
--- a/tests/PhpWord/Element/PreserveTextTest.php
+++ b/tests/PhpWord/Element/PreserveTextTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index 58a166f4..cb365dad 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index 52705bc1..fc3682b6 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 78010bc9..aebfc9b7 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -129,6 +129,17 @@ class SectionTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($object->hasDifferentFirstPage());
     }
 
+    /**
+     * @covers ::addHeader
+     * @covers ::hasDifferentFirstPage
+     */
+    public function testHasDifferentFirstPageFooter()
+    {
+        $object = new Section(1);
+        $object->addFooter(Header::FIRST);
+        $this->assertTrue($object->hasDifferentFirstPage());
+    }
+
     /**
      * @covers ::addHeader
      * @covers ::hasDifferentFirstPage
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index 6b5867bc..655d567c 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 785ec40a..3085aee2 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index cb3fdb99..cc61e20d 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index 40ed6965..62186244 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index efd8d6f3..59db597c 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index d2fe0472..9723a2e1 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 2b886e5e..500de133 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/CopyFileExceptionTest.php b/tests/PhpWord/Exception/CopyFileExceptionTest.php
index 0bc2e322..9d921740 100644
--- a/tests/PhpWord/Exception/CopyFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CopyFileExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
index d68bf573..91c7012f 100644
--- a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/ExceptionTest.php b/tests/PhpWord/Exception/ExceptionTest.php
index 4c14abb9..28b15702 100644
--- a/tests/PhpWord/Exception/ExceptionTest.php
+++ b/tests/PhpWord/Exception/ExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,6 +33,6 @@ class ExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testThrowException()
     {
-        throw new Exception;
+        throw new Exception();
     }
 }
diff --git a/tests/PhpWord/Exception/InvalidImageExceptionTest.php b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
index d83aa878..dfaadbd7 100644
--- a/tests/PhpWord/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,6 +33,6 @@ class InvalidImageExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testThrowException()
     {
-        throw new InvalidImageException;
+        throw new InvalidImageException();
     }
 }
diff --git a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
index 5038ed2f..77ee8571 100644
--- a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,6 +33,6 @@ class InvalidStyleExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testThrowException()
     {
-        throw new InvalidStyleException;
+        throw new InvalidStyleException();
     }
 }
diff --git a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
index 251ed957..50b4806d 100644
--- a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -33,6 +33,6 @@ class UnsupportedImageTypeExceptionTest extends \PHPUnit_Framework_TestCase
      */
     public function testThrowException()
     {
-        throw new UnsupportedImageTypeException;
+        throw new UnsupportedImageTypeException();
     }
 }
diff --git a/tests/PhpWord/IOFactoryTest.php b/tests/PhpWord/IOFactoryTest.php
index 9c2d1e67..6dbb006e 100644
--- a/tests/PhpWord/IOFactoryTest.php
+++ b/tests/PhpWord/IOFactoryTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/MediaTest.php b/tests/PhpWord/MediaTest.php
index 25480313..d045abcd 100644
--- a/tests/PhpWord/MediaTest.php
+++ b/tests/PhpWord/MediaTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -106,7 +106,7 @@ class MediaTest extends \PHPUnit_Framework_TestCase
     /**
      * Add image element exception
      *
-     * @expectedException Exception
+     * @expectedException \Exception
      * @expectedExceptionMessage Image object not assigned.
      */
     public function testAddElementImageException()
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index 23572710..5443f0b2 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index fff51652..6f493d04 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -34,7 +34,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setEvenAndOddHeaders(true);
-        $this->assertEquals(true, $oSettings->hasEvenAndOddHeaders());
+        $this->assertTrue($oSettings->hasEvenAndOddHeaders());
     }
 
     /**
@@ -44,7 +44,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setHideGrammaticalErrors(true);
-        $this->assertEquals(true, $oSettings->hasHideGrammaticalErrors());
+        $this->assertTrue($oSettings->hasHideGrammaticalErrors());
     }
 
     /**
@@ -54,7 +54,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setHideSpellingErrors(true);
-        $this->assertEquals(true, $oSettings->hasHideSpellingErrors());
+        $this->assertTrue($oSettings->hasHideSpellingErrors());
     }
 
     /**
@@ -77,7 +77,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setTrackRevisions(true);
-        $this->assertEquals(true, $oSettings->hasTrackRevisions());
+        $this->assertTrue($oSettings->hasTrackRevisions());
     }
 
     /**
@@ -87,7 +87,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setDoNotTrackFormatting(true);
-        $this->assertEquals(true, $oSettings->hasDoNotTrackFormatting());
+        $this->assertTrue($oSettings->hasDoNotTrackFormatting());
     }
 
     /**
@@ -97,7 +97,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $oSettings = new Settings();
         $oSettings->setDoNotTrackMoves(true);
-        $this->assertEquals(true, $oSettings->hasDoNotTrackMoves());
+        $this->assertTrue($oSettings->hasDoNotTrackMoves());
     }
 
     /**
@@ -116,6 +116,24 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(ProofState::DIRTY, $oSettings->getProofState()->getSpelling());
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongProofStateGrammar()
+    {
+        $proofState = new ProofState();
+        $proofState->setGrammar('wrong');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testWrongProofStateSpelling()
+    {
+        $proofState = new ProofState();
+        $proofState->setSpelling('wrong');
+    }
+
     /**
      * Zoom as percentage
      */
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index b49666f5..01d7342e 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -138,7 +138,7 @@ class PhpWordTest extends \PHPUnit_Framework_TestCase
      */
     public function testLoadTemplateException()
     {
-        $templateFqfn = join(
+        $templateFqfn = implode(
             DIRECTORY_SEPARATOR,
             array(PHPWORD_TESTS_BASE_DIR, 'PhpWord', 'Tests', '_files', 'templates', 'blanks.docx')
         );
@@ -151,6 +151,8 @@ class PhpWordTest extends \PHPUnit_Framework_TestCase
      */
     public function testSave()
     {
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Hello world!');
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index 6e3039cf..24751cac 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index b4173d17..ed16e64b 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/ODTextTest.php b/tests/PhpWord/Reader/ODTextTest.php
index 1bdce2e6..d00657de 100644
--- a/tests/PhpWord/Reader/ODTextTest.php
+++ b/tests/PhpWord/Reader/ODTextTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/RTFTest.php b/tests/PhpWord/Reader/RTFTest.php
index 79cf13a7..58154ee3 100644
--- a/tests/PhpWord/Reader/RTFTest.php
+++ b/tests/PhpWord/Reader/RTFTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 9be78a5b..627bc66e 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index f5ac3ed6..6fd2f52b 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -78,7 +78,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(sys_get_temp_dir(), Settings::getTempDir());
     }
 
-
     /**
      * @covers ::setTempDir
      * @covers ::getTempDir
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index e307f09b..a2031787 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -89,7 +89,7 @@ class ConverterTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals(round($value / 9525), $result);
 
             $result = Converter::degreeToAngle($value);
-            $this->assertEquals((int)round($value * 60000), $result);
+            $this->assertEquals((int) round($value * 60000), $result);
 
             $result = Converter::angleToDegree($value);
             $this->assertEquals(round($value / 60000), $result);
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index c651fd4a..602b644d 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index 1adcfbfc..689f122b 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -27,7 +27,6 @@ use PhpOffice\PhpWord\Settings;
  */
 class ZipArchiveTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * Test close method exception: Working in local, not working in Travis
      *
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index f7c6f6c5..ab3ea14e 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -87,6 +87,7 @@ class AbstractStyleTest extends \PHPUnit_Framework_TestCase
         $class = new \ReflectionClass(get_class($object));
         $method = $class->getMethod($method);
         $method->setAccessible(true);
+
         return $method->invokeArgs($object, $args);
     }
 }
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index 51f4e895..71b32a65 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index c8fd4dab..707784f6 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -45,7 +45,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals('text', $object->getStyleType());
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $object->getParagraphStyle());
-        $this->assertTrue(is_array($object->getStyleValues()));
+        $this->assertInternalType('array', $object->getStyleValues());
     }
 
     /**
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index c5bb5c7d..decc13b1 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index 477e1314..db079704 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
index bd466956..35a01e07 100644
--- a/tests/PhpWord/Style/LanguageTest.php
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index e8ef1367..56440529 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index 98e20b3d..21489caf 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index 2e8692e9..a2e4eb74 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/NumberingLevelTest.php b/tests/PhpWord/Style/NumberingLevelTest.php
index c6cee11c..402d936b 100644
--- a/tests/PhpWord/Style/NumberingLevelTest.php
+++ b/tests/PhpWord/Style/NumberingLevelTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index ee9c032c..ad57ebff 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index 8e1dd960..7d12410c 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index b78c557a..a702d3f2 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -99,10 +99,11 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
         if (is_bool($value)) {
             if (method_exists($object, "is{$key}")) {
                 return "is{$key}";
-            } else if (method_exists($object, "has{$key}")) {
+            } elseif (method_exists($object, "has{$key}")) {
                 return "has{$key}";
             }
         }
+
         return "get{$key}";
     }
 
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index a89f73d2..db98d0a9 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index d15dc490..89c4640a 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Section
  * @runTestsInSeparateProcesses
  */
-class SettingsTest extends \PHPUnit_Framework_TestCase
+class SectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index d6378f8d..fd0aaf5e 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index 79c9e458..f147ae61 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index 03620c17..ec01acd9 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index 7724aa41..8102369d 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 5e878692..ee020dd9 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index ea7bc71f..a91b5b28 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -238,7 +238,6 @@ class TextBoxTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, $object->getPosVerticalRel());
     }
 
-
     /**
      * Test set/get innerMarginRight
      */
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index 57ec98f4..aa46c6b1 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 11b43cf4..4bf69f5a 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -36,7 +36,7 @@ final class TemplateProcessorTest extends \PHPUnit_Framework_TestCase
 
         $templateProcessor = new TemplateProcessor($templateFqfn);
         $xslDomDocument = new \DOMDocument();
-        $xslDomDocument->load(__DIR__ . "/_files/xsl/remove_tables_by_needle.xsl");
+        $xslDomDocument->load(__DIR__ . '/_files/xsl/remove_tables_by_needle.xsl');
         foreach (array('${employee.', '${scoreboard.', '${reference.') as $needle) {
             $templateProcessor->applyXslStyleSheet($xslDomDocument, array('needle' => $needle));
         }
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 2a1e03dc..0778650e 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Element\Text as TextElement;
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index 137a092e..a4a6264e 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Writer\HTML\Part\Body;
diff --git a/tests/PhpWord/Writer/HTML/StyleTest.php b/tests/PhpWord/Writer/HTML/StyleTest.php
index 629efd7a..7548ff02 100644
--- a/tests/PhpWord/Writer/HTML/StyleTest.php
+++ b/tests/PhpWord/Writer/HTML/StyleTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 /**
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index b2b10165..69cd5a97 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -31,7 +32,7 @@ class HTMLTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstruct()
     {
-        $object = new HTML(new PhpWord);
+        $object = new HTML(new PhpWord());
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $object->getPhpWord());
     }
@@ -121,7 +122,7 @@ class HTMLTest extends \PHPUnit_Framework_TestCase
         $writer = new HTML($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index fb14aae5..ef4e68b0 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
index 90874b47..5ca980f2 100644
--- a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\PhpWord\Writer\ODText;
@@ -40,7 +41,7 @@ class AbstractPartTest extends \PHPUnit_Framework_TestCase
     /**
      * covers   ::getParentWriter
      *
-     * @expectedException Exception
+     * @expectedException \Exception
      * @expectedExceptionMessage No parent WriterInterface assigned.
      */
     public function testSetGetParentWriterNull()
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index 5814fa60..048c5242 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index 6b979385..1a0c3ccd 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\ODText;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index d79a9d42..d35a4ec7 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -90,7 +91,7 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
         $writer = new ODText($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
@@ -102,6 +103,8 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Test');
@@ -136,7 +139,7 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
      */
     public function testSetUseDiskCachingException()
     {
-        $dir = join(DIRECTORY_SEPARATOR, array(PHPWORD_TESTS_BASE_DIR, 'foo'));
+        $dir = implode(DIRECTORY_SEPARATOR, array(PHPWORD_TESTS_BASE_DIR, 'foo'));
 
         $object = new ODText();
         $object->setUseDiskCaching(true, $dir);
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index 67026a84..7831f472 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -45,7 +46,7 @@ class DomPDFTest extends \PHPUnit_Framework_TestCase
         $writer = new PDF($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index b6c85a40..62411b97 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -44,7 +45,7 @@ class MPDFTest extends \PHPUnit_Framework_TestCase
         $writer = new PDF($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
diff --git a/tests/PhpWord/Writer/PDF/TCPDFTest.php b/tests/PhpWord/Writer/PDF/TCPDFTest.php
index aaec55eb..d5bd534b 100644
--- a/tests/PhpWord/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/TCPDFTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\PDF;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -44,7 +45,7 @@ class TCPDFTest extends \PHPUnit_Framework_TestCase
         $writer = new PDF($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
diff --git a/tests/PhpWord/Writer/PDFTest.php b/tests/PhpWord/Writer/PDFTest.php
index 75db6c03..f1a908a9 100644
--- a/tests/PhpWord/Writer/PDFTest.php
+++ b/tests/PhpWord/Writer/PDFTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -40,7 +41,7 @@ class PDFTest extends \PHPUnit_Framework_TestCase
         $writer = new PDF(new PhpWord());
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index 47d01d00..17a9c22f 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF;
 
 use PhpOffice\PhpWord\Writer\RTF;
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index 095d30d5..4e3a0eed 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\RTF;
 
 /**
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index 0b4f6b0f..ec83f7b1 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -31,7 +32,7 @@ class RTFTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstruct()
     {
-        $object = new RTF(new PhpWord);
+        $object = new RTF(new PhpWord());
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $object->getPhpWord());
     }
@@ -91,7 +92,7 @@ class RTFTest extends \PHPUnit_Framework_TestCase
         $writer = new RTF($phpWord);
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         @unlink($file);
     }
@@ -103,6 +104,8 @@ class RTFTest extends \PHPUnit_Framework_TestCase
      */
     public function testSavePhpOutput()
     {
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText(htmlspecialchars('Test', ENT_COMPAT, 'UTF-8'));
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index b3c7b197..6186695b 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -10,16 +10,17 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\Element\TextRun;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Element subnamespace
@@ -186,7 +187,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
 
         $index = 0;
         foreach ($chartTypes as $chartType) {
-            $index++;
+            ++$index;
             $file = "word/charts/chart{$index}.xml";
             $path = "/c:chartSpace/c:chart/c:plotArea/c:{$chartType}Chart";
             $this->assertTrue($doc->elementExists($path, $file));
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index 8f72cdfe..47f65861 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
@@ -24,7 +25,7 @@ use PhpOffice\PhpWord\Writer\Word2007;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\AbstractWriterPart
  * @runTestsInSeparateProcesses
  */
-class AbstractWriterPartTest extends \PHPUnit_Framework_TestCase
+class AbstractPartTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * covers   ::setParentWriter
@@ -40,7 +41,7 @@ class AbstractWriterPartTest extends \PHPUnit_Framework_TestCase
     /**
      * covers   ::getParentWriter
      *
-     * @expectedException Exception
+     * @expectedException \Exception
      * @expectedExceptionMessage No parent WriterInterface assigned.
      */
     public function testSetGetParentWriterNull()
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
index aac4b15b..4a4fd308 100644
--- a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -10,15 +10,15 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Comment
@@ -40,7 +40,6 @@ class CommentsTest extends \PHPUnit_Framework_TestCase
      */
     public function testWriteComments()
     {
-
         $comment = new \PhpOffice\PhpWord\Element\Comment('Authors name', new \DateTime(), 'my_initials');
         $comment->addText('Test');
 
@@ -55,7 +54,7 @@ class CommentsTest extends \PHPUnit_Framework_TestCase
 
         $element = $doc->getElement($path, $file);
         $this->assertNotNull($element->getAttribute('w:id'));
-        $this->assertEquals("Authors name", $element->getAttribute('w:author'));
-        $this->assertEquals("my_initials", $element->getAttribute('w:initials'));
+        $this->assertEquals('Authors name', $element->getAttribute('w:author'));
+        $this->assertEquals('my_initials', $element->getAttribute('w:initials'));
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index d45cde6b..d194814c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -10,18 +10,19 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Document
@@ -458,7 +459,7 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
         // Test the attributes
         $attributeCount = 0;
         foreach ($attributes as $key => $value) {
-            $attributeCount++;
+            ++$attributeCount;
             $nodeName = ($key == 'alignment') ? 'jc' : $key;
             $path = "/w:document/w:body/w:p[{$attributeCount}]/w:pPr/w:{$nodeName}";
             if ('alignment' != $key) {
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 9a7d809a..98fb003e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index 2d48fe36..e557d9c2 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
diff --git a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
index 6c285af6..7830469c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\Writer\Word2007;
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index bca4b562..0f1ae523 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -10,16 +10,17 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\TestHelperDOCX;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Numbering
@@ -64,7 +65,7 @@ class NumberingTest extends \PHPUnit_Framework_TestCase
                         'font'      => 'Arial',
                         'hint'      => 'default',
                     ),
-                )
+                ),
             )
         );
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 99c66680..7d85995c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
@@ -77,15 +78,15 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     public function testDefaultLanguage()
     {
         $phpWord = new PhpWord();
-        
+
         $doc = TestHelperDOCX::getDocument($phpWord);
-        
+
         $file = 'word/settings.xml';
-        
+
         $path = '/w:settings/w:themeFontLang';
         $this->assertTrue($doc->elementExists($path, $file));
         $element = $doc->getElement($path, $file);
-        
+
         $this->assertEquals('en-US', $element->getAttribute('w:val'));
     }
 
@@ -97,13 +98,13 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $phpWord = new PhpWord();
         $phpWord->getSettings()->setThemeFontLang(new Language(Language::DE_DE, Language::KO_KR, Language::HE_IL));
         $doc = TestHelperDOCX::getDocument($phpWord);
-        
+
         $file = 'word/settings.xml';
-        
+
         $path = '/w:settings/w:themeFontLang';
         $this->assertTrue($doc->elementExists($path, $file));
         $element = $doc->getElement($path, $file);
-        
+
         $this->assertEquals(Language::DE_DE, $element->getAttribute('w:val'));
         $this->assertEquals(Language::KO_KR, $element->getAttribute('w:eastAsia'));
         $this->assertEquals(Language::HE_IL, $element->getAttribute('w:bidi'));
@@ -116,15 +117,15 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $phpWord = new PhpWord();
         $phpWord->getSettings()->setHideSpellingErrors(true);
-        
+
         $doc = TestHelperDOCX::getDocument($phpWord);
-        
+
         $file = 'word/settings.xml';
-        
+
         $path = '/w:settings/w:hideSpellingErrors';
         $this->assertTrue($doc->elementExists($path, $file));
         $element = $doc->getElement($path, $file);
-        
+
         $this->assertNotEquals('false', $element->getAttribute('w:val'));
     }
 
@@ -135,14 +136,14 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
     {
         $phpWord = new PhpWord();
         $phpWord->getSettings()->setEvenAndOddHeaders(true);
-        
+
         $doc = TestHelperDOCX::getDocument($phpWord);
-        
+
         $file = 'word/settings.xml';
-        
+
         $path = '/w:settings/w:evenAndOddHeaders';
         $this->assertTrue($doc->elementExists($path, $file));
-        
+
         $element = $doc->getElement($path, $file);
         $this->assertNotEquals('false', $element->getAttribute('w:val'));
     }
@@ -161,7 +162,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
 
         $path = '/w:settings/w:zoom';
         $this->assertTrue($doc->elementExists($path, $file));
-        
+
         $element = $doc->getElement($path, $file);
         $this->assertEquals('75', $element->getAttribute('w:percent'));
     }
@@ -180,7 +181,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
 
         $path = '/w:settings/w:zoom';
         $this->assertTrue($doc->elementExists($path, $file));
-        
+
         $element = $doc->getElement($path, $file);
         $this->assertEquals('fullPage', $element->getAttribute('w:val'));
     }
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 0c0f7aef..cba0bfb3 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -21,7 +22,6 @@ use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\Writer\Word2007;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles
@@ -85,12 +85,12 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $baseParagraphStyle = new Paragraph();
         $baseParagraphStyle->setAlignment(Jc::CENTER);
         $baseParagraphStyle = $phpWord->addParagraphStyle('BaseStyle', $baseParagraphStyle);
-         
+
         $childFont = new Font();
         $childFont->setParagraph($baseParagraphStyle);
         $childFont->setSize(16);
         $childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
-         
+
         $otherFont = new Font();
         $otherFont->setSize(20);
         $otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
@@ -134,7 +134,7 @@ class StylesTest extends \PHPUnit_Framework_TestCase
         $styleGenerationEteinte->setParagraph($styleGenerationEteinteP);
         $styleGenerationEteinte->setSize(8.5);
         $phpWord->addFontStyle('GeneratEteinte', $styleGenerationEteinte);
-        
+
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         $file = 'word/styles.xml';
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index 7af8ce3a..3261db4f 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\PhpWord\Writer\Word2007\Part\RelsPart;
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index 50a7ecf7..f406bc05 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\TestHelperDOCX;
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index dfabec03..05785b0c 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 76ba2114..88a522a9 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -10,10 +10,11 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
+
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
@@ -96,7 +97,7 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
         $file = __DIR__ . '/../_files/temp.docx';
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
@@ -117,7 +118,7 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
         $file = __DIR__ . '/../_files/temp.docx';
         $writer->save($file);
 
-        $this->assertTrue(file_exists($file));
+        $this->assertFileExists($file);
 
         unlink($file);
     }
@@ -166,6 +167,8 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
      */
     public function testSetGetUseDiskCaching()
     {
+        $this->setOutputCallback(function () {
+        });
         $phpWord = new PhpWord();
         $phpWord->addSection();
         $object = new Word2007($phpWord);
@@ -183,7 +186,7 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
      */
     public function testSetUseDiskCachingException()
     {
-        $dir = join(DIRECTORY_SEPARATOR, array(PHPWORD_TESTS_BASE_DIR, 'foo'));
+        $dir = implode(DIRECTORY_SEPARATOR, array(PHPWORD_TESTS_BASE_DIR, 'foo'));
 
         $object = new Word2007();
         $object->setUseDiskCaching(true, $dir);
diff --git a/tests/PhpWord/_includes/TestHelperDOCX.php b/tests/PhpWord/_includes/TestHelperDOCX.php
index 03079974..bef060ee 100644
--- a/tests/PhpWord/_includes/TestHelperDOCX.php
+++ b/tests/PhpWord/_includes/TestHelperDOCX.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -29,7 +29,7 @@ class TestHelperDOCX
      *
      * @var string
      */
-    static protected $file;
+    protected static $file;
 
     /**
      * Get document content
@@ -39,9 +39,8 @@ class TestHelperDOCX
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
      * @param string $writerName
      *
-     * @return \PhpOffice\PhpWord\XmlDocument
-     *
      * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
+     * @return \PhpOffice\PhpWord\XmlDocument
      */
     public static function getDocument(PhpWord $phpWord, $writerName = 'Word2007')
     {
@@ -57,7 +56,7 @@ class TestHelperDOCX
         $xmlWriter = IOFactory::createWriter($phpWord, $writerName);
         $xmlWriter->save(self::$file);
 
-        $zip = new \ZipArchive;
+        $zip = new \ZipArchive();
         $res = $zip->open(self::$file);
         if (true === $res) {
             $zip->extractTo(Settings::getTempDir() . '/PhpWord_Unit_Test/');
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index c3bab0f6..ef56ed15 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
@@ -25,7 +25,7 @@ class XmlDocument
     /**
      * Path
      *
-     * @var string $path
+     * @var string
      */
     private $path;
 
@@ -78,6 +78,7 @@ class XmlDocument
         $file = $this->path . '/' . $file;
         $this->dom = new \DOMDocument();
         $this->dom->load($file);
+
         return $this->dom;
     }
 
@@ -158,6 +159,7 @@ class XmlDocument
     public function elementExists($path, $file = 'word/document.xml')
     {
         $nodeList = $this->getNodeList($path, $file);
+
         return !($nodeList->length == 0);
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 60ca5ae7..7126c204 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,11 +10,10 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
-
 require_once __DIR__ . '/../bootstrap.php';
 
 date_default_timezone_set('UTC');
@@ -29,7 +28,7 @@ spl_autoload_register(function ($class) {
     $prefix = 'PhpOffice\\PhpWord';
     if (strpos($class, $prefix) === 0) {
         $class = str_replace('\\', DIRECTORY_SEPARATOR, $class);
-        $class = join(DIRECTORY_SEPARATOR, array('PhpWord', '_includes')) .
+        $class = implode(DIRECTORY_SEPARATOR, array('PhpWord', '_includes')) .
             substr($class, strlen($prefix));
         $file = __DIR__ . DIRECTORY_SEPARATOR . $class . '.php';
         if (file_exists($file)) {

From 601a2b6ec697d62e605722a2b71a42e78fb87d03 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 4 Nov 2017 23:26:04 +0100
Subject: [PATCH 109/370] make Comment constructor attributes optional

---
 samples/Sample_37_Comments.php      | 4 ++--
 src/PhpWord/Element/Comment.php     | 2 +-
 src/PhpWord/Element/TrackChange.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Sample_37_Comments.php b/samples/Sample_37_Comments.php
index 5c0e8abc..268739bc 100644
--- a/samples/Sample_37_Comments.php
+++ b/samples/Sample_37_Comments.php
@@ -21,7 +21,7 @@ $textrun->addText(' a test');
 $section->addTextBreak(2);
 
 // Let's create a comment that we will link to a start element and an end element
-$commentWithStartAndEnd = new \PhpOffice\PhpWord\Element\Comment('Foo Bar', new \DateTime(), '');
+$commentWithStartAndEnd = new \PhpOffice\PhpWord\Element\Comment('Foo Bar', new \DateTime());
 $commentWithStartAndEnd->addText('A comment with a start and an end');
 $phpWord->addComment($commentWithStartAndEnd);
 
@@ -36,7 +36,7 @@ $textToEndOn->setCommentRangeEnd($commentWithStartAndEnd);
 $section->addTextBreak(2);
 
 // Let's add a comment on an image
-$commentOnImage = new \PhpOffice\PhpWord\Element\Comment('Mr Smart', new \DateTime(), '');
+$commentOnImage = new \PhpOffice\PhpWord\Element\Comment('Mr Smart', new \DateTime());
 $imageComment = $commentOnImage->addTextRun();
 $imageComment->addText('Hey, Mars does look ');
 $imageComment->addText('red', array('color' => 'FF0000'));
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index a8f39748..908b8785 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -57,7 +57,7 @@ class Comment extends TrackChange
      * @param \DateTime $date
      * @param string $initials
      */
-    public function __construct($author, $date, $initials)
+    public function __construct($author, $date = null, $initials = null)
     {
         parent::__construct($author, $date);
         $this->initials = $initials;
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 11cc763a..d900b053 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -47,7 +47,7 @@ class TrackChange extends AbstractContainer
      * @param string $author
      * @param \DateTime $date
      */
-    public function __construct($author, \DateTime $date)
+    public function __construct($author, \DateTime $date = null)
     {
         $this->author = $author;
         $this->date = $date;

From 03d4a36b9bb98ed37740cd0cc810791aa71083cb Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 00:03:06 +0100
Subject: [PATCH 110/370] fixed HTML superscript, and added allcaps, smallcaps,
 and letter-spacing

---
 src/PhpWord/Writer/HTML/Element/Text.php    |  4 ++++
 src/PhpWord/Writer/HTML/Style/Font.php      | 11 ++++++++---
 src/PhpWord/Writer/HTML/Style/Paragraph.php |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index ed1ba4a3..71cb7566 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -164,6 +164,8 @@ class Text extends AbstractElement
         if ($pStyleIsObject) {
             $styleWriter = new ParagraphStyleWriter($paragraphStyle);
             $style = $styleWriter->write();
+        } elseif (is_string($paragraphStyle)) {
+            $style = $paragraphStyle;
         }
         if ($style) {
             $attribute = $pStyleIsObject ? 'style' : 'class';
@@ -186,6 +188,8 @@ class Text extends AbstractElement
         if ($fStyleIsObject) {
             $styleWriter = new FontStyleWriter($fontStyle);
             $style = $styleWriter->write();
+        } elseif (is_string($fontStyle)) {
+            $style = $fontStyle;
         }
         if ($style) {
             $attribute = $fStyleIsObject ? 'style' : 'class';
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
index cb96cf64..8daa8823 100644
--- a/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -52,12 +52,17 @@ class Font extends AbstractStyle
         $css['background'] = $this->getValueIf($fgColor != '', $fgColor);
         $css['font-weight'] = $this->getValueIf($style->isBold(), 'bold');
         $css['font-style'] = $this->getValueIf($style->isItalic(), 'italic');
-        $css['vertical-align'] = $this->getValueIf($style->isSuperScript(), 'italic');
-        $css['vertical-align'] = $this->getValueIf($style->isSuperScript(), 'super');
-        $css['vertical-align'] = $this->getValueIf($style->isSubScript(), 'sub');
+        $css['vertical-align'] = '';
+        $css['vertical-align'] .= $this->getValueIf($style->isSuperScript(), 'super');
+        $css['vertical-align'] .= $this->getValueIf($style->isSubScript(), 'sub');
         $css['text-decoration'] = '';
         $css['text-decoration'] .= $this->getValueIf($underline, 'underline ');
         $css['text-decoration'] .= $this->getValueIf($lineThrough, 'line-through ');
+        $css['text-transform'] = $this->getValueIf($style->isAllCaps(), 'uppercase');
+        $css['font-variant'] = $this->getValueIf($style->isSmallCaps(), 'small-caps');
+
+        $spacing = $style->getSpacing();
+        $css['letter-spacing'] = $this->getValueIf(!is_null($spacing), ($spacing / 20) . 'pt');
 
         return $this->assembleCss($css);
     }
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index e264ead0..af551dc5 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -80,6 +80,9 @@ class Paragraph extends AbstractStyle
             $after = $spacing->getAfter();
             $css['margin-top'] = $this->getValueIf(!is_null($before), ($before / 20) . 'pt');
             $css['margin-bottom'] = $this->getValueIf(!is_null($after), ($after / 20) . 'pt');
+        } else {
+            $css['margin-top'] = '0';
+            $css['margin-bottom'] = '0';
         }
 
         return $this->assembleCss($css);

From b926eec3bcc36e8d776970414142d4d1b381eeb9 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 00:08:15 +0100
Subject: [PATCH 111/370] update changelog

---
 .gitignore   | 1 +
 CHANGELOG.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 42f03ebe..2ac6e2b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ vendor
 phpword.ini
 /.buildpath
 /.project
+/nbproject
 /.php_cs.cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f963a3cd..ad046951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ This is the last version to support PHP 5.3
 - Impossible to add element PreserveText in Section - @rvanlaak #452
 - Added missing options for numbering format - @troosan #1041
 - Fixed impossibility to set a different footer for first page - @ctrlaltca #1116
+- Fixed styles not being applied by HTML writer, better pdf output - @sarke #1047 #500 #1139
 
 v0.13.0 (31 July 2016)
 -------------------

From 64957d9ec8dce1feb2fb3ca9ad637106866e0ace Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 01:58:17 +0100
Subject: [PATCH 112/370] Support for Mirrored page setup for docx

---
 docs/general.rst                              |  9 +++++
 src/PhpWord/Metadata/Settings.php             | 24 +++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  1 +
 .../Writer/Word2007/Part/SettingsTest.php     | 40 +++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/docs/general.rst b/docs/general.rst
index 5b5c5d9e..b11734b1 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -159,6 +159,15 @@ Or to predefined values ``fullPage``, ``bestFit``, ``textFit``
 
     $phpWord->getSettings()->setZoom(Zoom::BEST_FIT);
 
+Mirroring the Page Margins
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Use mirror margins to set up facing pages for double-sided documents, such as books or magazines.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setMirrorMargins(true);
+
+
 Spelling and grammatical checks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 85c0659d..dc9270e7 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -38,6 +38,14 @@ class Settings
      */
     private $zoom = 100;
 
+    /**
+     * Mirror Page Margins
+     * 
+     * @see http://www.datypic.com/sc/ooxml/e-w_mirrorMargins-1.html
+     * @var bool
+     */
+    private $mirrorMargins;
+
     /**
      * Hide spelling errors
      *
@@ -301,6 +309,22 @@ class Settings
         }
     }
 
+    /**
+     * @return bool
+     */
+    public function hasMirrorMargins()
+    {
+        return $this->mirrorMargins;
+    }
+
+    /**
+     * @param bool $mirrorMargins
+     */
+    public function setMirrorMargins($mirrorMargins)
+    {
+        $this->mirrorMargins = $mirrorMargins;
+    }
+
     /**
      * Returns the Language
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index b205619d..c8772e71 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -140,6 +140,7 @@ class Settings extends AbstractPart
             ),
         );
 
+        $this->setOnOffValue('w:mirrorMargins', $documentSettings->hasMirrorMargins());
         $this->setOnOffValue('w:hideSpellingErrors', $documentSettings->hasHideSpellingErrors());
         $this->setOnOffValue('w:hideGrammaticalErrors', $documentSettings->hasHideGrammaticalErrors());
         $this->setOnOffValue('w:trackRevisions', $documentSettings->hasTrackRevisions());
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 7d85995c..4715d2da 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -23,6 +23,7 @@ use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\ComplexType\ProofState;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -110,6 +111,29 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(Language::HE_IL, $element->getAttribute('w:bidi'));
     }
 
+    /**
+     * Test proofState
+     */
+    public function testProofState()
+    {
+        $proofState = new ProofState();
+        $proofState->setSpelling(ProofState::DIRTY);
+        $proofState->setGrammar(ProofState::DIRTY);
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setProofState($proofState);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:proofState';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+
+        $this->assertEquals('dirty', $element->getAttribute('w:spelling'));
+        $this->assertEquals('dirty', $element->getAttribute('w:grammar'));
+    }
+
     /**
      * Test spelling
      */
@@ -186,6 +210,22 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('fullPage', $element->getAttribute('w:val'));
     }
 
+    public function testMirrorMargins()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setMirrorMargins(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:mirrorMargins';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
     /**
      * Test Revision View
      */

From 8c7ed19d6210c92319d212b845c1acdb3a11a098 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 02:07:53 +0100
Subject: [PATCH 113/370] Support for Mirrored page setup for docx (#1183)

---
 docs/general.rst                              |  9 +++++
 src/PhpWord/Metadata/Settings.php             | 24 +++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  1 +
 .../Writer/Word2007/Part/SettingsTest.php     | 40 +++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/docs/general.rst b/docs/general.rst
index 5b5c5d9e..b11734b1 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -159,6 +159,15 @@ Or to predefined values ``fullPage``, ``bestFit``, ``textFit``
 
     $phpWord->getSettings()->setZoom(Zoom::BEST_FIT);
 
+Mirroring the Page Margins
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Use mirror margins to set up facing pages for double-sided documents, such as books or magazines.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setMirrorMargins(true);
+
+
 Spelling and grammatical checks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 85c0659d..dc9270e7 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -38,6 +38,14 @@ class Settings
      */
     private $zoom = 100;
 
+    /**
+     * Mirror Page Margins
+     * 
+     * @see http://www.datypic.com/sc/ooxml/e-w_mirrorMargins-1.html
+     * @var bool
+     */
+    private $mirrorMargins;
+
     /**
      * Hide spelling errors
      *
@@ -301,6 +309,22 @@ class Settings
         }
     }
 
+    /**
+     * @return bool
+     */
+    public function hasMirrorMargins()
+    {
+        return $this->mirrorMargins;
+    }
+
+    /**
+     * @param bool $mirrorMargins
+     */
+    public function setMirrorMargins($mirrorMargins)
+    {
+        $this->mirrorMargins = $mirrorMargins;
+    }
+
     /**
      * Returns the Language
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index b205619d..c8772e71 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -140,6 +140,7 @@ class Settings extends AbstractPart
             ),
         );
 
+        $this->setOnOffValue('w:mirrorMargins', $documentSettings->hasMirrorMargins());
         $this->setOnOffValue('w:hideSpellingErrors', $documentSettings->hasHideSpellingErrors());
         $this->setOnOffValue('w:hideGrammaticalErrors', $documentSettings->hasHideGrammaticalErrors());
         $this->setOnOffValue('w:trackRevisions', $documentSettings->hasTrackRevisions());
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 7d85995c..4715d2da 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -23,6 +23,7 @@ use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\ComplexType\ProofState;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -110,6 +111,29 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(Language::HE_IL, $element->getAttribute('w:bidi'));
     }
 
+    /**
+     * Test proofState
+     */
+    public function testProofState()
+    {
+        $proofState = new ProofState();
+        $proofState->setSpelling(ProofState::DIRTY);
+        $proofState->setGrammar(ProofState::DIRTY);
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setProofState($proofState);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:proofState';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $element = $doc->getElement($path, $file);
+
+        $this->assertEquals('dirty', $element->getAttribute('w:spelling'));
+        $this->assertEquals('dirty', $element->getAttribute('w:grammar'));
+    }
+
     /**
      * Test spelling
      */
@@ -186,6 +210,22 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('fullPage', $element->getAttribute('w:val'));
     }
 
+    public function testMirrorMargins()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setMirrorMargins(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:mirrorMargins';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
     /**
      * Test Revision View
      */

From ce377b9b586693bf43b8dee47d9a7e3e63e966dc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 02:16:04 +0100
Subject: [PATCH 114/370] fix php-cs error

---
 src/PhpWord/Shared/AbstractEnum.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index d7839c4f..58601a14 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
 namespace PhpOffice\PhpWord\Shared;
 
 abstract class AbstractEnum

From 92fc54992a2b3fa7ca2d0c65518c086e016f9c8e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 08:54:52 +0100
Subject: [PATCH 115/370] fix end of line space

---
 src/PhpWord/Metadata/Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index dc9270e7..412f5c52 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -40,7 +40,7 @@ class Settings
 
     /**
      * Mirror Page Margins
-     * 
+     *
      * @see http://www.datypic.com/sc/ooxml/e-w_mirrorMargins-1.html
      * @var bool
      */

From 200d846f6195a0801e1ac2c41f6513cf68832094 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 21:39:10 +0100
Subject: [PATCH 116/370] implement paragraph textAlignment

---
 src/PhpWord/SimpleType/TextAlignment.php      | 45 +++++++++++++++++++
 src/PhpWord/Style/Paragraph.php               | 33 ++++++++++++++
 .../Writer/Word2007/Style/Paragraph.php       |  3 ++
 tests/PhpWord/Element/ImageTest.php           |  1 +
 tests/PhpWord/Style/FontTest.php              | 14 ++++++
 tests/PhpWord/Style/ParagraphTest.php         |  3 +-
 .../Writer/Word2007/Part/SettingsTest.php     |  2 +-
 7 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 src/PhpWord/SimpleType/TextAlignment.php

diff --git a/src/PhpWord/SimpleType/TextAlignment.php b/src/PhpWord/SimpleType/TextAlignment.php
new file mode 100644
index 00000000..de36b108
--- /dev/null
+++ b/src/PhpWord/SimpleType/TextAlignment.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Magnification Preset Values
+ *
+ * @since 0.14.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_TextAlignment.html
+ */
+final class TextAlignment extends AbstractEnum
+{
+    //Align Text at Top
+    const TOP = 'top';
+
+    //Align Text at Center
+    const CENTER = 'center';
+
+    //Align Text at Baseline
+    const BASELINE = 'baseline';
+
+    //Align Text at Bottom
+    const BOTTOM = 'bottom';
+
+    //Automatically Determine Alignment
+    const AUTO = 'auto';
+}
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index f665048b..355b495d 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -20,6 +20,7 @@ namespace PhpOffice\PhpWord\Style;
 use PhpOffice\Common\Text;
 use PhpOffice\PhpWord\Exception\InvalidStyleException;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\SimpleType\TextAlignment;
 
 /**
  * Paragraph style
@@ -172,6 +173,13 @@ class Paragraph extends Border
      */
     private $bidi = false;
 
+    /**
+     * Vertical Character Alignment on Line
+     *
+     * @var string
+     */
+    private $textAlignment;
+
     /**
      * Set Style value
      *
@@ -224,6 +232,7 @@ class Paragraph extends Border
             'shading'           => $this->getShading(),
             'contextualSpacing' => $this->hasContextualSpacing(),
             'bidi'              => $this->isBidi(),
+            'textAlignment'     => $this->getTextAlignment(),
         );
 
         return $styles;
@@ -794,4 +803,28 @@ class Paragraph extends Border
 
         return $this;
     }
+
+    /**
+     * Get textAlignment
+     *
+     * @return string
+     */
+    public function getTextAlignment()
+    {
+        return $this->textAlignment;
+    }
+
+    /**
+     * Set textAlignment
+     *
+     * @param string $textAlignment
+     * @return self
+     */
+    public function setTextAlignment($textAlignment)
+    {
+        TextAlignment::validate($textAlignment);
+        $this->textAlignment = $textAlignment;
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 707bf031..424b87f8 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -109,6 +109,9 @@ class Paragraph extends AbstractStyle
         //Paragraph contextualSpacing
         $xmlWriter->writeElementIf($styles['contextualSpacing'] === true, 'w:contextualSpacing');
 
+        //Paragraph contextualSpacing
+        $xmlWriter->writeElementIf($styles['textAlignment'] !== null, 'w:textAlignment', 'w:val', $styles['textAlignment']);
+
         // Child style: alignment, indentation, spacing, and shading
         $this->writeChildStyle($xmlWriter, 'Indentation', $styles['indentation']);
         $this->writeChildStyle($xmlWriter, 'Spacing', $styles['spacing']);
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 80e0bcfc..b681b81f 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -87,6 +87,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
             $this->assertEquals($createFunction, $image->getImageCreateFunction());
             $this->assertEquals($imageFunction, $image->getImageFunction());
             $this->assertFalse($image->isMemImage());
+            $this->assertNotNull($image->getImageStringData());
         }
     }
 
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index 707784f6..a227d7f9 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -69,6 +69,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
             'doubleStrikethrough' => false,
             'smallCaps'           => false,
             'allCaps'             => false,
+            'rtl'                 => false,
             'fgColor'             => null,
             'bgColor'             => null,
             'scale'               => null,
@@ -113,6 +114,8 @@ class FontTest extends \PHPUnit_Framework_TestCase
             'scale'               => 150,
             'spacing'             => 240,
             'kerning'             => 10,
+            'rtl'                 => true,
+            'lang'                => new Language(Language::EN_US),
         );
         $object->setStyleByArray($attributes);
         foreach ($attributes as $key => $value) {
@@ -173,4 +176,15 @@ class FontTest extends \PHPUnit_Framework_TestCase
         $object = new Font();
         $object->setLineHeight('a');
     }
+
+    /**
+     * Test setting the language as a string
+     */
+    public function testSetLangAsString()
+    {
+        $object = new Font();
+        $object->setLang(Language::FR_BE);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Language', $object->getLang());
+        $this->assertEquals(Language::FR_BE, $object->getLang()->getLatin());
+    }
 }
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index a702d3f2..e28f54c7 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -80,6 +80,7 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
             'keepLines'         => true,
             'pageBreakBefore'   => true,
             'contextualSpacing' => true,
+            'textAlignment'     => 'auto',
             'bidi'              => true,
         );
         foreach ($attributes as $key => $value) {
@@ -114,7 +115,7 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
     {
         $object = new Paragraph();
 
-        $attributes = array('spacing', 'indent', 'hanging', 'spaceBefore', 'spaceAfter');
+        $attributes = array('spacing', 'indent', 'hanging', 'spaceBefore', 'spaceAfter', 'textAlignment');
         foreach ($attributes as $key) {
             $get = $this->findGetter($key, null, $object);
             $this->assertNull($object->$get());
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 4715d2da..5b812a0f 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -17,13 +17,13 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\ComplexType\ProofState;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings

From a7a35c688dac969d08ea38b5fdc28ab932f8272d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 5 Nov 2017 22:48:04 +0100
Subject: [PATCH 117/370] Allow reading of TargetMode for external images

---
 CHANGELOG.md                                 |  2 ++
 docs/styles.rst                              |  4 ++++
 src/PhpWord/Reader/Word2007.php              |  5 ++--
 src/PhpWord/Reader/Word2007/AbstractPart.php | 24 +++++++++++++++++++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad046951..f21cb9d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This is the last version to support PHP 5.3
 - Possiblity to hide spelling and/or grammatical errors - @troosan #542
 - Possiblity to set default document language as well as changing the language for each text element - @troosan #1108
 - Support for Comments - @troosan #1067
+- Support for paragraph textAlignment - @troosan #1165
 
 ### Fixed
 - Loosen dependency to Zend
@@ -30,6 +31,7 @@ This is the last version to support PHP 5.3
 - Added missing options for numbering format - @troosan #1041
 - Fixed impossibility to set a different footer for first page - @ctrlaltca #1116
 - Fixed styles not being applied by HTML writer, better pdf output - @sarke #1047 #500 #1139
+- Fixed read docx error when document contains image from remote url - @FBnil #1173 #1176
 
 v0.13.0 (31 July 2016)
 -------------------
diff --git a/docs/styles.rst b/docs/styles.rst
index e8d2aec8..4f4926a8 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -80,6 +80,10 @@ Available Paragraph style options:
 - ``tabs``. Set of custom tab stops.
 - ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
 - ``contextualSpacing``. Ignore Spacing Above and Below When Using Identical Styles, *true* or *false*.
+- ``bidi``. Right to Left Paragraph Layout, *true* or *false*.
+- ``shading``. Paragraph Shading.
+- ``textAlignment``. Vertical Character Alignment on Line.
+   See ``\PhpOffice\PhpWord\SimpleType\TextAlignment`` class for possible values.
 
 .. _table-style:
 
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index 9f9fce08..6c2178ad 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -147,6 +147,7 @@ class Word2007 extends AbstractReader implements ReaderInterface
             $rId = $xmlReader->getAttribute('Id', $node);
             $type = $xmlReader->getAttribute('Type', $node);
             $target = $xmlReader->getAttribute('Target', $node);
+            $mode = $xmlReader->getAttribute('TargetMode', $node);
 
             // Remove URL prefixes from $type to make it easier to read
             $type = str_replace($metaPrefix, '', $type);
@@ -154,12 +155,12 @@ class Word2007 extends AbstractReader implements ReaderInterface
             $docPart = str_replace('.xml', '', $target);
 
             // Do not add prefix to link source
-            if (!in_array($type, array('hyperlink'))) {
+            if ($type != 'hyperlink' && $mode != 'External') {
                 $target = $targetPrefix . $target;
             }
 
             // Push to return array
-            $rels[$rId] = array('type' => $type, 'target' => $target, 'docPart' => $docPart);
+            $rels[$rId] = array('type' => $type, 'target' => $target, 'docPart' => $docPart, 'targetMode' => $mode);
         }
         ksort($rels);
 
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 21e12902..521c8a7f 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -210,7 +210,11 @@ abstract class AbstractPart
                 $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
                 $target = $this->getMediaTarget($docPart, $rId);
                 if (!is_null($target)) {
-                    $imageSource = "zip://{$this->docFile}#{$target}";
+                    if ('External' == $this->getTargetMode($docPart, $rId)) {
+                        $imageSource = $target;
+                    } else {
+                        $imageSource = "zip://{$this->docFile}#{$target}";
+                    }
                     $parent->addImage($imageSource);
                 }
             } elseif ($xmlReader->elementExists('w:object', $domNode)) {
@@ -500,4 +504,22 @@ abstract class AbstractPart
 
         return $target;
     }
+
+    /**
+     * Returns the target mode
+     *
+     * @param string $docPart
+     * @param string $rId
+     * @return string|null
+     */
+    private function getTargetMode($docPart, $rId)
+    {
+        $mode = null;
+
+        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {
+            $mode = $this->rels[$docPart][$rId]['targetMode'];
+        }
+
+        return $mode;
+    }
 }

From 9ac9016f5071f70c05e59222c18168b1147d099a Mon Sep 17 00:00:00 2001
From: sergeizelenyi <sergeizelenyi@gmail.com>
Date: Mon, 23 Jan 2017 16:15:33 +0300
Subject: [PATCH 118/370] added functionality specified alias and tag

---
 src/PhpWord/Element/SDT.php                 | 46 +++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Element/SDT.php |  4 ++
 2 files changed, 50 insertions(+)

diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 88ee7238..3e29410f 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -45,6 +45,20 @@ class SDT extends Text
      */
     private $listItems = array();
 
+    /**
+     * Alias
+     *
+     * @var string
+     */
+    private $alias;
+
+    /**
+     * Tag
+     *
+     * @var string
+     */
+    private $tag;
+
     /**
      * Create new instance
      *
@@ -126,4 +140,36 @@ class SDT extends Text
 
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getTag()
+    {
+        return $this->tag;
+    }
+
+    /**
+     * @param string $tag
+     */
+    public function setTag($tag)
+    {
+        $this->tag = $tag;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    /**
+     * @param mixed $alias
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index e77f87e9..c6ea9f01 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -41,6 +41,8 @@ class SDT extends Text
         }
         $type = $element->getType();
         $writeFormField = "write{$type}";
+        $alias = $element->getAlias();
+        $tag = $element->getTag();
 
         $this->startElementP();
 
@@ -48,6 +50,8 @@ class SDT extends Text
 
         // Properties
         $xmlWriter->startElement('w:sdtPr');
+        $xmlWriter->writeElementBlock('w:alias', 'w:val', $alias);
+        $xmlWriter->writeElementBlock('w:tag', 'w:val', $tag);
         $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
         $xmlWriter->writeElementBlock('w:lock', 'w:val', 'sdtLocked');
         $this->$writeFormField($xmlWriter, $element);

From 9c1c544954833115d195d36688b9e86c7960a2ea Mon Sep 17 00:00:00 2001
From: sergeizelenyi <sergeizelenyi@gmail.com>
Date: Mon, 23 Jan 2017 16:43:56 +0300
Subject: [PATCH 119/370] stylization code

---
 src/PhpWord/Element/SDT.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 3e29410f..6d7f103f 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -142,6 +142,8 @@ class SDT extends Text
     }
 
     /**
+     * Get tag
+     * 
      * @return string
      */
     public function getTag()
@@ -150,15 +152,22 @@ class SDT extends Text
     }
 
     /**
+     * Set tag
+     *
      * @param string $tag
+     * @return self
      */
     public function setTag($tag)
     {
         $this->tag = $tag;
+
+        return $this;
     }
 
     /**
-     * @return mixed
+     * Get alias
+     *
+     * @return string
      */
     public function getAlias()
     {
@@ -166,10 +175,15 @@ class SDT extends Text
     }
 
     /**
-     * @param mixed $alias
+     * Set alias
+     *
+     * @param string $alias
+     * @return self
      */
     public function setAlias($alias)
     {
         $this->alias = $alias;
+
+        return $this;
     }
 }

From 1e9203adc9daa0fffe1693f19a8a57832fd227aa Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 6 Nov 2017 21:47:02 +0100
Subject: [PATCH 120/370] add unit tests

---
 src/PhpWord/Element/SDT.php                   |  2 +-
 src/PhpWord/Writer/Word2007/Element/SDT.php   |  6 +++---
 tests/PhpWord/Element/SDTTest.php             |  6 ++++++
 tests/PhpWord/Writer/Word2007/ElementTest.php | 14 +++++++++-----
 tests/PhpWord/_includes/XmlDocument.php       | 18 ++++++++++++++++++
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 6d7f103f..6d4207b7 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -143,7 +143,7 @@ class SDT extends Text
 
     /**
      * Get tag
-     * 
+     *
      * @return string
      */
     public function getTag()
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index c6ea9f01..908f9f49 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -50,10 +50,10 @@ class SDT extends Text
 
         // Properties
         $xmlWriter->startElement('w:sdtPr');
-        $xmlWriter->writeElementBlock('w:alias', 'w:val', $alias);
-        $xmlWriter->writeElementBlock('w:tag', 'w:val', $tag);
-        $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
+        $xmlWriter->writeElementIf($alias != null, 'w:alias', 'w:val', $alias);
         $xmlWriter->writeElementBlock('w:lock', 'w:val', 'sdtLocked');
+        $xmlWriter->writeElementBlock('w:id', 'w:val', rand(100000000, 999999999));
+        $xmlWriter->writeElementIf($tag != null, 'w:tag', 'w:val', $tag);
         $this->$writeFormField($xmlWriter, $element);
         $xmlWriter->endElement(); // w:sdtPr
 
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index fc3682b6..537841a6 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -32,14 +32,20 @@ class SDTTest extends \PHPUnit_Framework_TestCase
         $types = array('comboBox', 'dropDownList', 'date');
         $type = $types[rand(0, 2)];
         $value = rand(0, 100);
+        $alias = 'alias';
+        $tag = 'my_tag';
         $object = new SDT($type);
         $object->setValue($value);
         $object->setListItems($types);
+        $object->setAlias($alias);
+        $object->setTag($tag);
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\SDT', $object);
         $this->assertEquals($type, $object->getType());
         $this->assertEquals($types, $object->getListItems());
         $this->assertEquals($value, $object->getValue());
+        $this->assertEquals($alias, $object->getAlias());
+        $this->assertEquals($tag, $object->getTag());
     }
 
     /**
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 6186695b..0ebc7c57 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -269,13 +269,17 @@ class ElementTest extends \PHPUnit_Framework_TestCase
 
         $section->addSDT('comboBox');
         $section->addSDT('dropDownList');
-        $section->addSDT('date');
+        $section->addSDT('date')->setAlias('date_alias')->setTag('my_tag');
 
         $doc = TestHelperDOCX::getDocument($phpWord);
 
-        $path = '/w:document/w:body/w:p/w:sdt/w:sdtPr';
-        $this->assertTrue($doc->elementExists($path . '/w:comboBox'));
-        $this->assertTrue($doc->elementExists($path . '/w:dropDownList'));
-        $this->assertTrue($doc->elementExists($path . '/w:date'));
+        $path = '/w:document/w:body/w:p';
+
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox'));
+        $this->assertTrue($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:dropDownList'));
+        $this->assertFalse($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:alias'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:date'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:alias'));
+        $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:tag'));
     }
 }
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index ef56ed15..eb335278 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -162,4 +162,22 @@ class XmlDocument
 
         return !($nodeList->length == 0);
     }
+
+    /**
+     * Returns the xml, or part of it as a formatted string
+     *
+     * @param string $path
+     * @param string $file
+     * @return string
+     */
+    public function printXml($path = '/w:document', $file = 'word/document.xml')
+    {
+        $newdoc = new \DOMDocument();
+        $newdoc->formatOutput = true;
+        $newdoc->preserveWhiteSpace = false;
+        $node = $newdoc->importNode($this->getElement($path, $file), true);
+        $newdoc->appendChild($node);
+
+        return $newdoc->saveXML($node);
+    }
 }

From 56a3a53e7bb7fbf38deae759cafdc776e10a68a9 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 7 Nov 2017 22:11:31 +0100
Subject: [PATCH 121/370] add unit test

---
 tests/PhpWord/Writer/Word2007/ElementTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 0ebc7c57..dc3d30bd 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -267,7 +267,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
 
-        $section->addSDT('comboBox');
+        $section->addSDT('comboBox')->setListItems(array('1' => 'Choice 1', '2' => 'Choice 2'))->setValue('select value');
         $section->addSDT('dropDownList');
         $section->addSDT('date')->setAlias('date_alias')->setTag('my_tag');
 
@@ -275,9 +275,16 @@ class ElementTest extends \PHPUnit_Framework_TestCase
 
         $path = '/w:document/w:body/w:p';
 
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtContent/w:r/w:t'));
+        $this->assertEquals('select value', $doc->getElement($path . '[1]/w:sdt/w:sdtContent/w:r/w:t')->nodeValue);
         $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox'));
+        $this->assertTrue($doc->elementExists($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem'));
+        $this->assertEquals('1', $doc->getElementAttribute($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem[1]', 'w:value'));
+        $this->assertEquals('Choice 1', $doc->getElementAttribute($path . '[1]/w:sdt/w:sdtPr/w:comboBox/w:listItem[1]', 'w:displayText'));
+
         $this->assertTrue($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:dropDownList'));
         $this->assertFalse($doc->elementExists($path . '[2]/w:sdt/w:sdtPr/w:alias'));
+
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:date'));
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:alias'));
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:tag'));

From 1b9c1d921b22cb87e17e0848ab00b785f370328a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 7 Nov 2017 22:38:30 +0100
Subject: [PATCH 122/370] format

---
 src/PhpWord/Writer/ODText/Style/Paragraph.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 68613855..14a811a5 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -35,8 +35,8 @@ class Paragraph extends AbstractStyle
         }
         $xmlWriter = $this->getXmlWriter();
 
-        $marginTop = ($style->getSpaceBefore() ==0 ) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
-        $marginBottom = ($style->getSpaceAfter() == 0) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
+        $marginTop = (is_null($style->getSpaceBefore()) || $style->getSpaceBefore() == 0) ? '0' : round(17.6 / $style->getSpaceBefore(), 2);
+        $marginBottom = (is_null($style->getSpaceAfter()) || $style->getSpaceAfter() == 0) ? '0' : round(17.6 / $style->getSpaceAfter(), 2);
 
         $xmlWriter->startElement('style:style');
         $xmlWriter->writeAttribute('style:name', $style->getStyleName());

From 9634352b0f4d5fed0a916ac2f5c82e3a88247adc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 7 Nov 2017 23:12:06 +0100
Subject: [PATCH 123/370] update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f21cb9d6..0a5a91d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,9 +29,10 @@ This is the last version to support PHP 5.3
 - Fixed Word2007 reader where margins were not being read correctly - @slowprog #885 #1008
 - Impossible to add element PreserveText in Section - @rvanlaak #452
 - Added missing options for numbering format - @troosan #1041
-- Fixed impossibility to set a different footer for first page - @ctrlaltca #1116
+- Fixed impossibility to set a different footer for first page - @ctrlaltca #1116, @aoloe #875
 - Fixed styles not being applied by HTML writer, better pdf output - @sarke #1047 #500 #1139
 - Fixed read docx error when document contains image from remote url - @FBnil #1173 #1176
+- Padded the $args array to remove error - @kaigoh #1150, @reformed #870
 
 v0.13.0 (31 July 2016)
 -------------------

From 610d91e041fc53ef141faee97ab993909fff6f60 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 8 Nov 2017 00:27:58 +0100
Subject: [PATCH 124/370] call parent constructor in SDT and FormField

---
 docs/styles.rst                   | 4 +++-
 src/PhpWord/Element/FormField.php | 1 +
 src/PhpWord/Element/SDT.php       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/styles.rst b/docs/styles.rst
index 4f4926a8..f223574f 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -45,6 +45,7 @@ Available Font style options:
 - ``color``. Font color, e.g. *FF0000*.
 - ``doubleStrikethrough``. Double strikethrough, *true* or *false*.
 - ``fgColor``. Font highlight color, e.g. *yellow*, *green*, *blue*.
+   See ``\PhpOffice\PhpWord\Style\Font::FGCOLOR_...`` constants for more values
 - ``hint``. Font content type, *default*, *eastAsia*, or *cs*.
 - ``italic``. Italic, *true* or *false*.
 - ``name``. Font name, e.g. *Arial*.
@@ -54,7 +55,8 @@ Available Font style options:
 - ``strikethrough``. Strikethrough, *true* or *false*.
 - ``subScript``. Subscript, *true* or *false*.
 - ``superScript``. Superscript, *true* or *false*.
-- ``underline``. Underline, *dash*, *dotted*, etc.
+- ``underline``. Underline, *single*, *dash*, *dotted*, etc.
+   See ``\PhpOffice\PhpWord\Style\Font::UNDERLINE_...`` constants for more values
 - ``lang``. Language, either a language code like *en-US*, *fr-BE*, etc. or an object (or as an array) if you need to set eastAsian or bidirectional languages
    See ``\PhpOffice\PhpWord\Style\Language`` class for some language codes.
 
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index 1e3e182c..598d61dc 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -73,6 +73,7 @@ class FormField extends Text
      */
     public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     {
+        parent::__construct(null, $fontStyle, $paragraphStyle);
         $this->setType($type);
     }
 
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 6d4207b7..86f445cc 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -68,6 +68,7 @@ class SDT extends Text
      */
     public function __construct($type, $fontStyle = null, $paragraphStyle = null)
     {
+        parent::__construct(null, $fontStyle, $paragraphStyle);
         $this->setType($type);
     }
 

From 5412df29fae2a4c74cfda0885b1ec9fb87ea83fd Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 8 Nov 2017 00:34:22 +0100
Subject: [PATCH 125/370] update doc

---
 src/PhpWord/Style/Font.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 017ee521..8bfb3ac5 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -33,10 +33,16 @@ class Font extends AbstractStyle
     const UNDERLINE_DASHLONG = 'dashLong';
     const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy';
     const UNDERLINE_DOUBLE = 'dbl';
+    /**
+     * @deprecated use UNDERLINE_DOTHASH instead, TODO remove in version 1.0
+     */
     const UNDERLINE_DOTHASH = 'dotDash';  // Incorrect spelling, for backwards compatibility
+    /**
+     * @deprecated use UNDERLINE_DOTDASHHEAVY instead, TODO remove in version 1.0
+     */
     const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy';  // Incorrect spelling, for backwards compatibility
-    const UNDERLINE_DOTDASH = 'dotDash';  // Correct spelling
-    const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy';  // Correct spelling
+    const UNDERLINE_DOTDASH = 'dotDash';
+    const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy';
     const UNDERLINE_DOTDOTDASH = 'dotDotDash';
     const UNDERLINE_DOTDOTDASHHEAVY = 'dotDotDashHeavy';
     const UNDERLINE_DOTTED = 'dotted';

From ebd4741774b3c211ccdc4129d70e93ae987dab8d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 8 Nov 2017 00:45:14 +0100
Subject: [PATCH 126/370] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c66ae424..6579d2ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ This is the last version to support PHP 5.3
 - Fixed styles not being applied by HTML writer, better pdf output - @sarke #1047 #500 #1139
 - Fixed read docx error when document contains image from remote url - @FBnil #1173 #1176
 - Padded the $args array to remove error - @kaigoh #1150, @reformed #870
-
+- Fix incorrect image size between windows and mac - @bskrtich #874
 v0.13.0 (31 July 2016)
 -------------------
 This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).

From 778a77ecff34779841531354990ddfa55f97e0e9 Mon Sep 17 00:00:00 2001
From: ejuhjav <ejuhjav@luukku.com>
Date: Wed, 20 May 2015 13:17:11 +0200
Subject: [PATCH 127/370] Update elements.rst

Fixed a typo in the $lineStyle example (defined previously as $linestyle but used as $lineStyle)
---
 docs/elements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index 124f4431..e27b45d9 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -414,7 +414,7 @@ Line elements can be added to sections by using ``addLine``.
 
 .. code-block:: php
 
-    $linestyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
+    $lineStyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
     $section->addLine($lineStyle)
 
 Available line style attributes:

From fcdafeedd47ddf9473f802df680d1e1619d63df5 Mon Sep 17 00:00:00 2001
From: Nilton <niltoncastillo@pimarox.nl>
Date: Sat, 21 Oct 2017 00:07:52 +0200
Subject: [PATCH 128/370] Bring back b, i, <span style="font-style: italic;">
 and <span style="font-weight: bold;">

---
 src/PhpWord/Shared/Html.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 670ba6e5..369b57fe 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -117,9 +117,12 @@ class Html
             'h6'        => array('Heading',     null,   $element,   $styles,    null,   'Heading6',     null),
             '#text'     => array('Text',        $node,  $element,   $styles,    null,   null,           null),
             'strong'    => array('Property',    null,   null,       $styles,    null,   'bold',         true),
+            'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
             'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
+            'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
+            'span'      => array('Property',    null,   null,       $styles,    null,   'span',        $node),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
             'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
             'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
@@ -246,7 +249,16 @@ class Html
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
-        $styles['font'][$argument1] = $argument2;
+        if ($argument1 !== 'span') {
+            $styles['font'][$argument1] = $argument2;
+        } else {
+            if (!is_null($argument2->attributes)) {
+                $nodeAttr = $argument2->attributes->getNamedItem('style');
+                if (!is_null($nodeAttr) && property_exists($nodeAttr, 'value')) {
+                    $styles['font'] = self::parseStyle($nodeAttr, $styles['font']);
+                }
+            }
+        }
 
         return null;
     }
@@ -362,6 +374,20 @@ class Html
                 case 'background-color':
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
+                case 'font-weight':
+                    $tValue = false;
+                    if (preg_match('#bold#', $cValue)) {
+                        $tValue = true; // also match bolder
+                    }
+                    $styles['bold'] = $tValue;
+                    break;
+                case 'font-style':
+                    $tValue = false;
+                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
+                        $tValue = true;
+                    }
+                    $styles['italic'] = $tValue;
+                    break;
             }
         }
 

From 9e7e07d0bc5399d11a061a6baef314b8706d4242 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 9 Nov 2017 00:41:56 +0100
Subject: [PATCH 129/370] Add unit tests for Html parser

---
 src/PhpWord/Shared/Html.php             |  41 ++++-----
 tests/PhpWord/Reader/MsDocTest.php      |  20 +++++
 tests/PhpWord/Shared/HtmlTest.php       | 110 +++++++++++++++++++++++-
 tests/PhpWord/_includes/XmlDocument.php |  12 ++-
 4 files changed, 156 insertions(+), 27 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index f2282499..620839b4 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
+use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
  * Common Html functions
@@ -120,9 +121,10 @@ class Html
             'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
             'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
             'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
+            'u'         => array('Property',    null,   null,       $styles,    null,   'underline',    'single'),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
-            'span'      => array('Property',    null,   null,       $styles,    null,   'span',        $node),
+            'span'      => array('Property',    null,   null,       $styles,    null,   'span',         $node),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
             'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
             'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
@@ -236,8 +238,6 @@ class Html
         // if (method_exists($element, 'addText')) {
         $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
         // }
-
-        return null;
     }
 
     /**
@@ -259,8 +259,6 @@ class Html
                 }
             }
         }
-
-        return null;
     }
 
     /**
@@ -310,8 +308,6 @@ class Html
             $data['listdepth'] = 0;
         }
         $styles['list']['listType'] = $argument1;
-
-        return null;
     }
 
     /**
@@ -337,8 +333,6 @@ class Html
             }
             $element->addListItem($text, $data['listdepth'], $styles['font'], $styles['list'], $styles['paragraph']);
         }
-
-        return null;
     }
 
     /**
@@ -366,7 +360,20 @@ class Html
                     }
                     break;
                 case 'text-align':
-                    $styles['alignment'] = $cValue; // todo: any mapping?
+                    switch ($cValue) {
+                        case 'left':
+                            $styles['alignment'] = Jc::START;
+                            break;
+                        case 'right':
+                            $styles['alignment'] = Jc::END;
+                            break;
+                        case 'center':
+                            $styles['alignment'] = Jc::CENTER;
+                            break;
+                        case 'justify':
+                            $styles['alignment'] = Jc::BOTH;
+                            break;
+                    }
                     break;
                 case 'color':
                     $styles['color'] = trim($cValue, '#');
@@ -388,20 +395,6 @@ class Html
                     }
                     $styles['italic'] = $tValue;
                     break;
-                case 'font-weight':
-                    $tValue = false;
-                    if (preg_match('#bold#', $cValue)) {
-                        $tValue = true; // also match bolder
-                    }
-                    $styles['bold'] = $tValue;
-                    break;
-                case 'font-style':
-                    $tValue = false;
-                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
-                        $tValue = true;
-                    }
-                    $styles['italic'] = $tValue;
-                    break;
             }
         }
 
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index ed16e64b..b57f7e44 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -56,4 +56,24 @@ class MsDocTest extends \PHPUnit_Framework_TestCase
         $phpWord = IOFactory::load($filename, 'MsDoc');
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
     }
+
+    /**
+     * Test exception on not existing file
+     * @expectedException \Exception
+     */
+    public function testFailIfFileNotReadable()
+    {
+        $filename = __DIR__ . '/../_files/documents/not_existing_reader.doc';
+        IOFactory::load($filename, 'MsDoc');
+    }
+
+    /**
+     * Test exception on non OLE document
+     * @expectedException \Exception
+     */
+    public function testFailIfFileNotOle()
+    {
+        $filename = __DIR__ . '/../_files/documents/reader.odt';
+        IOFactory::load($filename, 'MsDoc');
+    }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 602b644d..b1a9e31c 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -18,9 +18,12 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\Section;
+use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html
+ * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
  */
 class HtmlTest extends \PHPUnit_Framework_TestCase
 {
@@ -43,7 +46,7 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
 
         // Styles
         $content .= '<p style="text-decoration: underline; text-decoration: line-through; '
-                  . 'text-align: center; color: #999; background-color: #000;">';
+                  . 'text-align: center; color: #999; background-color: #000; font-weight: bold; font-style: italic;">';
         foreach ($styles as $style) {
             $content .= "<{$style}>{$style}</{$style}>";
         }
@@ -67,4 +70,109 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
         $content .= '&ndash;&nbsp;&emsp;&ensp;&sup2;&sup3;&frac14;&frac12;&frac34;';
         Html::addHtml($section, $content);
     }
+
+    /**
+     * Test that html already in body element can be read
+     * @ignore
+     */
+    public function testParseFullHtml()
+    {
+        $section = new Section(1);
+        Html::addHtml($section, '<body><p>test paragraph1</p><p>test paragraph2</p></body>', true);
+
+        $this->assertCount(2, $section->getElements());
+    }
+
+    /**
+     * Test underline
+     */
+    public function testParseUnderline()
+    {
+        $html = '<u>test</u>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test text-decoration style
+     */
+    public function testParseTextDecoration()
+    {
+        $html = '<span style="text-decoration: underline;">test</span>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test text-align style
+     */
+    public function testParseTextAlign()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="text-align: left;">test</p>');
+        Html::addHtml($section, '<p style="text-align: right;">test</p>');
+        Html::addHtml($section, '<p style="text-align: center;">test</p>');
+        Html::addHtml($section, '<p style="text-align: justify;">test</p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
+        $this->assertEquals('start', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('end', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('both', $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:jc', 'w:val'));
+    }
+
+    /**
+     * Test parsing paragraph and span styles
+     */
+    public function testParseParagraphAndSpanStyle()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="text-align: center;"><span style="text-decoration: underline;">test</span></p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
+        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test parsing table
+     */
+    public function testParseTable()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '
+            <table style="width: 50%; border: 6px #0000FF solid;">
+                <thead>
+                    <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
+                        <th>a</th>
+                        <th>b</th>
+                        <th>c</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr><td>1</td><td colspan="2">2</td></tr>
+                    <tr><td>4</td><td>5</td><td>6</td></tr>
+                </tbody>
+            </table>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+//         echo $doc->printXml();
+//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
+    }
 }
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index eb335278..c82c5a8e 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -170,12 +170,20 @@ class XmlDocument
      * @param string $file
      * @return string
      */
-    public function printXml($path = '/w:document', $file = 'word/document.xml')
+    public function printXml($path = '/', $file = 'word/document.xml')
     {
+        $element = $this->getElement($path, $file);
+        if ($element instanceof \DOMDocument) {
+            $element->formatOutput = true;
+            $element->preserveWhiteSpace = false;
+
+            return $element->saveXML();
+        }
+
         $newdoc = new \DOMDocument();
         $newdoc->formatOutput = true;
         $newdoc->preserveWhiteSpace = false;
-        $node = $newdoc->importNode($this->getElement($path, $file), true);
+        $node = $newdoc->importNode($element, true);
         $newdoc->appendChild($node);
 
         return $newdoc->saveXML($node);

From ba6c03e06d54da20091e589b0bad29ab8f5f0eda Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 9 Nov 2017 06:36:47 -0200
Subject: [PATCH 130/370] Use PHPUnit\Framework\TestCase instead of
 PHPUnit_Framework_TestCase

---
 composer.json                                                 | 2 +-
 tests/PhpWord/Collection/CollectionTest.php                   | 2 +-
 tests/PhpWord/ComplexType/FootnotePropertiesTest.php          | 2 +-
 tests/PhpWord/ComplexType/ProofStateTest.php                  | 2 +-
 tests/PhpWord/Element/AbstractElementTest.php                 | 2 +-
 tests/PhpWord/Element/BookmarkTest.php                        | 2 +-
 tests/PhpWord/Element/CellTest.php                            | 2 +-
 tests/PhpWord/Element/CheckBoxTest.php                        | 2 +-
 tests/PhpWord/Element/CommentTest.php                         | 2 +-
 tests/PhpWord/Element/FieldTest.php                           | 2 +-
 tests/PhpWord/Element/FooterTest.php                          | 2 +-
 tests/PhpWord/Element/FootnoteTest.php                        | 2 +-
 tests/PhpWord/Element/HeaderTest.php                          | 2 +-
 tests/PhpWord/Element/ImageTest.php                           | 2 +-
 tests/PhpWord/Element/LineTest.php                            | 2 +-
 tests/PhpWord/Element/LinkTest.php                            | 2 +-
 tests/PhpWord/Element/ListItemRunTest.php                     | 2 +-
 tests/PhpWord/Element/ListItemTest.php                        | 2 +-
 tests/PhpWord/Element/ObjectTest.php                          | 2 +-
 tests/PhpWord/Element/PageBreakTest.php                       | 2 +-
 tests/PhpWord/Element/PreserveTextTest.php                    | 2 +-
 tests/PhpWord/Element/RowTest.php                             | 2 +-
 tests/PhpWord/Element/SDTTest.php                             | 2 +-
 tests/PhpWord/Element/SectionTest.php                         | 2 +-
 tests/PhpWord/Element/TOCTest.php                             | 2 +-
 tests/PhpWord/Element/TableTest.php                           | 2 +-
 tests/PhpWord/Element/TextBoxTest.php                         | 2 +-
 tests/PhpWord/Element/TextBreakTest.php                       | 2 +-
 tests/PhpWord/Element/TextRunTest.php                         | 2 +-
 tests/PhpWord/Element/TextTest.php                            | 2 +-
 tests/PhpWord/Element/TitleTest.php                           | 2 +-
 tests/PhpWord/Exception/CopyFileExceptionTest.php             | 2 +-
 tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php  | 2 +-
 tests/PhpWord/Exception/ExceptionTest.php                     | 2 +-
 tests/PhpWord/Exception/InvalidImageExceptionTest.php         | 2 +-
 tests/PhpWord/Exception/InvalidStyleExceptionTest.php         | 2 +-
 tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php | 2 +-
 tests/PhpWord/IOFactoryTest.php                               | 2 +-
 tests/PhpWord/MediaTest.php                                   | 2 +-
 tests/PhpWord/Metadata/DocInfoTest.php                        | 2 +-
 tests/PhpWord/Metadata/SettingsTest.php                       | 2 +-
 tests/PhpWord/PhpWordTest.php                                 | 2 +-
 tests/PhpWord/Reader/HTMLTest.php                             | 2 +-
 tests/PhpWord/Reader/MsDocTest.php                            | 2 +-
 tests/PhpWord/Reader/ODTextTest.php                           | 2 +-
 tests/PhpWord/Reader/RTFTest.php                              | 2 +-
 tests/PhpWord/Reader/Word2007Test.php                         | 2 +-
 tests/PhpWord/SettingsTest.php                                | 2 +-
 tests/PhpWord/Shared/ConverterTest.php                        | 2 +-
 tests/PhpWord/Shared/HtmlTest.php                             | 2 +-
 tests/PhpWord/Shared/ZipArchiveTest.php                       | 2 +-
 tests/PhpWord/Style/AbstractStyleTest.php                     | 2 +-
 tests/PhpWord/Style/CellTest.php                              | 2 +-
 tests/PhpWord/Style/FontTest.php                              | 2 +-
 tests/PhpWord/Style/ImageTest.php                             | 2 +-
 tests/PhpWord/Style/IndentationTest.php                       | 2 +-
 tests/PhpWord/Style/LanguageTest.php                          | 2 +-
 tests/PhpWord/Style/LineNumberingTest.php                     | 2 +-
 tests/PhpWord/Style/LineTest.php                              | 2 +-
 tests/PhpWord/Style/ListItemTest.php                          | 2 +-
 tests/PhpWord/Style/NumberingLevelTest.php                    | 2 +-
 tests/PhpWord/Style/NumberingTest.php                         | 2 +-
 tests/PhpWord/Style/PaperTest.php                             | 2 +-
 tests/PhpWord/Style/ParagraphTest.php                         | 2 +-
 tests/PhpWord/Style/RowTest.php                               | 2 +-
 tests/PhpWord/Style/SectionTest.php                           | 2 +-
 tests/PhpWord/Style/ShadingTest.php                           | 2 +-
 tests/PhpWord/Style/SpacingTest.php                           | 2 +-
 tests/PhpWord/Style/TOCTest.php                               | 2 +-
 tests/PhpWord/Style/TabTest.php                               | 2 +-
 tests/PhpWord/Style/TableTest.php                             | 2 +-
 tests/PhpWord/Style/TextBoxTest.php                           | 2 +-
 tests/PhpWord/StyleTest.php                                   | 2 +-
 tests/PhpWord/TemplateProcessorTest.php                       | 2 +-
 tests/PhpWord/Writer/HTML/ElementTest.php                     | 2 +-
 tests/PhpWord/Writer/HTML/PartTest.php                        | 2 +-
 tests/PhpWord/Writer/HTML/StyleTest.php                       | 2 +-
 tests/PhpWord/Writer/HTMLTest.php                             | 2 +-
 tests/PhpWord/Writer/ODText/ElementTest.php                   | 2 +-
 tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php         | 2 +-
 tests/PhpWord/Writer/ODText/Part/ContentTest.php              | 2 +-
 tests/PhpWord/Writer/ODText/StyleTest.php                     | 2 +-
 tests/PhpWord/Writer/ODTextTest.php                           | 2 +-
 tests/PhpWord/Writer/PDF/DomPDFTest.php                       | 2 +-
 tests/PhpWord/Writer/PDF/MPDFTest.php                         | 2 +-
 tests/PhpWord/Writer/PDF/TCPDFTest.php                        | 2 +-
 tests/PhpWord/Writer/PDFTest.php                              | 2 +-
 tests/PhpWord/Writer/RTF/ElementTest.php                      | 2 +-
 tests/PhpWord/Writer/RTF/StyleTest.php                        | 2 +-
 tests/PhpWord/Writer/RTFTest.php                              | 2 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php                 | 2 +-
 tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php       | 2 +-
 tests/PhpWord/Writer/Word2007/Part/CommentsTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/DocumentTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/FooterTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php          | 2 +-
 tests/PhpWord/Writer/Word2007/Part/HeaderTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/Part/NumberingTest.php          | 2 +-
 tests/PhpWord/Writer/Word2007/Part/SettingsTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/StylesTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/PartTest.php                    | 2 +-
 tests/PhpWord/Writer/Word2007/Style/FontTest.php              | 2 +-
 tests/PhpWord/Writer/Word2007/StyleTest.php                   | 2 +-
 tests/PhpWord/Writer/Word2007Test.php                         | 2 +-
 104 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/composer.json b/composer.json
index 5b5a91d2..ee4f9bd5 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.*",
+        "phpunit/phpunit": "^4.8.36",
         "phpdocumentor/phpdocumentor":"2.*",
         "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "^2.7",
diff --git a/tests/PhpWord/Collection/CollectionTest.php b/tests/PhpWord/Collection/CollectionTest.php
index 22f89b72..a8757171 100644
--- a/tests/PhpWord/Collection/CollectionTest.php
+++ b/tests/PhpWord/Collection/CollectionTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Element\Footnote;
  *
  * Using concrete class Footnotes instead of AbstractCollection
  */
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test collection
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index 55e22e6f..b8df9bbe 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\NumberFormat;
  * @coversDefaultClass \PhpOffice\PhpWord\ComplexType\FootnoteProperties
  * @runTestsInSeparateProcesses
  */
-class FootnotePropertiesTest extends \PHPUnit_Framework_TestCase
+class FootnotePropertiesTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/ComplexType/ProofStateTest.php b/tests/PhpWord/ComplexType/ProofStateTest.php
index e807ca2f..baf2009e 100644
--- a/tests/PhpWord/ComplexType/ProofStateTest.php
+++ b/tests/PhpWord/ComplexType/ProofStateTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\ComplexType;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\ComplexType\ProofState
  */
-class ProofStateTest extends \PHPUnit_Framework_TestCase
+class ProofStateTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tests the getters and setters
diff --git a/tests/PhpWord/Element/AbstractElementTest.php b/tests/PhpWord/Element/AbstractElementTest.php
index 458b94c8..87bb5e18 100644
--- a/tests/PhpWord/Element/AbstractElementTest.php
+++ b/tests/PhpWord/Element/AbstractElementTest.php
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Element;
 /**
  * Test class for PhpOffice\PhpWord\Element\AbstractElement
  */
-class AbstractElementTest extends \PHPUnit_Framework_TestCase
+class AbstractElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test set/get element index
diff --git a/tests/PhpWord/Element/BookmarkTest.php b/tests/PhpWord/Element/BookmarkTest.php
index da86a62e..bd5d27ae 100644
--- a/tests/PhpWord/Element/BookmarkTest.php
+++ b/tests/PhpWord/Element/BookmarkTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class BookmarkTest extends \PHPUnit_Framework_TestCase
+class BookmarkTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index aff208c4..4e8daa0e 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class CellTest extends \PHPUnit_Framework_TestCase
+class CellTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index fb71b8c2..d5bda9bd 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Style\Font;
  *
  * @runTestsInSeparateProcesses
  */
-class CheckBoxTest extends \PHPUnit_Framework_TestCase
+class CheckBoxTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index fd2c814d..d33a54f6 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class CommentTest extends \PHPUnit_Framework_TestCase
+class CommentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index 1bd0c216..8baa68e4 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class FieldTest extends \PHPUnit_Framework_TestCase
+class FieldTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/FooterTest.php b/tests/PhpWord/Element/FooterTest.php
index 2938ae5e..b68e80cd 100644
--- a/tests/PhpWord/Element/FooterTest.php
+++ b/tests/PhpWord/Element/FooterTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class FooterTest extends \PHPUnit_Framework_TestCase
+class FooterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/FootnoteTest.php b/tests/PhpWord/Element/FootnoteTest.php
index b02ab5c6..fd4c8d03 100644
--- a/tests/PhpWord/Element/FootnoteTest.php
+++ b/tests/PhpWord/Element/FootnoteTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class FootnoteTest extends \PHPUnit_Framework_TestCase
+class FootnoteTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance without parameter
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index 13ace285..29b2fef5 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class HeaderTest extends \PHPUnit_Framework_TestCase
+class HeaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index b681b81f..00449e1f 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class ImageTest extends \PHPUnit_Framework_TestCase
+class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index a6e3f79b..4d414944 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Line
  * @runTestsInSeparateProcesses
  */
-class LineTest extends \PHPUnit_Framework_TestCase
+class LineTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index 48b576c3..63e8f1de 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Style\Font;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Link
  * @runTestsInSeparateProcesses
  */
-class LinkTest extends \PHPUnit_Framework_TestCase
+class LinkTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 0c4c1ac9..999756ba 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @runTestsInSeparateProcesses
  */
-class ListItemRunTest extends \PHPUnit_Framework_TestCase
+class ListItemRunTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index 775a97d4..5fae34d4 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\ListItem
  * @runTestsInSeparateProcesses
  */
-class ListItemTest extends \PHPUnit_Framework_TestCase
+class ListItemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Get text object
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index 51ed19b5..71f12974 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Object
  * @runTestsInSeparateProcesses
  */
-class ObjectTest extends \PHPUnit_Framework_TestCase
+class ObjectTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance with supported files, 4 character extention
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index 69a71204..3b081848 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\PageBreak
  * @runTestsInSeparateProcesses
  */
-class PageBreakTest extends \PHPUnit_Framework_TestCase
+class PageBreakTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Element/PreserveTextTest.php b/tests/PhpWord/Element/PreserveTextTest.php
index a47cc77c..c2767a4f 100644
--- a/tests/PhpWord/Element/PreserveTextTest.php
+++ b/tests/PhpWord/Element/PreserveTextTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class PreserveTextTest extends \PHPUnit_Framework_TestCase
+class PreserveTextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index cb365dad..9abf3776 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Row
  * @runTestsInSeparateProcesses
  */
-class RowTest extends \PHPUnit_Framework_TestCase
+class RowTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index 537841a6..41eae213 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Element;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Element\SDT
  */
-class SDTTest extends \PHPUnit_Framework_TestCase
+class SDTTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index aebfc9b7..8b6c9a43 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Section
  * @runTestsInSeparateProcesses
  */
-class SectionTest extends \PHPUnit_Framework_TestCase
+class SectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @covers ::setStyle
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index 655d567c..d826a1a1 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\PhpWord;
  *
  * @runTestsInSeparateProcesses
  */
-class TOCTest extends \PHPUnit_Framework_TestCase
+class TOCTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct with font and TOC style in array format
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 3085aee2..0bbefb24 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Table
  * @runTestsInSeparateProcesses
  */
-class TableTest extends \PHPUnit_Framework_TestCase
+class TableTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index cc61e20d..63b093c9 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\TextBox
  * @runTestsInSeparateProcesses
  */
-class TextBoxTest extends \PHPUnit_Framework_TestCase
+class TextBoxTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index 62186244..9b25bac3 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\Style\Paragraph;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\TextBreak
  * @runTestsInSeparateProcesses
  */
-class TextBreakTest extends \PHPUnit_Framework_TestCase
+class TextBreakTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct with empty value
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index 59db597c..27f5af6b 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\PhpWord;
  *
  * @runTestsInSeparateProcesses
  */
-class TextRunTest extends \PHPUnit_Framework_TestCase
+class TextRunTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index 9723a2e1..09027ad6 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Style\Font;
  *
  * @runTestsInSeparateProcesses
  */
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * New instance
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 500de133..3ea6242f 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Title
  * @runTestsInSeparateProcesses
  */
-class TitleTest extends \PHPUnit_Framework_TestCase
+class TitleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create new instance
diff --git a/tests/PhpWord/Exception/CopyFileExceptionTest.php b/tests/PhpWord/Exception/CopyFileExceptionTest.php
index 9d921740..fa9949ed 100644
--- a/tests/PhpWord/Exception/CopyFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CopyFileExceptionTest.php
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @covers \PhpOffice\PhpWord\Exception\CopyFileException
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\CopyFileException
  */
-class CopyFileExceptionTest extends \PHPUnit_Framework_TestCase
+class CopyFileExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * CopyFileException can be thrown.
diff --git a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
index 91c7012f..6b4d14bf 100644
--- a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
@@ -21,7 +21,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @covers \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\CreateTemporaryFileException
  */
-class CreateTemporaryFileExceptionTest extends \PHPUnit_Framework_TestCase
+class CreateTemporaryFileExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * CreateTemporaryFileException can be thrown.
diff --git a/tests/PhpWord/Exception/ExceptionTest.php b/tests/PhpWord/Exception/ExceptionTest.php
index 28b15702..255477f9 100644
--- a/tests/PhpWord/Exception/ExceptionTest.php
+++ b/tests/PhpWord/Exception/ExceptionTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\Exception
  * @runTestsInSeparateProcesses
  */
-class ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Throw new exception
diff --git a/tests/PhpWord/Exception/InvalidImageExceptionTest.php b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
index dfaadbd7..c0285dc1 100644
--- a/tests/PhpWord/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidImageException
  * @runTestsInSeparateProcesses
  */
-class InvalidImageExceptionTest extends \PHPUnit_Framework_TestCase
+class InvalidImageExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Throw new exception
diff --git a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
index 77ee8571..d516019f 100644
--- a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidStyleException
  * @runTestsInSeparateProcesses
  */
-class InvalidStyleExceptionTest extends \PHPUnit_Framework_TestCase
+class InvalidStyleExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Throw new exception
diff --git a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
index 50b4806d..559d6341 100644
--- a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Exception;
  * @coversDefaultClass \PhpOffice\PhpWord\Exception\UnsupportedImageTypeExceptionTest
  * @runTestsInSeparateProcesses
  */
-class UnsupportedImageTypeExceptionTest extends \PHPUnit_Framework_TestCase
+class UnsupportedImageTypeExceptionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Throw new exception
diff --git a/tests/PhpWord/IOFactoryTest.php b/tests/PhpWord/IOFactoryTest.php
index 6dbb006e..581b7d49 100644
--- a/tests/PhpWord/IOFactoryTest.php
+++ b/tests/PhpWord/IOFactoryTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord;
  *
  * @runTestsInSeparateProcesses
  */
-class IOFactoryTest extends \PHPUnit_Framework_TestCase
+class IOFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Create existing writer
diff --git a/tests/PhpWord/MediaTest.php b/tests/PhpWord/MediaTest.php
index d045abcd..ed56376b 100644
--- a/tests/PhpWord/MediaTest.php
+++ b/tests/PhpWord/MediaTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Element\Image;
  *
  * @runTestsInSeparateProcesses
  */
-class MediaTest extends \PHPUnit_Framework_TestCase
+class MediaTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Get section media elements
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index 5443f0b2..01659773 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Metadata;
  *
  * @runTestsInSeparateProcesses
  */
-class DocInfoTest extends \PHPUnit_Framework_TestCase
+class DocInfoTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Creator
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 6f493d04..bee8d0ca 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Zoom;
  *
  * @runTestsInSeparateProcesses
  */
-class SettingsTest extends \PHPUnit_Framework_TestCase
+class SettingsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * EvenAndOddHeaders
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index 01d7342e..f8a22459 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Metadata\DocInfo;
  *
  * @runTestsInSeparateProcesses
  */
-class PhpWordTest extends \PHPUnit_Framework_TestCase
+class PhpWordTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test object creation
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index 24751cac..c56fc1fc 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\IOFactory;
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\HTML
  * @runTestsInSeparateProcesses
  */
-class HTMLTest extends \PHPUnit_Framework_TestCase
+class HTMLTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test load
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index ed16e64b..12d50247 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\IOFactory;
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\MsDoc
  * @runTestsInSeparateProcesses
  */
-class MsDocTest extends \PHPUnit_Framework_TestCase
+class MsDocTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test canRead() method
diff --git a/tests/PhpWord/Reader/ODTextTest.php b/tests/PhpWord/Reader/ODTextTest.php
index d00657de..7041e13e 100644
--- a/tests/PhpWord/Reader/ODTextTest.php
+++ b/tests/PhpWord/Reader/ODTextTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\IOFactory;
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\ODText
  * @runTestsInSeparateProcesses
  */
-class ODTextTest extends \PHPUnit_Framework_TestCase
+class ODTextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Load
diff --git a/tests/PhpWord/Reader/RTFTest.php b/tests/PhpWord/Reader/RTFTest.php
index 58154ee3..ca1f6ed4 100644
--- a/tests/PhpWord/Reader/RTFTest.php
+++ b/tests/PhpWord/Reader/RTFTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\IOFactory;
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\RTF
  * @runTestsInSeparateProcesses
  */
-class RTFTest extends \PHPUnit_Framework_TestCase
+class RTFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test load
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 627bc66e..8b787247 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\IOFactory;
  * @coversDefaultClass \PhpOffice\PhpWord\Reader\Word2007
  * @runTestsInSeparateProcesses
  */
-class Word2007Test extends \PHPUnit_Framework_TestCase
+class Word2007Test extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test canRead() method
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index 6fd2f52b..d8752b2b 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord;
  * @coversDefaultClass \PhpOffice\PhpWord\Settings
  * @runTestsInSeparateProcesses
  */
-class SettingsTest extends \PHPUnit_Framework_TestCase
+class SettingsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test set/get compatibity option
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index a2031787..a71046aa 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Shared;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Shared\Converter
  */
-class ConverterTest extends \PHPUnit_Framework_TestCase
+class ConverterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test unit conversion functions with various numbers
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 602b644d..0ba7717f 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -22,7 +22,7 @@ use PhpOffice\PhpWord\Element\Section;
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html
  */
-class HtmlTest extends \PHPUnit_Framework_TestCase
+class HtmlTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test unit conversion functions with various numbers
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index 689f122b..91f0f030 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Settings;
  * @coversDefaultClass \PhpOffice\PhpWord\Shared\ZipArchive
  * @runTestsInSeparateProcesses
  */
-class ZipArchiveTest extends \PHPUnit_Framework_TestCase
+class ZipArchiveTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test close method exception: Working in local, not working in Travis
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index ab3ea14e..d4291c2a 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @runTestsInSeparateProcesses
  */
-class AbstractStyleTest extends \PHPUnit_Framework_TestCase
+class AbstractStyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test set style by array
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index 71b32a65..79b22ee1 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Cell
  * @runTestsInSeparateProcesses
  */
-class CellTest extends \PHPUnit_Framework_TestCase
+class CellTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index a227d7f9..91bba97f 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class FontTest extends \PHPUnit_Framework_TestCase
+class FontTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tear down after each test
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index decc13b1..5d9e5568 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Image
  * @runTestsInSeparateProcesses
  */
-class ImageTest extends \PHPUnit_Framework_TestCase
+class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index db079704..63a96628 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Indentation
  */
-class IndentationTest extends \PHPUnit_Framework_TestCase
+class IndentationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
index 35a01e07..74b2067a 100644
--- a/tests/PhpWord/Style/LanguageTest.php
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Language
  */
-class LanguageTest extends \PHPUnit_Framework_TestCase
+class LanguageTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index 56440529..9ec1e3b7 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\LineNumbering
  */
-class LineNumberingTest extends \PHPUnit_Framework_TestCase
+class LineNumberingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index 21489caf..ab77b328 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Image
  * @runTestsInSeparateProcesses
  */
-class LineTest extends \PHPUnit_Framework_TestCase
+class LineTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index a2e4eb74..a8155fa3 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\ListItem
  * @runTestsInSeparateProcesses
  */
-class ListItemTest extends \PHPUnit_Framework_TestCase
+class ListItemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test construct
diff --git a/tests/PhpWord/Style/NumberingLevelTest.php b/tests/PhpWord/Style/NumberingLevelTest.php
index 402d936b..9b512eb0 100644
--- a/tests/PhpWord/Style/NumberingLevelTest.php
+++ b/tests/PhpWord/Style/NumberingLevelTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class NumberingLevelTest extends \PHPUnit_Framework_TestCase
+class NumberingLevelTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index ad57ebff..0103c503 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Numbering
  */
-class NumberingTest extends \PHPUnit_Framework_TestCase
+class NumberingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index 7d12410c..687e23c6 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class PaperTest extends \PHPUnit_Framework_TestCase
+class PaperTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tear down after each test
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index e28f54c7..48acc600 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class ParagraphTest extends \PHPUnit_Framework_TestCase
+class ParagraphTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tear down after each test
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index db98d0a9..2daad7ea 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Row
  * @runTestsInSeparateProcesses
  */
-class RowTest extends \PHPUnit_Framework_TestCase
+class RowTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test properties with boolean value
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index 89c4640a..c9b7003f 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Style;
  * @coversDefaultClass \PhpOffice\PhpWord\Element\Section
  * @runTestsInSeparateProcesses
  */
-class SectionTest extends \PHPUnit_Framework_TestCase
+class SectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index fd0aaf5e..ab991a57 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Shading
  */
-class ShadingTest extends \PHPUnit_Framework_TestCase
+class ShadingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index f147ae61..2c26f68b 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Spacing
  */
-class SpacingTest extends \PHPUnit_Framework_TestCase
+class SpacingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index ec01acd9..5981b00c 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\TOC
  */
-class TOCTest extends \PHPUnit_Framework_TestCase
+class TOCTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index 8102369d..c11f0558 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord\Style;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Tab
  */
-class TabTest extends \PHPUnit_Framework_TestCase
+class TabTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get/set
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index ee020dd9..ff813927 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\SimpleType\JcTable;
  *
  * @runTestsInSeparateProcesses
  */
-class TableTest extends \PHPUnit_Framework_TestCase
+class TableTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test class construction
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index a91b5b28..5a6bc76f 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  * @coversDefaultClass \PhpOffice\PhpWord\Style\Image
  * @runTestsInSeparateProcesses
  */
-class TextBoxTest extends \PHPUnit_Framework_TestCase
+class TextBoxTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test setting style with normal value
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index aa46c6b1..6f2f0980 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  * @coversDefaultClass \PhpOffice\PhpWord\Style
  * @runTestsInSeparateProcesses
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Add and get paragraph, font, link, title, and table styles
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 4bf69f5a..7b064ef7 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -22,7 +22,7 @@ namespace PhpOffice\PhpWord;
  * @coversDefaultClass \PhpOffice\PhpWord\TemplateProcessor
  * @runTestsInSeparateProcesses
  */
-final class TemplateProcessorTest extends \PHPUnit_Framework_TestCase
+final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Template can be saved in temporary location.
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 0778650e..86856d5c 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Writer\HTML\Element\Text;
 /**
  * Test class for PhpOffice\PhpWord\Writer\HTML\Element subnamespace
  */
-class ElementTest extends \PHPUnit_Framework_TestCase
+class ElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test unmatched elements
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index a4a6264e..3d56f983 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -22,7 +22,7 @@ use PhpOffice\PhpWord\Writer\HTML\Part\Body;
 /**
  * Test class for PhpOffice\PhpWord\Writer\HTML\Part subnamespace
  */
-class PartTest extends \PHPUnit_Framework_TestCase
+class PartTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test get parent writer exception
diff --git a/tests/PhpWord/Writer/HTML/StyleTest.php b/tests/PhpWord/Writer/HTML/StyleTest.php
index 7548ff02..e9117de9 100644
--- a/tests/PhpWord/Writer/HTML/StyleTest.php
+++ b/tests/PhpWord/Writer/HTML/StyleTest.php
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Writer\HTML;
 /**
  * Test class for PhpOffice\PhpWord\Writer\HTML\Style subnamespace
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test empty styles
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index 69cd5a97..4d75ea5a 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class HTMLTest extends \PHPUnit_Framework_TestCase
+class HTMLTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index ef4e68b0..253c8e11 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -22,7 +22,7 @@ use PhpOffice\Common\XMLWriter;
 /**
  * Test class for PhpOffice\PhpWord\Writer\ODText\Element subnamespace
  */
-class ElementTest extends \PHPUnit_Framework_TestCase
+class ElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test unmatched elements
diff --git a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
index 5ca980f2..f91e6dd2 100644
--- a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Writer\ODText;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\ODText\Part\AbstractPart
  * @runTestsInSeparateProcesses
  */
-class AbstractPartTest extends \PHPUnit_Framework_TestCase
+class AbstractPartTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * covers   ::setParentWriter
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index 048c5242..28542379 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -27,7 +27,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\ODText\Part\Content
  * @runTestsInSeparateProcesses
  */
-class ContentTest extends \PHPUnit_Framework_TestCase
+class ContentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index 1a0c3ccd..5bd862f9 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -22,7 +22,7 @@ use PhpOffice\Common\XMLWriter;
 /**
  * Test class for PhpOffice\PhpWord\Writer\ODText\Style subnamespace
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test empty styles
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index d35a4ec7..bb1b9538 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class ODTextTest extends \PHPUnit_Framework_TestCase
+class ODTextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index 7831f472..61c3d296 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\Writer\PDF;
  *
  * @runTestsInSeparateProcesses
  */
-class DomPDFTest extends \PHPUnit_Framework_TestCase
+class DomPDFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test construct
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index 62411b97..0e6cf308 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\Writer\PDF;
  *
  * @runTestsInSeparateProcesses
  */
-class MPDFTest extends \PHPUnit_Framework_TestCase
+class MPDFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test construct
diff --git a/tests/PhpWord/Writer/PDF/TCPDFTest.php b/tests/PhpWord/Writer/PDF/TCPDFTest.php
index d5bd534b..e697eee1 100644
--- a/tests/PhpWord/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/TCPDFTest.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\Writer\PDF;
  *
  * @runTestsInSeparateProcesses
  */
-class TCPDFTest extends \PHPUnit_Framework_TestCase
+class TCPDFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test construct
diff --git a/tests/PhpWord/Writer/PDFTest.php b/tests/PhpWord/Writer/PDFTest.php
index f1a908a9..a7ca9f68 100644
--- a/tests/PhpWord/Writer/PDFTest.php
+++ b/tests/PhpWord/Writer/PDFTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Settings;
  *
  * @runTestsInSeparateProcesses
  */
-class PDFTest extends \PHPUnit_Framework_TestCase
+class PDFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test normal construct
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index 17a9c22f..e85d2091 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -22,7 +22,7 @@ use PhpOffice\PhpWord\Writer\RTF;
 /**
  * Test class for PhpOffice\PhpWord\Writer\RTF\Element subnamespace
  */
-class ElementTest extends \PHPUnit_Framework_TestCase
+class ElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test unmatched elements
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index 4e3a0eed..b9dc7b45 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -20,7 +20,7 @@ namespace PhpOffice\PhpWord\Writer\RTF;
 /**
  * Test class for PhpOffice\PhpWord\Writer\RTF\Style subnamespace
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test empty styles
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index ec83f7b1..f4442043 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  *
  * @runTestsInSeparateProcesses
  */
-class RTFTest extends \PHPUnit_Framework_TestCase
+class RTFTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Construct
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index dc3d30bd..85a9bb38 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Element subnamespace
  */
-class ElementTest extends \PHPUnit_Framework_TestCase
+class ElementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index 47f65861..7796c02c 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Writer\Word2007;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\AbstractWriterPart
  * @runTestsInSeparateProcesses
  */
-class AbstractPartTest extends \PHPUnit_Framework_TestCase
+class AbstractPartTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * covers   ::setParentWriter
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
index 4a4fd308..83af284f 100644
--- a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class CommentsTest extends \PHPUnit_Framework_TestCase
+class CommentsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index d194814c..9bad19fe 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -29,7 +29,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class DocumentTest extends \PHPUnit_Framework_TestCase
+class DocumentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 98fb003e..82bb7b7d 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\Writer\Word2007;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Footer
  * @runTestsInSeparateProcesses
  */
-class FooterTest extends \PHPUnit_Framework_TestCase
+class FooterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Write footer
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index e557d9c2..3d11174a 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  * @coversNothing
  * @runTestsInSeparateProcesses
  */
-class FootnotesTest extends \PHPUnit_Framework_TestCase
+class FootnotesTest extends \PHPUnit\Framework\TestCase
 {
     public function tearDown()
     {
diff --git a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
index 7830469c..afa81cf9 100644
--- a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Writer\Word2007;
  *
  * @runTestsInSeparateProcesses
  */
-class HeaderTest extends \PHPUnit_Framework_TestCase
+class HeaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Write header
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index 0f1ae523..62127e29 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -29,7 +29,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  * @runTestsInSeparateProcesses
  * @since 0.10.0
  */
-class NumberingTest extends \PHPUnit_Framework_TestCase
+class NumberingTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 5b812a0f..6af86696 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -30,7 +30,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Settings
  */
-class SettingsTest extends \PHPUnit_Framework_TestCase
+class SettingsTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index cba0bfb3..0cdb444e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -29,7 +29,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Styles
  * @runTestsInSeparateProcesses
  */
-class StylesTest extends \PHPUnit_Framework_TestCase
+class StylesTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index 3261db4f..160bf553 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -24,7 +24,7 @@ use PhpOffice\PhpWord\Writer\Word2007\Part\RelsPart;
  *
  * Covers miscellaneous tests
  */
-class PartTest extends \PHPUnit_Framework_TestCase
+class PartTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test exception when no type or target assigned to a relation
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index f406bc05..78b2c320 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -25,7 +25,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Font
  * @runTestsInSeparateProcesses
  */
-class FontTest extends \PHPUnit_Framework_TestCase
+class FontTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Executed before each method of the class
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index 05785b0c..f48597d2 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -22,7 +22,7 @@ use PhpOffice\Common\XMLWriter;
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Style subnamespace
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * Test empty styles
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 88a522a9..3e1edb39 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -26,7 +26,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
  *
  * @runTestsInSeparateProcesses
  */
-class Word2007Test extends \PHPUnit_Framework_TestCase
+class Word2007Test extends \PHPUnit\Framework\TestCase
 {
     /**
      * Tear down after each test

From 6328b833881c3d4908bb3fdfd2b95c740b25e2dc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 9 Nov 2017 23:07:17 +0100
Subject: [PATCH 131/370] fix warning

---
 tests/PhpWord/Shared/HtmlTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index b1a9e31c..c35cc6d5 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -173,6 +173,7 @@ class HtmlTest extends \PHPUnit_Framework_TestCase
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
 //         echo $doc->printXml();
-//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p'));
+//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:tbl/w:tr/w:tc'));
     }
 }

From e4fe0c66731a0bff17e95d6278db6ddf90e53fff Mon Sep 17 00:00:00 2001
From: ejuhjav <ejuhjav@luukku.com>
Date: Wed, 20 May 2015 13:17:11 +0200
Subject: [PATCH 132/370] Update elements.rst

Fixed a typo in the $lineStyle example (defined previously as $linestyle but used as $lineStyle)
---
 docs/elements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index 124f4431..e27b45d9 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -414,7 +414,7 @@ Line elements can be added to sections by using ``addLine``.
 
 .. code-block:: php
 
-    $linestyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
+    $lineStyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
     $section->addLine($lineStyle)
 
 Available line style attributes:

From 379df3cebd4ace1400a5bfa9a89474da67083a91 Mon Sep 17 00:00:00 2001
From: Nilton <niltoncastillo@pimarox.nl>
Date: Sat, 21 Oct 2017 00:07:52 +0200
Subject: [PATCH 133/370] Bring back b, i, <span style="font-style: italic;">
 and <span style="font-weight: bold;">

---
 src/PhpWord/Shared/Html.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 670ba6e5..369b57fe 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -117,9 +117,12 @@ class Html
             'h6'        => array('Heading',     null,   $element,   $styles,    null,   'Heading6',     null),
             '#text'     => array('Text',        $node,  $element,   $styles,    null,   null,           null),
             'strong'    => array('Property',    null,   null,       $styles,    null,   'bold',         true),
+            'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
             'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
+            'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
+            'span'      => array('Property',    null,   null,       $styles,    null,   'span',        $node),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
             'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
             'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
@@ -246,7 +249,16 @@ class Html
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
-        $styles['font'][$argument1] = $argument2;
+        if ($argument1 !== 'span') {
+            $styles['font'][$argument1] = $argument2;
+        } else {
+            if (!is_null($argument2->attributes)) {
+                $nodeAttr = $argument2->attributes->getNamedItem('style');
+                if (!is_null($nodeAttr) && property_exists($nodeAttr, 'value')) {
+                    $styles['font'] = self::parseStyle($nodeAttr, $styles['font']);
+                }
+            }
+        }
 
         return null;
     }
@@ -362,6 +374,20 @@ class Html
                 case 'background-color':
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
+                case 'font-weight':
+                    $tValue = false;
+                    if (preg_match('#bold#', $cValue)) {
+                        $tValue = true; // also match bolder
+                    }
+                    $styles['bold'] = $tValue;
+                    break;
+                case 'font-style':
+                    $tValue = false;
+                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
+                        $tValue = true;
+                    }
+                    $styles['italic'] = $tValue;
+                    break;
             }
         }
 

From 07c9d9fd005b0746580f8fc153e4b93fdaf5b0dc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 9 Nov 2017 00:41:56 +0100
Subject: [PATCH 134/370] Add unit tests for Html parser

---
 src/PhpWord/Shared/Html.php             |  41 ++++-----
 tests/PhpWord/Reader/MsDocTest.php      |  20 +++++
 tests/PhpWord/Shared/HtmlTest.php       | 110 +++++++++++++++++++++++-
 tests/PhpWord/_includes/XmlDocument.php |  12 ++-
 4 files changed, 156 insertions(+), 27 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 369b57fe..876d0a3a 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
+use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
  * Common Html functions
@@ -120,9 +121,10 @@ class Html
             'b'         => array('Property',    null,   null,       $styles,    null,   'bold',         true),
             'em'        => array('Property',    null,   null,       $styles,    null,   'italic',       true),
             'i'         => array('Property',    null,   null,       $styles,    null,   'italic',       true),
+            'u'         => array('Property',    null,   null,       $styles,    null,   'underline',    'single'),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
-            'span'      => array('Property',    null,   null,       $styles,    null,   'span',        $node),
+            'span'      => array('Property',    null,   null,       $styles,    null,   'span',         $node),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
             'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
             'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
@@ -236,8 +238,6 @@ class Html
         // if (method_exists($element, 'addText')) {
         $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
         // }
-
-        return null;
     }
 
     /**
@@ -259,8 +259,6 @@ class Html
                 }
             }
         }
-
-        return null;
     }
 
     /**
@@ -310,8 +308,6 @@ class Html
             $data['listdepth'] = 0;
         }
         $styles['list']['listType'] = $argument1;
-
-        return null;
     }
 
     /**
@@ -337,8 +333,6 @@ class Html
             }
             $element->addListItem($text, $data['listdepth'], $styles['font'], $styles['list'], $styles['paragraph']);
         }
-
-        return null;
     }
 
     /**
@@ -366,7 +360,20 @@ class Html
                     }
                     break;
                 case 'text-align':
-                    $styles['alignment'] = $cValue; // todo: any mapping?
+                    switch ($cValue) {
+                        case 'left':
+                            $styles['alignment'] = Jc::START;
+                            break;
+                        case 'right':
+                            $styles['alignment'] = Jc::END;
+                            break;
+                        case 'center':
+                            $styles['alignment'] = Jc::CENTER;
+                            break;
+                        case 'justify':
+                            $styles['alignment'] = Jc::BOTH;
+                            break;
+                    }
                     break;
                 case 'color':
                     $styles['color'] = trim($cValue, '#');
@@ -374,20 +381,6 @@ class Html
                 case 'background-color':
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
-                case 'font-weight':
-                    $tValue = false;
-                    if (preg_match('#bold#', $cValue)) {
-                        $tValue = true; // also match bolder
-                    }
-                    $styles['bold'] = $tValue;
-                    break;
-                case 'font-style':
-                    $tValue = false;
-                    if (preg_match('#(?:italic|oblique)#', $cValue)) {
-                        $tValue = true;
-                    }
-                    $styles['italic'] = $tValue;
-                    break;
             }
         }
 
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index 12d50247..e407547d 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -56,4 +56,24 @@ class MsDocTest extends \PHPUnit\Framework\TestCase
         $phpWord = IOFactory::load($filename, 'MsDoc');
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
     }
+
+    /**
+     * Test exception on not existing file
+     * @expectedException \Exception
+     */
+    public function testFailIfFileNotReadable()
+    {
+        $filename = __DIR__ . '/../_files/documents/not_existing_reader.doc';
+        IOFactory::load($filename, 'MsDoc');
+    }
+
+    /**
+     * Test exception on non OLE document
+     * @expectedException \Exception
+     */
+    public function testFailIfFileNotOle()
+    {
+        $filename = __DIR__ . '/../_files/documents/reader.odt';
+        IOFactory::load($filename, 'MsDoc');
+    }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 0ba7717f..b89adec9 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -18,9 +18,12 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\Section;
+use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html
+ * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
  */
 class HtmlTest extends \PHPUnit\Framework\TestCase
 {
@@ -43,7 +46,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         // Styles
         $content .= '<p style="text-decoration: underline; text-decoration: line-through; '
-                  . 'text-align: center; color: #999; background-color: #000;">';
+                  . 'text-align: center; color: #999; background-color: #000; font-weight: bold; font-style: italic;">';
         foreach ($styles as $style) {
             $content .= "<{$style}>{$style}</{$style}>";
         }
@@ -67,4 +70,109 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $content .= '&ndash;&nbsp;&emsp;&ensp;&sup2;&sup3;&frac14;&frac12;&frac34;';
         Html::addHtml($section, $content);
     }
+
+    /**
+     * Test that html already in body element can be read
+     * @ignore
+     */
+    public function testParseFullHtml()
+    {
+        $section = new Section(1);
+        Html::addHtml($section, '<body><p>test paragraph1</p><p>test paragraph2</p></body>', true);
+
+        $this->assertCount(2, $section->getElements());
+    }
+
+    /**
+     * Test underline
+     */
+    public function testParseUnderline()
+    {
+        $html = '<u>test</u>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test text-decoration style
+     */
+    public function testParseTextDecoration()
+    {
+        $html = '<span style="text-decoration: underline;">test</span>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test text-align style
+     */
+    public function testParseTextAlign()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="text-align: left;">test</p>');
+        Html::addHtml($section, '<p style="text-align: right;">test</p>');
+        Html::addHtml($section, '<p style="text-align: center;">test</p>');
+        Html::addHtml($section, '<p style="text-align: justify;">test</p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
+        $this->assertEquals('start', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('end', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('both', $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:jc', 'w:val'));
+    }
+
+    /**
+     * Test parsing paragraph and span styles
+     */
+    public function testParseParagraphAndSpanStyle()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="text-align: center;"><span style="text-decoration: underline;">test</span></p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
+        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:u', 'w:val'));
+    }
+
+    /**
+     * Test parsing table
+     */
+    public function testParseTable()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '
+            <table style="width: 50%; border: 6px #0000FF solid;">
+                <thead>
+                    <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
+                        <th>a</th>
+                        <th>b</th>
+                        <th>c</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr><td>1</td><td colspan="2">2</td></tr>
+                    <tr><td>4</td><td>5</td><td>6</td></tr>
+                </tbody>
+            </table>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+//         echo $doc->printXml();
+//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
+    }
 }
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index eb335278..c82c5a8e 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -170,12 +170,20 @@ class XmlDocument
      * @param string $file
      * @return string
      */
-    public function printXml($path = '/w:document', $file = 'word/document.xml')
+    public function printXml($path = '/', $file = 'word/document.xml')
     {
+        $element = $this->getElement($path, $file);
+        if ($element instanceof \DOMDocument) {
+            $element->formatOutput = true;
+            $element->preserveWhiteSpace = false;
+
+            return $element->saveXML();
+        }
+
         $newdoc = new \DOMDocument();
         $newdoc->formatOutput = true;
         $newdoc->preserveWhiteSpace = false;
-        $node = $newdoc->importNode($this->getElement($path, $file), true);
+        $node = $newdoc->importNode($element, true);
         $newdoc->appendChild($node);
 
         return $newdoc->saveXML($node);

From 8bb9a999751671ee715b35b3efa110691fb0ff34 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 9 Nov 2017 23:07:17 +0100
Subject: [PATCH 135/370] fix warning

---
 tests/PhpWord/Shared/HtmlTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index b89adec9..8ec6840f 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -173,6 +173,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
 //         echo $doc->printXml();
-//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p'));
+//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:tbl/w:tr/w:tc'));
     }
 }

From ff8234bce46c01b8e9ecf4910e1b6c70bcfbdebc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 10 Nov 2017 23:37:02 +0100
Subject: [PATCH 136/370] add tests

---
 src/PhpWord/Element/AbstractContainer.php     |  2 +-
 .../Writer/ODText/Part/ContentTest.php        |  1 +
 tests/PhpWord/Writer/Word2007/ElementTest.php | 62 +++++++++++++++++++
 .../Writer/Word2007/Style/FontTest.php        | 15 +++++
 .../Writer/Word2007/Style/ParagraphTest.php   | 52 ++++++++++++++++
 5 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index d7171798..cb42cf3d 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -23,7 +23,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method Text addText(string $text, mixed $fStyle = null, mixed $pStyle = null)
  * @method TextRun addTextRun(mixed $pStyle = null)
  * @method Bookmark addBookmark(string $name)
- * @method Link addLink(string $target, string $text = null, mixed $fStyle = null, mixed $pStyle = null)
+ * @method Link addLink(string $target, string $text = null, mixed $fStyle = null, mixed $pStyle = null, boolean $internal = false)
  * @method PreserveText addPreserveText(string $text, mixed $fStyle = null, mixed $pStyle = null)
  * @method void addTextBreak(int $count = 1, mixed $fStyle = null, mixed $pStyle = null)
  * @method ListItem addListItem(string $txt, int $depth = 0, mixed $font = null, mixed $list = null, mixed $para = null)
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index 28542379..d5681143 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -83,6 +83,7 @@ class ContentTest extends \PHPUnit\Framework\TestCase
         $cell->addObject($objectSrc);
         $textrun = $cell->addTextRun();
         $textrun->addText('Test text run');
+        $section->addPageBreak();
 
         $footer = $section->addFooter();
         $footer->addPreserveText('{PAGE}');
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 85a9bb38..a81a617b 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -71,6 +71,68 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($element));
     }
 
+    /**
+     * Test bookmark element
+     */
+    public function testBookmark()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        
+        $section->addBookmark('test_bookmark');
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:bookmarkStart';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('test_bookmark', $doc->getElementAttribute($element, 'w:name'));
+
+        $element = '/w:document/w:body/w:bookmarkEnd';
+        $this->assertTrue($doc->elementExists($element));
+    }
+
+    /**
+     * Test link element
+     */
+    public function testLinkElement()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $section->addLink('https://github.com/PHPOffice/PHPWord');
+        $section->addLink('internal_link', null, null, null, true);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p[1]/w:hyperlink/w:r/w:t';
+        $this->assertTrue($doc->elementExists($element));
+
+        $element = '/w:document/w:body/w:p[2]/w:hyperlink/w:r/w:t';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals('internal_link', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:hyperlink', 'w:anchor'));
+    }
+
+    /**
+     * Basic test for table element
+     */
+    public function testTableElements()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $table = $section->addTable(array('alignment' => \PhpOffice\PhpWord\SimpleType\JcTable::CENTER));
+        $table->addRow(900);
+        $table->addCell(2000)->addText('Row 1');
+        $table->addCell(2000)->addText('Row 2');
+        $table->addCell(2000)->addText('Row 3');
+        $table->addCell(2000)->addText('Row 4');
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $tableRootElement = '/w:document/w:body/w:tbl';
+        $this->assertTrue($doc->elementExists($tableRootElement . '/w:tblGrid/w:gridCol'));
+        $this->assertTrue($doc->elementExists($tableRootElement . '/w:tblPr/w:jc'));
+        $this->assertEquals('center', $doc->getElementAttribute($tableRootElement . '/w:tblPr/w:jc', 'w:val'));
+    }
+
     /**
      * Test shape elements
      */
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index 78b2c320..d36a3037 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -50,4 +50,19 @@ class FontTest extends \PHPUnit\Framework\TestCase
         $path = '/w:document/w:body/w:p/w:r/w:rPr/w:rtl';
         $this->assertTrue($doc->elementExists($path, $file));
     }
+
+    /**
+     * Test writing font with language
+     */
+    public function testFontWithLang()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $section->addText('Ce texte-ci est en français.', array('lang' => \PhpOffice\PhpWord\Style\Language::FR_BE));
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $file = 'word/document.xml';
+        $path = '/w:document/w:body/w:p/w:r/w:rPr/w:lang';
+        $this->assertTrue($doc->elementExists($path, $file));
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
new file mode 100644
index 00000000..9bc2756b
--- /dev/null
+++ b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Style;
+
+use PhpOffice\PhpWord\TestHelperDOCX;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph
+ * @runTestsInSeparateProcesses
+ */
+class ParagraphTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Executed before each method of the class
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Test write styles
+     */
+    public function testParagraphNumbering()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $phpWord->addParagraphStyle('testStyle', array('indent' => '10'));
+        $section = $phpWord->addSection();
+        $section->addText('test', null, array('numStyle' => 'testStyle', 'numLevel' => '1'));
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:p/w:pPr/w:numPr/w:ilvl';
+        $this->assertTrue($doc->elementExists($path));
+    }
+}

From e72446442bd213b2c26bcc5d36fda588c54291c4 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 10 Nov 2017 23:47:10 +0100
Subject: [PATCH 137/370] fix format

---
 tests/PhpWord/Writer/Word2007/ElementTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index a81a617b..b31b223a 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -78,7 +78,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
-        
+
         $section->addBookmark('test_bookmark');
         $doc = TestHelperDOCX::getDocument($phpWord);
 

From a01d22ed67b4ac43ff99ea932a1ed9bc4c63c5e8 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 11 Nov 2017 23:49:23 +0100
Subject: [PATCH 138/370] improve HTML parser and add tests

---
 src/PhpWord/Element/Image.php                 |  2 +-
 src/PhpWord/Shared/Converter.php              | 42 ++++++++++++++++++
 src/PhpWord/Shared/Html.php                   | 15 ++++---
 src/PhpWord/Shared/OLERead.php                |  8 +++-
 src/PhpWord/Writer/HTML/Style/Paragraph.php   |  7 +--
 .../Word2007/Element/AbstractElement.php      | 12 +++---
 src/PhpWord/Writer/Word2007/Part/Comments.php |  6 ++-
 src/PhpWord/Writer/Word2007/Style/Font.php    |  1 +
 tests/PhpWord/Element/ImageTest.php           |  3 ++
 tests/PhpWord/Shared/ConverterTest.php        | 17 ++++++++
 tests/PhpWord/Shared/HtmlTest.php             | 42 +++++++++++++++---
 tests/PhpWord/Writer/HTMLTest.php             | 16 ++++++-
 tests/PhpWord/Writer/PDF/MPDFTest.php         |  1 +
 tests/PhpWord/Writer/Word2007/ElementTest.php | 43 +++++++++++++++++++
 14 files changed, 187 insertions(+), 28 deletions(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index c9620b6b..a5bd7283 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -449,7 +449,7 @@ class Image extends AbstractElement
 
         $tempFilename = tempnam(Settings::getTempDir(), 'PHPWordImage');
         if (false === $tempFilename) {
-            throw new CreateTemporaryFileException();
+            throw new CreateTemporaryFileException(); // @codeCoverageIgnore
         }
 
         $zip = new ZipArchive();
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index 6ba2b567..43c2f299 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -26,6 +26,7 @@ class Converter
     const INCH_TO_TWIP = 1440;
     const INCH_TO_PIXEL = 96;
     const INCH_TO_POINT = 72;
+    const INCH_TO_PICA = 6;
     const PIXEL_TO_EMU = 9525;
     const DEGREE_TO_ANGLE = 60000;
 
@@ -227,6 +228,17 @@ class Converter
         return round($emu / self::PIXEL_TO_EMU);
     }
 
+    /**
+     * Convert pica to point
+     *
+     * @param int $pica
+     * @return float
+     */
+    public static function picaToPoint($pica = 1)
+    {
+        return $pica / self::INCH_TO_PICA * self::INCH_TO_POINT;
+    }
+
     /**
      * Convert degree to angle
      *
@@ -275,4 +287,34 @@ class Converter
 
         return array($red, $green, $blue);
     }
+
+    /**
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to points
+     *
+     * @param string $value
+     * @return float
+     */
+    public static function cssToPoint($value)
+    {
+        preg_match('/^[+-]?([0-9]+.?[0-9]+)?(px|em|ex|%|in|cm|mm|pt|pc)$/i', $value, $matches);
+        $size = $matches[1];
+        $unit = $matches[2];
+
+        switch ($unit) {
+            case 'pt':
+                return $size;
+            case 'px':
+                return self::pixelToPoint($size);
+            case 'cm':
+                return self::cmToPoint($size);
+            case 'mm':
+                return self::cmToPoint($size / 10);
+            case 'in':
+                return self::inchToPoint($size);
+            case 'pc':
+                return self::picaToPoint($size);
+            default:
+                return null;
+        }
+    }
 }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 620839b4..c4292eb4 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -233,11 +233,9 @@ class Html
     {
         $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
-        // Commented as source of bug #257. `method_exists` doesn't seems to work properly in this case.
-        // @todo Find better error checking for this one
-        // if (method_exists($element, 'addText')) {
-        $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
-        // }
+        if (is_callable(array($element, 'addText'))) {
+            $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
+        }
     }
 
     /**
@@ -375,6 +373,13 @@ class Html
                             break;
                     }
                     break;
+                case 'font-size':
+                    $styles['size'] = Converter::cssToPoint($cValue);
+                    break;
+                case 'font-family':
+                    $cValue = array_map('trim', explode(',', $cValue));
+                    $styles['name'] = ucwords($cValue[0]);
+                    break;
                 case 'color':
                     $styles['color'] = trim($cValue, '#');
                     break;
diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index e4efd7da..1321b8da 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -110,15 +110,18 @@ class OLERead
 
         $bbdBlocks = $this->numBigBlockDepotBlocks;
 
+        // @codeCoverageIgnoreStart
         if ($this->numExtensionBlocks != 0) {
             $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
         }
-
+        // @codeCoverageIgnoreEnd
+        
         for ($i = 0; $i < $bbdBlocks; ++$i) {
             $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
             $pos += 4;
         }
 
+        // @codeCoverageIgnoreStart
         for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
             $pos = ($this->extensionBlock + 1) * self::BIG_BLOCK_SIZE;
             $blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, self::BIG_BLOCK_SIZE / 4 - 1);
@@ -133,6 +136,7 @@ class OLERead
                 $this->extensionBlock = self::getInt4d($this->data, $pos);
             }
         }
+        // @codeCoverageIgnoreEnd
 
         $pos = 0;
         $this->bigBlockChain = '';
@@ -196,7 +200,7 @@ class OLERead
             }
 
             if ($numBlocks == 0) {
-                return '';
+                return '';// @codeCoverageIgnore
             }
 
             $block = $this->props[$stream]['startBlock'];
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index af551dc5..57e44e85 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -44,11 +44,6 @@ class Paragraph extends AbstractStyle
             $textAlign = '';
 
             switch ($style->getAlignment()) {
-                case Jc::START:
-                case Jc::NUM_TAB:
-                case Jc::LEFT:
-                    $textAlign = 'left';
-                    break;
                 case Jc::CENTER:
                     $textAlign = 'center';
                     break;
@@ -65,7 +60,7 @@ class Paragraph extends AbstractStyle
                 case Jc::JUSTIFY:
                     $textAlign = 'justify';
                     break;
-                default:
+                default: //all others, align left
                     $textAlign = 'left';
                     break;
             }
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 07ffc286..86018fd2 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -139,10 +139,10 @@ abstract class AbstractElement
     {
         if ($this->element->getCommentRangeEnd() != null) {
             $comment = $this->element->getCommentRangeEnd();
-            //only set the ID if it is not yet set, otherwise it will overwrite it
+            //only set the ID if it is not yet set, otherwise it will overwrite it, this should normally not happen
             if ($comment->getElementId() == null) {
-                $comment->setElementId();
-            }
+                $comment->setElementId(); // @codeCoverageIgnore
+            } // @codeCoverageIgnore
 
             $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
             $this->xmlWriter->startElement('w:r');
@@ -150,10 +150,10 @@ abstract class AbstractElement
             $this->xmlWriter->endElement();
         } elseif ($this->element->getCommentRangeStart() != null && $this->element->getCommentRangeStart()->getEndElement() == null) {
             $comment = $this->element->getCommentRangeStart();
-            //only set the ID if it is not yet set, otherwise it will overwrite it
+            //only set the ID if it is not yet set, otherwise it will overwrite it, this should normally not happen
             if ($comment->getElementId() == null) {
-                $comment->setElementId();
-            }
+                $comment->setElementId(); // @codeCoverageIgnore
+            } // @codeCoverageIgnore
 
             $this->xmlWriter->writeElementBlock('w:commentRangeEnd', array('w:id' => $comment->getElementId()));
             $this->xmlWriter->startElement('w:r');
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index b2b49864..4551ca92 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -78,8 +78,10 @@ class Comments extends AbstractPart
         $xmlWriter->startElement('w:comment');
         $xmlWriter->writeAttribute('w:id', $comment->getElementId());
         $xmlWriter->writeAttribute('w:author', $comment->getAuthor());
-        $xmlWriter->writeAttribute('w:date', $comment->getDate()->format($this->dateFormat));
-        $xmlWriter->writeAttribute('w:initials', $comment->getInitials());
+        if ($comment->getDate() != null) {
+            $xmlWriter->writeAttribute('w:date', $comment->getDate()->format($this->dateFormat));
+        }
+        $xmlWriter->writeAttributeIf($comment->getInitials() != null, 'w:initials', $comment->getInitials());
 
         $containerWriter = new Container($xmlWriter, $comment);
         $containerWriter->write();
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 0cb3209f..3fbff63d 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -59,6 +59,7 @@ class Font extends AbstractStyle
         if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
             return;
         }
+
         $xmlWriter = $this->getXmlWriter();
 
         $xmlWriter->startElement('w:rPr');
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 00449e1f..381b9086 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -206,6 +206,9 @@ class ImageTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('imagecreatefromstring', $image->getImageCreateFunction());
         $this->assertEquals('imagejpeg', $image->getImageFunction());
         $this->assertTrue($image->isMemImage());
+
+        $this->assertNotNull($image->getImageStringData());
+        $this->assertNotNull($image->getImageStringData(true));
     }
 
     /**
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index a71046aa..28d68e17 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -88,6 +88,9 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
             $result = Converter::emuToPixel($value);
             $this->assertEquals(round($value / 9525), $result);
 
+            $result = Converter::picaToPoint($value);
+            $this->assertEquals($value / 6 * 72, $result, '', 0.00001);
+
             $result = Converter::degreeToAngle($value);
             $this->assertEquals((int) round($value * 60000), $result);
 
@@ -112,4 +115,18 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
             $this->assertEquals($value[1], $result);
         }
     }
+
+    /**
+     * Test css size to point
+     */
+    public function testCssSizeParser()
+    {
+        $this->assertEquals(null, Converter::cssToPoint('10em'));
+        $this->assertEquals(10, Converter::cssToPoint('10pt'));
+        $this->assertEquals(7.5, Converter::cssToPoint('10px'));
+        $this->assertEquals(720, Converter::cssToPoint('10in'));
+        $this->assertEquals(120, Converter::cssToPoint('10pc'));
+        $this->assertEquals(28.346457, Converter::cssToPoint('10mm'), '', 0.000001);
+        $this->assertEquals(283.464567, Converter::cssToPoint('10cm'), '', 0.000001);
+    }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 8ec6840f..c50df5af 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -127,10 +127,42 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
-        $this->assertEquals('start', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
-        $this->assertEquals('end', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:jc', 'w:val'));
-        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:jc', 'w:val'));
-        $this->assertEquals('both', $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals(Jc::START, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals(Jc::END, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals(Jc::CENTER, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals(Jc::BOTH, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:jc', 'w:val'));
+    }
+
+    /**
+     * Test font-size style
+     */
+    public function testParseFontSize()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<span style="font-size: 10pt;">test</span>');
+        Html::addHtml($section, '<span style="font-size: 10px;">test</span>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:sz'));
+        $this->assertEquals('20', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:sz', 'w:val'));
+        $this->assertEquals('15', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:r/w:rPr/w:sz', 'w:val'));
+    }
+
+    /**
+     * Test font-family style
+     */
+    public function testParseFontFamily()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<span style="font-family: Arial">test</span>');
+        Html::addHtml($section, '<span style="font-family: Times New Roman;">test</span>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:rFonts'));
+        $this->assertEquals('Arial', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:rFonts', 'w:ascii'));
+        $this->assertEquals('Times New Roman', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:r/w:rPr/w:rFonts', 'w:ascii'));
     }
 
     /**
@@ -144,7 +176,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
-        $this->assertEquals('center', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
+        $this->assertEquals(Jc::CENTER, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:u', 'w:val'));
     }
 
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index 4d75ea5a..bdfc44e3 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer;
 
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
@@ -95,6 +96,15 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
         $textrun->addText(htmlspecialchars('Test 3', ENT_COMPAT, 'UTF-8'));
         $textrun->addTextBreak();
 
+        $textrun = $section->addTextRun(array('alignment' => Jc::START));
+        $textrun->addText(htmlspecialchars('Text left aligned', ENT_COMPAT, 'UTF-8'));
+
+        $textrun = $section->addTextRun(array('alignment' => Jc::BOTH));
+        $textrun->addText(htmlspecialchars('Text justified', ENT_COMPAT, 'UTF-8'));
+
+        $textrun = $section->addTextRun(array('alignment' => Jc::END));
+        $textrun->addText(htmlspecialchars('Text right aligned', ENT_COMPAT, 'UTF-8'));
+
         $textrun = $section->addTextRun('Paragraph');
         $textrun->addLink('https://github.com/PHPOffice/PHPWord');
         $textrun->addImage($localImage);
@@ -120,10 +130,14 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
         $cell = $table->addRow()->addCell();
 
         $writer = new HTML($phpWord);
+
         $writer->save($file);
-
         $this->assertFileExists($file);
+        unlink($file);
 
+        Settings::setOutputEscapingEnabled(true);
+        $writer->save($file);
+        $this->assertFileExists($file);
         unlink($file);
     }
 }
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index 0e6cf308..330125fb 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -38,6 +38,7 @@ class MPDFTest extends \PHPUnit\Framework\TestCase
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addText('Test 1');
+        $section->addPageBreak();
 
         $rendererName = Settings::PDF_RENDERER_MPDF;
         $rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/mpdf/mpdf');
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index b31b223a..0f0b323a 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -18,6 +18,8 @@
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Comment;
+use PhpOffice\PhpWord\Element\Text;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
@@ -351,4 +353,45 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:alias'));
         $this->assertTrue($doc->elementExists($path . '[3]/w:sdt/w:sdtPr/w:tag'));
     }
+
+    /**
+     * Test Comment element
+     */
+    public function testCommentWithoutEndElement()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $comment = new Comment('tester');
+        $phpWord->addComment($comment);
+
+        $element = $section->addText('this is a test');
+        $element->setCommentRangeStart($comment);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:commentRangeStart'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:commentRangeEnd'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:commentReference'));
+    }
+
+    /**
+     * Test Comment element
+     */
+    public function testCommentWithEndElement()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $comment = new Comment('tester');
+        $phpWord->addComment($comment);
+
+        $element = $section->addText('this is a test');
+        $element->setCommentRangeStart($comment);
+        $element->setCommentRangeEnd($comment);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:commentRangeStart'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:commentRangeEnd'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:commentReference'));
+    }
 }

From 8eb72c976a66bdcb9c76ef3e9e63763fa43f0ab8 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 15 Nov 2017 22:49:13 +0100
Subject: [PATCH 139/370] add HTML table parsing

---
 samples/Sample_26_Html.php                    |  14 ++
 src/PhpWord/Shared/Converter.php              |  53 +++---
 src/PhpWord/Shared/Html.php                   | 158 +++++++++++++++---
 src/PhpWord/Style/Border.php                  | 151 +++++++++++++++++
 src/PhpWord/Style/Cell.php                    |  85 +++++++++-
 src/PhpWord/Writer/Word2007/Style/Cell.php    |   1 +
 .../Writer/Word2007/Style/MarginBorder.php    |  27 ++-
 src/PhpWord/Writer/Word2007/Style/Shading.php |   6 +-
 tests/PhpWord/Shared/HtmlTest.php             |  16 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |   2 +-
 10 files changed, 452 insertions(+), 61 deletions(-)

diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 4235c946..8e6e9a33 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -14,6 +14,20 @@ $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</l
 $html .= '<p>Ordered (numbered) list:</p>';
 $html .= '<ol><li>Item 1</li><li>Item 2</li></ol>';
 
+$html .= '<table style="width: 50%; border: 6px #0000FF double;">
+                <thead>
+                    <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
+                        <th>header a</th>
+                        <th>header b</th>
+                        <th style="background-color: #FFFF00; border-width: 12px"><span style="background-color: #00FF00;">header c</span></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr><td style="border-style: dotted;">1</td><td colspan="2">2</td></tr>
+                    <tr><td>4</td><td>5</td><td>6</td></tr>
+                </tbody>
+            </table>';
+
 \PhpOffice\PhpWord\Shared\Html::addHtml($section, $html);
 
 // Save file
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index 43c2f299..bae8985d 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -296,25 +296,40 @@ class Converter
      */
     public static function cssToPoint($value)
     {
-        preg_match('/^[+-]?([0-9]+.?[0-9]+)?(px|em|ex|%|in|cm|mm|pt|pc)$/i', $value, $matches);
-        $size = $matches[1];
-        $unit = $matches[2];
-
-        switch ($unit) {
-            case 'pt':
-                return $size;
-            case 'px':
-                return self::pixelToPoint($size);
-            case 'cm':
-                return self::cmToPoint($size);
-            case 'mm':
-                return self::cmToPoint($size / 10);
-            case 'in':
-                return self::inchToPoint($size);
-            case 'pc':
-                return self::picaToPoint($size);
-            default:
-                return null;
+        if ($value == '0') {
+            return 0;
         }
+        if (preg_match('/^[+-]?([0-9]+\.?[0-9]*)?(px|em|ex|%|in|cm|mm|pt|pc)$/i', $value, $matches)) {
+            $size = $matches[1];
+            $unit = $matches[2];
+
+            switch ($unit) {
+                case 'pt':
+                    return $size;
+                case 'px':
+                    return self::pixelToPoint($size);
+                case 'cm':
+                    return self::cmToPoint($size);
+                case 'mm':
+                    return self::cmToPoint($size / 10);
+                case 'in':
+                    return self::inchToPoint($size);
+                case 'pc':
+                    return self::picaToPoint($size);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Transforms a size in CSS format (eg. 10px, 10px, ...) to twips
+     *
+     * @param string $value
+     * @return float
+     */
+    public static function cssToTwip($value)
+    {
+        return self::pointToTwip(self::cssToPoint($value));
     }
 }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index c4292eb4..7239a046 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -18,6 +18,8 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
+use PhpOffice\PhpWord\Element\Row;
+use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\SimpleType\Jc;
 
 /**
@@ -99,7 +101,7 @@ class Html
     protected static function parseNode($node, $element, $styles = array(), $data = array())
     {
         // Populate styles array
-        $styleTypes = array('font', 'paragraph', 'list');
+        $styleTypes = array('font', 'paragraph', 'list', 'table', 'row', 'cell');
         foreach ($styleTypes as $styleType) {
             if (!isset($styles[$styleType])) {
                 $styles[$styleType] = array();
@@ -124,10 +126,11 @@ class Html
             'u'         => array('Property',    null,   null,       $styles,    null,   'underline',    'single'),
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
-            'span'      => array('Property',    null,   null,       $styles,    null,   'span',         $node),
-            'table'     => array('Table',       $node,  $element,   $styles,    null,   'addTable',     true),
-            'tr'        => array('Table',       $node,  $element,   $styles,    null,   'addRow',       true),
-            'td'        => array('Table',       $node,  $element,   $styles,    null,   'addCell',      true),
+            'span'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
+            'table'     => array('Table',       $node,  $element,   $styles,    null,   null,           null),
+            'tr'        => array('Row',         $node,  $element,   $styles,    null,   null,           null),
+            'td'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
+            'th'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
             'ul'        => array('List',        null,   null,       $styles,    $data,  3,              null),
             'ol'        => array('List',        null,   null,       $styles,    $data,  7,              null),
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
@@ -179,7 +182,7 @@ class Html
             $cNodes = $node->childNodes;
             if (count($cNodes) > 0) {
                 foreach ($cNodes as $cNode) {
-                    if ($element instanceof AbstractContainer) {
+                    if ($element instanceof AbstractContainer || $element instanceof Table || $element instanceof Row) {
                         self::parseNode($cNode, $element, $styles, $data);
                     }
                 }
@@ -197,7 +200,7 @@ class Html
      */
     private static function parseParagraph($node, $element, &$styles)
     {
-        $styles['paragraph'] = self::parseInlineStyle($node, $styles['paragraph']);
+        $styles['paragraph'] = self::recursiveParseStylesInHierarchy($node, $styles['paragraph']);
         $newElement = $element->addTextRun($styles['paragraph']);
 
         return $newElement;
@@ -231,7 +234,12 @@ class Html
      */
     private static function parseText($node, $element, &$styles)
     {
-        $styles['font'] = self::parseInlineStyle($node, $styles['font']);
+        $styles['font'] = self::recursiveParseStylesInHierarchy($node, $styles['font']);
+
+        //alignment applies on paragraph, not on font. Let's copy it there
+        if (isset($styles['font']['alignment'])) {
+            $styles['paragraph']['alignment'] = $styles['font']['alignment'];
+        }
 
         if (is_callable(array($element, 'addText'))) {
             $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
@@ -247,16 +255,18 @@ class Html
      */
     private static function parseProperty(&$styles, $argument1, $argument2)
     {
-        if ($argument1 !== 'span') {
-            $styles['font'][$argument1] = $argument2;
-        } else {
-            if (!is_null($argument2->attributes)) {
-                $nodeAttr = $argument2->attributes->getNamedItem('style');
-                if (!is_null($nodeAttr) && property_exists($nodeAttr, 'value')) {
-                    $styles['font'] = self::parseStyle($nodeAttr, $styles['font']);
-                }
-            }
-        }
+        $styles['font'][$argument1] = $argument2;
+    }
+
+    /**
+     * Parse span node
+     *
+     * @param \DOMNode $node
+     * @param array &$styles
+     */
+    private static function parseSpan($node, &$styles)
+    {
+        self::parseInlineStyle($node, $styles['font']);
     }
 
     /**
@@ -270,11 +280,11 @@ class Html
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
      */
-    private static function parseTable($node, $element, &$styles, $argument1)
+    private static function parseTable($node, $element, &$styles)
     {
-        $styles['paragraph'] = self::parseInlineStyle($node, $styles['paragraph']);
+        $elementStyles = self::parseInlineStyle($node, $styles['table']);
 
-        $newElement = $element->$argument1();
+        $newElement = $element->addTable($elementStyles);
 
         // $attributes = $node->attributes;
         // if ($attributes->getNamedItem('width') !== null) {
@@ -291,6 +301,62 @@ class Html
         return $newElement;
     }
 
+    /**
+     * Parse a table row
+     *
+     * @param \DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\Table $element
+     * @param array &$styles
+     * @return \PhpOffice\PhpWord\Element\AbstractContainer $element
+     */
+    private static function parseRow($node, $element, &$styles)
+    {
+        $rowStyles = self::parseInlineStyle($node, $styles['row']);
+        if ($node->parentNode->nodeName == 'thead') {
+            $rowStyles['tblHeader'] = true;
+        }
+
+        return $element->addRow(null, $rowStyles);
+    }
+
+    /**
+     * Parse table cell
+     *
+     * @param \DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\Table $element
+     * @param array &$styles
+     * @return \PhpOffice\PhpWord\Element\AbstractContainer $element
+     */
+    private static function parseCell($node, $element, &$styles)
+    {
+        $cellStyles = self::recursiveParseStylesInHierarchy($node, $styles['cell']);
+
+        $colspan = $node->getAttribute('colspan');
+        if (!empty($colspan)) {
+            $cellStyles['gridSpan'] = $colspan - 0;
+        }
+
+        return $element->addCell(null, $cellStyles);
+    }
+
+    /**
+     * Recursively parses styles on parent nodes
+     * TODO if too slow, add caching of parent nodes, !! everything is static here so watch out for concurrency !!
+     *
+     * @param \DOMNode $node
+     * @param array &$styles
+     */
+    private static function recursiveParseStylesInHierarchy(\DOMNode $node, array $style)
+    {
+        $parentStyle = self::parseInlineStyle($node, array());
+        $style = array_merge($parentStyle, $style);
+        if ($node->parentNode != null && XML_ELEMENT_NODE == $node->parentNode->nodeType) {
+            $style = self::recursiveParseStylesInHierarchy($node->parentNode, $style);
+        }
+
+        return $style;
+    }
+
     /**
      * Parse list node
      *
@@ -400,9 +466,59 @@ class Html
                     }
                     $styles['italic'] = $tValue;
                     break;
+                case 'border-color':
+                    $styles['color'] = trim($cValue, '#');
+                    break;
+                case 'border-width':
+                    $styles['borderSize'] = Converter::cssToPoint($cValue);
+                    break;
+                case 'border-style':
+                    $styles['borderStyle'] = self::mapBorderStyle($cValue);
+                    break;
+                case 'width':
+                    if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
+                        $styles['width'] = Converter::cssToTwip($matches[1]);
+                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_TWIP;
+                    } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
+                        $styles['width'] = $matches[1] * 50;
+                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_PERCENT;
+                    } elseif (preg_match('/([0-9]+)/', $cValue, $matches)) {
+                        $styles['width'] = $matches[1];
+                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_AUTO;
+                    }
+                    break;
+                case 'border':
+                    if (preg_match('/([0-9]+[^0-9]*)\s+(\#[a-fA-F0-9]+)\s+([a-z]+)/', $cValue, $matches)) {
+                        $styles['borderSize'] = Converter::cssToPoint($matches[1]);
+                        $styles['borderColor'] = trim($matches[2], '#');
+                        $styles['borderStyle'] = self::mapBorderStyle($matches[3]);
+                    }
+                    break;
             }
         }
 
         return $styles;
     }
+
+    /**
+     * Transforms a CSS border style into a word border style
+     *
+     * @param string $cssBorderStyle
+     * @return null|string
+     */
+    private static function mapBorderStyle($cssBorderStyle)
+    {
+        if ($cssBorderStyle == null) {
+            return null;
+        }
+        switch ($cssBorderStyle) {
+            case 'none':
+            case 'dashed':
+            case 'dotted':
+            case 'double':
+                return $cssBorderStyle;
+            case 'solid':
+                return 'single';
+        }
+    }
 }
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index 5c62afcd..ab6aef18 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -36,6 +36,13 @@ class Border extends AbstractStyle
      */
     protected $borderTopColor;
 
+    /**
+     * Border Top Style
+     *
+     * @var string
+     */
+    protected $borderTopStyle;
+
     /**
      * Border Left Size
      *
@@ -50,6 +57,13 @@ class Border extends AbstractStyle
      */
     protected $borderLeftColor;
 
+    /**
+     * Border Left Style
+     *
+     * @var string
+     */
+    protected $borderLeftStyle;
+
     /**
      * Border Right Size
      *
@@ -64,6 +78,13 @@ class Border extends AbstractStyle
      */
     protected $borderRightColor;
 
+    /**
+     * Border Right Style
+     *
+     * @var string
+     */
+    protected $borderRightStyle;
+
     /**
      * Border Bottom Size
      *
@@ -78,6 +99,13 @@ class Border extends AbstractStyle
      */
     protected $borderBottomColor;
 
+    /**
+     * Border Bottom Style
+     *
+     * @var string
+     */
+    protected $borderBottomStyle;
+
     /**
      * Get border size
      *
@@ -140,6 +168,37 @@ class Border extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get border style
+     *
+     * @return string[]
+     */
+    public function getBorderStyle()
+    {
+        return array(
+            $this->getBorderTopStyle(),
+            $this->getBorderLeftStyle(),
+            $this->getBorderRightStyle(),
+            $this->getBorderBottomStyle(),
+        );
+    }
+
+    /**
+     * Set border style
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setBorderStyle($value = null)
+    {
+        $this->setBorderTopStyle($value);
+        $this->setBorderLeftStyle($value);
+        $this->setBorderRightStyle($value);
+        $this->setBorderBottomStyle($value);
+
+        return $this;
+    }
+
     /**
      * Get border top size
      *
@@ -186,6 +245,29 @@ class Border extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get border top style
+     *
+     * @return string
+     */
+    public function getBorderTopStyle()
+    {
+        return $this->borderTopStyle;
+    }
+
+    /**
+     * Set border top Style
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setBorderTopStyle($value = null)
+    {
+        $this->borderTopStyle = $value;
+
+        return $this;
+    }
+
     /**
      * Get border left size
      *
@@ -232,6 +314,29 @@ class Border extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get border left style
+     *
+     * @return string
+     */
+    public function getBorderLeftStyle()
+    {
+        return $this->borderLeftStyle;
+    }
+
+    /**
+     * Set border left style
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setBorderLeftStyle($value = null)
+    {
+        $this->borderLeftStyle = $value;
+
+        return $this;
+    }
+
     /**
      * Get border right size
      *
@@ -278,6 +383,29 @@ class Border extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get border right style
+     *
+     * @return string
+     */
+    public function getBorderRightStyle()
+    {
+        return $this->borderRightStyle;
+    }
+
+    /**
+     * Set border right style
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setBorderRightStyle($value = null)
+    {
+        $this->borderRightStyle = $value;
+
+        return $this;
+    }
+
     /**
      * Get border bottom size
      *
@@ -324,6 +452,29 @@ class Border extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get border bottom style
+     *
+     * @return string
+     */
+    public function getBorderBottomStyle()
+    {
+        return $this->borderBottomStyle;
+    }
+
+    /**
+     * Set border bottom style
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setBorderBottomStyle($value = null)
+    {
+        $this->borderBottomStyle = $value;
+
+        return $this;
+    }
+
     /**
      * Check if any of the border is not null
      *
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index 0c4ca2e1..7fd5814d 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -32,13 +32,31 @@ class Cell extends Border
     const VALIGN_BOTTOM = 'bottom';
     const VALIGN_BOTH = 'both';
 
+    //Text direction constants
     /**
-     * Text direction constants
-     *
-     * @const string
+     * Left to Right, Top to Bottom
+     */
+    const TEXT_DIR_LRTB = 'lrTb';
+    /**
+     * Top to Bottom, Right to Left
+     */
+    const TEXT_DIR_TBRL = 'tbRl';
+    /**
+     * Bottom to Top, Left to Right
      */
     const TEXT_DIR_BTLR = 'btLr';
-    const TEXT_DIR_TBRL = 'tbRl';
+    /**
+     * Left to Right, Top to Bottom Rotated
+     */
+    const TEXT_DIR_LRTBV = 'lrTbV';
+    /**
+     * Top to Bottom, Right to Left Rotated
+     */
+    const TEXT_DIR_TBRLV = 'tbRlV';
+    /**
+     * Top to Bottom, Left to Right Rotated
+     */
+    const TEXT_DIR_TBLRV = 'tbLrV';
 
     /**
      * Vertical merge (rowspan) constants
@@ -93,6 +111,20 @@ class Cell extends Border
      */
     private $shading;
 
+    /**
+     * Width
+     *
+     * @var int
+     */
+    private $width;
+
+    /**
+     * Width type
+     *
+     * @var string
+     */
+    private $widthType = Table::WIDTH_TWIP;
+
     /**
      * Get vertical align.
      *
@@ -236,6 +268,51 @@ class Cell extends Border
         return $this;
     }
 
+    /**
+     * Get cell width
+     *
+     * @return int
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
+
+    /**
+     * Set cell width
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setWidth($value)
+    {
+        $this->setIntVal($value);
+
+        return $this;
+    }
+
+    /**
+     * Get width type
+     *
+     * @return string
+     */
+    public function getWidthType()
+    {
+        return $this->widthType;
+    }
+
+    /**
+     * Set width type
+     *
+     * @param string $value
+     */
+    public function setWidthType($value)
+    {
+        $this->widthType = $this->setEnumVal($value, array(Table::WIDTH_AUTO, Table::WIDTH_PERCENT, Table::WIDTH_TWIP), Table::WIDTH_TWIP);
+
+        return $this;
+    }
+
     /**
      * Get default border color
      *
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index c2cf1c7c..82944d2c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -65,6 +65,7 @@ class Cell extends AbstractStyle
             $styleWriter = new MarginBorder($xmlWriter);
             $styleWriter->setSizes($style->getBorderSize());
             $styleWriter->setColors($style->getBorderColor());
+            $styleWriter->setStyles($style->getBorderStyle());
             $styleWriter->setAttributes(array('defaultColor' => CellStyle::DEFAULT_BORDER_COLOR));
             $styleWriter->write();
 
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index 3d877384..5c3ecde2 100644
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -40,6 +40,13 @@ class MarginBorder extends AbstractStyle
      */
     private $colors = array();
 
+    /**
+     * Border styles
+     *
+     * @var string[]
+     */
+    private $styles = array();
+
     /**
      * Other attributes
      *
@@ -62,7 +69,8 @@ class MarginBorder extends AbstractStyle
                 if (isset($this->colors[$i])) {
                     $color = $this->colors[$i];
                 }
-                $this->writeSide($xmlWriter, $sides[$i], $this->sizes[$i], $color);
+                $style = isset($this->styles[$i]) ? $this->styles[$i] : 'single';
+                $this->writeSide($xmlWriter, $sides[$i], $this->sizes[$i], $color, $style);
             }
         }
     }
@@ -74,8 +82,9 @@ class MarginBorder extends AbstractStyle
      * @param string $side
      * @param int $width
      * @param string $color
+     * @param string $borderStyle
      */
-    private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null)
+    private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null, $borderStyle = 'solid')
     {
         $xmlWriter->startElement('w:' . $side);
         if (!empty($this->colors)) {
@@ -84,9 +93,9 @@ class MarginBorder extends AbstractStyle
                     $color = $this->attributes['defaultColor'];
                 }
             }
-            $xmlWriter->writeAttribute('w:val', 'single');
+            $xmlWriter->writeAttribute('w:val', $borderStyle);
             $xmlWriter->writeAttribute('w:sz', $width);
-            $xmlWriter->writeAttribute('w:color', $color);
+            $xmlWriter->writeAttributeIf($color != null, 'w:color', $color);
             if (!empty($this->attributes)) {
                 if (isset($this->attributes['space'])) {
                     $xmlWriter->writeAttribute('w:space', $this->attributes['space']);
@@ -119,6 +128,16 @@ class MarginBorder extends AbstractStyle
         $this->colors = $value;
     }
 
+    /**
+     * Set border styles.
+     *
+     * @param string[] $value
+     */
+    public function setStyles($value)
+    {
+        $this->styles = $value;
+    }
+
     /**
      * Set attributes.
      *
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index a8e6592a..00680687 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -36,9 +36,9 @@ class Shading extends AbstractStyle
         $xmlWriter = $this->getXmlWriter();
 
         $xmlWriter->startElement('w:shd');
-        $xmlWriter->writeAttribute('w:val', $style->getPattern());
-        $xmlWriter->writeAttribute('w:color', $style->getColor());
-        $xmlWriter->writeAttribute('w:fill', $style->getFill());
+        $xmlWriter->writeAttributeIf(!is_null($style->getPattern()), 'w:val', $style->getPattern());
+        $xmlWriter->writeAttributeIf(!is_null($style->getColor()), 'w:color', $style->getColor());
+        $xmlWriter->writeAttributeIf(!is_null($style->getFill()), 'w:fill', $style->getFill());
         $xmlWriter->endElement();
     }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index c50df5af..39db0acf 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -187,25 +187,23 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
-        $html = '
-            <table style="width: 50%; border: 6px #0000FF solid;">
+        $html = '<table style="width: 50%; border: 6px #0000FF solid;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
-                        <th>a</th>
-                        <th>b</th>
-                        <th>c</th>
+                        <th>header a</th>
+                        <th>header b</th>
+                        <th style="border-color: #00FF00; border-width: 3px">header c</th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr><td>1</td><td colspan="2">2</td></tr>
+                    <tr><td style="border-style: dotted;">1</td><td colspan="2">2</td></tr>
                     <tr><td>4</td><td>5</td><td>6</td></tr>
                 </tbody>
             </table>';
         Html::addHtml($section, $html);
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
-//         echo $doc->printXml();
-        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p'));
-//         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:tbl/w:tr/w:tc'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 0f0b323a..aeceaebc 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -45,7 +45,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $elements = array(
             'CheckBox', 'Container', 'Footnote', 'Image', 'Link', 'ListItem', 'ListItemRun',
             'Object', 'PreserveText', 'Table', 'Text', 'TextBox', 'TextBreak', 'Title', 'TOC',
-            'Field', 'Line', 'Shape', 'Chart', 'FormField', 'SDT',
+            'Field', 'Line', 'Shape', 'Chart', 'FormField', 'SDT', 'Bookmark',
         );
         foreach ($elements as $element) {
             $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $element;

From 5ad68e0ba63cfcd3d8fef2adc9148bcedc3f8afc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 15 Nov 2017 22:58:28 +0100
Subject: [PATCH 140/370] add tests, improve code coverage

---
 src/PhpWord/Metadata/DocInfo.php              |  2 ++
 .../Writer/Word2007/Element/CheckBox.php      |  8 +-----
 .../Writer/Word2007/Element/FormField.php     |  7 +----
 src/PhpWord/Writer/Word2007/Element/Link.php  |  8 +-----
 .../Writer/Word2007/Element/PreserveText.php  | 14 ++--------
 src/PhpWord/Writer/Word2007/Element/TOC.php   | 11 +++-----
 src/PhpWord/Writer/Word2007/Element/Text.php  |  8 +-----
 src/PhpWord/Writer/Word2007/Element/Title.php | 14 +++-------
 src/PhpWord/Writer/Word2007/Part/Chart.php    | 10 +++----
 .../Writer/Word2007/Part/DocPropsCustom.php   |  6 ++++-
 tests/PhpWord/Metadata/DocInfoTest.php        |  6 ++---
 tests/PhpWord/Writer/Word2007/ElementTest.php | 10 ++++---
 .../Writer/Word2007/Part/DocumentTest.php     | 26 +++++++++++++++++++
 13 files changed, 57 insertions(+), 73 deletions(-)

diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index 0508dcd0..e5dee659 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -467,6 +467,8 @@ class DocInfo
                 $propertyType = self::PROPERTY_TYPE_INTEGER;
             } elseif (is_bool($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_BOOLEAN;
+            } elseif ($propertyValue instanceof \DateTime) {
+                $propertyType = self::PROPERTY_TYPE_DATE;
             } else {
                 $propertyType = self::PROPERTY_TYPE_STRING;
             }
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index 31dcb867..83e8af81 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * CheckBox element writer
  *
@@ -83,11 +81,7 @@ class CheckBox extends Text
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($this->getText($element->getText()));
-        } else {
-            $xmlWriter->writeRaw($this->getText($element->getText()));
-        }
+        $xmlWriter->writeText($this->getText($element->getText()));
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index 91fb28ab..d4afdec1 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -19,7 +19,6 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\FormField as FormFieldElement;
-use PhpOffice\PhpWord\Settings;
 
 /**
  * FormField element writer
@@ -90,11 +89,7 @@ class FormField extends Text
         $this->writeFontStyle();
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($value);
-        } else {
-            $xmlWriter->writeRaw($value);
-        }
+        $xmlWriter->writeText($value);
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index 8ea3f53c..072d665e 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * Link element writer
  *
@@ -54,11 +52,7 @@ class Link extends Text
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($element->getText());
-        } else {
-            $xmlWriter->writeRaw($element->getText());
-        }
+        $xmlWriter->writeText($element->getText());
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
         $xmlWriter->endElement(); // w:hyperlink
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 92b9ea40..cf26a587 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * PreserveText element writer
  *
@@ -60,11 +58,7 @@ class PreserveText extends Text
 
                 $xmlWriter->startElement('w:instrText');
                 $xmlWriter->writeAttribute('xml:space', 'preserve');
-                if (Settings::isOutputEscapingEnabled()) {
-                    $xmlWriter->text($text);
-                } else {
-                    $xmlWriter->writeRaw($text);
-                }
+                $xmlWriter->writeText($text);
                 $xmlWriter->endElement();
                 $xmlWriter->endElement();
 
@@ -86,11 +80,7 @@ class PreserveText extends Text
 
                 $xmlWriter->startElement('w:t');
                 $xmlWriter->writeAttribute('xml:space', 'preserve');
-                if (Settings::isOutputEscapingEnabled()) {
-                    $xmlWriter->text($this->getText($text));
-                } else {
-                    $xmlWriter->writeRaw($this->getText($text));
-                }
+                $xmlWriter->writeText($this->getText($text));
                 $xmlWriter->endElement();
                 $xmlWriter->endElement();
             }
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index a679188f..18a9399a 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -19,7 +19,6 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\TOC as TOCElement;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph as ParagraphStyleWriter;
@@ -97,13 +96,9 @@ class TOC extends AbstractElement
             $styleWriter = new FontStyleWriter($xmlWriter, $fontStyle);
             $styleWriter->write();
         }
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->writeElement('w:t', $title->getText());
-        } else {
-            $xmlWriter->startElement('w:t');
-            $xmlWriter->writeRaw($title->getText());
-            $xmlWriter->endElement();
-        }
+        $xmlWriter->startElement('w:t');
+        $xmlWriter->writeText($title->getText());
+        $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
         $xmlWriter->startElement('w:r');
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 694a834a..85052226 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * Text element writer
  *
@@ -45,11 +43,7 @@ class Text extends AbstractElement
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($this->getText($element->getText()));
-        } else {
-            $xmlWriter->writeRaw($this->getText($element->getText()));
-        }
+        $xmlWriter->writeText($this->getText($element->getText()));
         $xmlWriter->endElement();
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 63ed94de..f2a1d1ca 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * TextRun element writer
  *
@@ -60,14 +58,10 @@ class Title extends AbstractElement
 
         // Actual text
         $xmlWriter->startElement('w:r');
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->writeElement('w:t', $this->getText($element->getText()));
-        } else {
-            $xmlWriter->startElement('w:t');
-            $xmlWriter->writeRaw($this->getText($element->getText()));
-            $xmlWriter->endElement();
-        }
-        $xmlWriter->endElement();
+        $xmlWriter->startElement('w:t');
+        $xmlWriter->writeText($this->getText($element->getText()));
+        $xmlWriter->endElement(); // w:t
+        $xmlWriter->endElement(); // w:r
 
         // Bookmark end
         $xmlWriter->startElement('w:bookmarkEnd');
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 2f162108..2d8f618d 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -235,13 +235,9 @@ class Chart extends AbstractPart
         foreach ($values as $value) {
             $xmlWriter->startElement('c:pt');
             $xmlWriter->writeAttribute('idx', $index);
-            if (\PhpOffice\PhpWord\Settings::isOutputEscapingEnabled()) {
-                $xmlWriter->writeElement('c:v', $value);
-            } else {
-                $xmlWriter->startElement('c:v');
-                $xmlWriter->writeRaw($value);
-                $xmlWriter->endElement();
-            }
+            $xmlWriter->startElement('c:v');
+            $xmlWriter->writeText($value);
+            $xmlWriter->endElement(); // c:v
             $xmlWriter->endElement(); // c:pt
             $index++;
         }
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index 212e9d27..8ee2f028 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -60,7 +60,11 @@ class DocPropsCustom extends AbstractPart
                     $xmlWriter->writeElement('vt:bool', ($propertyValue) ? 'true' : 'false');
                     break;
                 case 'd':
-                    $xmlWriter->writeElement('vt:filetime', date($this->dateFormat, $propertyValue));
+                    if ($propertyValue instanceof \DateTime) {
+                        $xmlWriter->writeElement('vt:filetime', $propertyValue->format($this->dateFormat));
+                    } else {
+                        $xmlWriter->writeElement('vt:filetime', date($this->dateFormat, $propertyValue));
+                    }
                     break;
                 default:
                     $xmlWriter->writeElement('vt:lpwstr', $propertyValue);
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index 01659773..d9b44dc6 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -193,8 +193,7 @@ class DocInfoTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('value5', $oProperties->getCustomPropertyValue('key5'));
         $this->assertNull($oProperties->getCustomPropertyValue('key6'));
         $this->assertTrue($oProperties->isCustomPropertySet('key5'));
-        // todo: change to assertNotTrue when got upgraded to PHPUnit 4.x
-        $this->assertEquals(false, $oProperties->isCustomPropertySet('key6'));
+        $this->assertNotTrue($oProperties->isCustomPropertySet('key6'));
         $this->assertEquals(array('key1', 'key2', 'key3', 'key4', 'key5'), $oProperties->getCustomProperties());
     }
 
@@ -211,8 +210,7 @@ class DocInfoTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('8.3', DocInfo::convertProperty('8.3', 'lpstr'));
         $this->assertEquals(strtotime('10/11/2013'), DocInfo::convertProperty('10/11/2013', 'date'));
         $this->assertTrue(DocInfo::convertProperty('true', 'bool'));
-        // todo: change to assertNotTrue when got upgraded to PHPUnit 4.x
-        $this->assertEquals(false, DocInfo::convertProperty('1', 'bool'));
+        $this->assertNotTrue(DocInfo::convertProperty('1', 'bool'));
         $this->assertEquals('1', DocInfo::convertProperty('1', 'array'));
         $this->assertEquals('1', DocInfo::convertProperty('1', ''));
 
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index aeceaebc..f3c0d553 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -313,14 +313,16 @@ class ElementTest extends \PHPUnit\Framework\TestCase
 
         $section->addFormField('textinput')->setName('MyTextBox');
         $section->addFormField('checkbox')->setDefault(true)->setValue('Your name');
+        $section->addFormField('checkbox')->setDefault(true);
         $section->addFormField('dropdown')->setEntries(array('Choice 1', 'Choice 2', 'Choice 3'));
 
         $doc = TestHelperDOCX::getDocument($phpWord);
 
-        $path = '/w:document/w:body/w:p/w:r/w:fldChar/w:ffData';
-        $this->assertTrue($doc->elementExists($path . '/w:textInput'));
-        $this->assertTrue($doc->elementExists($path . '/w:checkBox'));
-        $this->assertTrue($doc->elementExists($path . '/w:ddList'));
+        $path = '/w:document/w:body/w:p[%d]/w:r/w:fldChar/w:ffData';
+        $this->assertTrue($doc->elementExists(sprintf($path, 1) . '/w:textInput'));
+        $this->assertTrue($doc->elementExists(sprintf($path, 2) . '/w:checkBox'));
+        $this->assertTrue($doc->elementExists(sprintf($path, 3) . '/w:checkBox'));
+        $this->assertTrue($doc->elementExists(sprintf($path, 4) . '/w:ddList'));
     }
 
     /**
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 9bad19fe..bc3a2aa8 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\FootnoteProperties;
+use PhpOffice\PhpWord\Metadata\DocInfo;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
@@ -39,6 +40,31 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
         TestHelperDOCX::clear();
     }
 
+    /**
+     * Write custom properties
+     */
+    public function testWriteCustomProps()
+    {
+        $phpWord = new PhpWord();
+        $docInfo = $phpWord->getDocInfo();
+
+        $docInfo->setCustomProperty('key1', null);
+        $docInfo->setCustomProperty('key2', true);
+        $docInfo->setCustomProperty('key3', 3);
+        $docInfo->setCustomProperty('key4', 4.4);
+        $docInfo->setCustomProperty('key5', 'value5');
+        $docInfo->setCustomProperty('key6', new \DateTime());
+        $docInfo->setCustomProperty('key7', time(), DocInfo::PROPERTY_TYPE_DATE);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+//         $this->assertTrue($doc->elementExists('/Properties/property[name="key1"]/vt:lpwstr'));
+//         $this->assertTrue($doc->elementExists('/Properties/property[name="key2"]/vt:bool'));
+//         $this->assertTrue($doc->elementExists('/Properties/property[name="key3"]/vt:i4'));
+//         $this->assertTrue($doc->elementExists('/Properties/property[name="key4"]/vt:r8'));
+//         $this->assertTrue($doc->elementExists('/Properties/property[name="key5"]/vt:lpwstr'));
+    }
+
     /**
      * Write end section page numbering
      */

From 9cd373806c9d5e5362d479ae5e0398393220759d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 16 Nov 2017 17:47:48 +0100
Subject: [PATCH 141/370] fix build

---
 CHANGELOG.md                                     |  3 +++
 samples/Sample_Header.php                        |  6 ++++++
 .../Writer/Word2007/Element/AbstractElement.php  | 16 ++++++++++++++++
 src/PhpWord/Writer/Word2007/Element/CheckBox.php |  2 +-
 .../Writer/Word2007/Element/FormField.php        |  2 +-
 src/PhpWord/Writer/Word2007/Element/Link.php     |  2 +-
 .../Writer/Word2007/Element/PreserveText.php     |  4 ++--
 src/PhpWord/Writer/Word2007/Element/TOC.php      |  2 +-
 src/PhpWord/Writer/Word2007/Element/Text.php     |  2 +-
 src/PhpWord/Writer/Word2007/Element/Title.php    |  2 +-
 .../Writer/Word2007/Part/AbstractPart.php        | 15 +++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Chart.php       |  2 +-
 12 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6579d2ef..af109b3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This is the last version to support PHP 5.3
 - Possiblity to set default document language as well as changing the language for each text element - @troosan #1108
 - Support for Comments - @troosan #1067
 - Support for paragraph textAlignment - @troosan #1165
+- Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
 
 ### Fixed
 - Loosen dependency to Zend
@@ -34,6 +35,8 @@ This is the last version to support PHP 5.3
 - Fixed read docx error when document contains image from remote url - @FBnil #1173 #1176
 - Padded the $args array to remove error - @kaigoh #1150, @reformed #870
 - Fix incorrect image size between windows and mac - @bskrtich #874
+- Fix adding HTML table to document - @mogilvie @arivanbastos #324
+
 v0.13.0 (31 July 2016)
 -------------------
 This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).
diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index 1d6b14a1..c4996049 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -12,6 +12,12 @@ define('IS_INDEX', SCRIPT_FILENAME == 'index');
 
 Settings::loadConfig();
 
+$dompdfPath = $vendorDirPath . '/dompdf/dompdf';
+if (file_exists($dompdfPath)) {
+    define('DOMPDF_ENABLE_AUTOLOAD', false);
+    Settings::setPdfRenderer(Settings::PDF_RENDERER_DOMPDF, $vendorDirPath . '/dompdf/dompdf');
+}
+
 // Set writers
 $writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf', 'HTML' => 'html', 'PDF' => 'pdf');
 
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 86018fd2..8c9f0bb7 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -20,6 +20,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 use PhpOffice\Common\Text as CommonText;
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\AbstractElement as Element;
+use PhpOffice\PhpWord\Settings;
 
 /**
  * Abstract element writer
@@ -208,4 +209,19 @@ abstract class AbstractElement
     {
         return CommonText::controlCharacterPHP2OOXML($text);
     }
+
+    /**
+     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled()
+     *
+     * @param string $content The text string to write
+     * @return bool Returns true on success or false on failure
+     */
+    protected function writeText($content)
+    {
+        if (Settings::isOutputEscapingEnabled()) {
+            return $this->getXmlWriter()->text($content);
+        }
+
+        return $this->getXmlWriter()->writeRaw($content);
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index 83e8af81..ab888f67 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -81,7 +81,7 @@ class CheckBox extends Text
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->writeText($this->getText($element->getText()));
+        $this->writeText($this->getText($element->getText()));
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index d4afdec1..73e9f4c4 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -89,7 +89,7 @@ class FormField extends Text
         $this->writeFontStyle();
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->writeText($value);
+        $this->writeText($value);
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index 072d665e..dc708a61 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -52,7 +52,7 @@ class Link extends Text
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->writeText($element->getText());
+        $this->writeText($element->getText());
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
         $xmlWriter->endElement(); // w:hyperlink
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index cf26a587..13887866 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -58,7 +58,7 @@ class PreserveText extends Text
 
                 $xmlWriter->startElement('w:instrText');
                 $xmlWriter->writeAttribute('xml:space', 'preserve');
-                $xmlWriter->writeText($text);
+                $this->writeText($text);
                 $xmlWriter->endElement();
                 $xmlWriter->endElement();
 
@@ -80,7 +80,7 @@ class PreserveText extends Text
 
                 $xmlWriter->startElement('w:t');
                 $xmlWriter->writeAttribute('xml:space', 'preserve');
-                $xmlWriter->writeText($this->getText($text));
+                $this->writeText($this->getText($text));
                 $xmlWriter->endElement();
                 $xmlWriter->endElement();
             }
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index 18a9399a..36ed7f88 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -97,7 +97,7 @@ class TOC extends AbstractElement
             $styleWriter->write();
         }
         $xmlWriter->startElement('w:t');
-        $xmlWriter->writeText($title->getText());
+        $this->writeText($title->getText());
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 85052226..e7149432 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -43,7 +43,7 @@ class Text extends AbstractElement
 
         $xmlWriter->startElement('w:t');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->writeText($this->getText($element->getText()));
+        $this->writeText($this->getText($element->getText()));
         $xmlWriter->endElement();
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index f2a1d1ca..f204ab16 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -59,7 +59,7 @@ class Title extends AbstractElement
         // Actual text
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:t');
-        $xmlWriter->writeText($this->getText($element->getText()));
+        $this->writeText($this->getText($element->getText()));
         $xmlWriter->endElement(); // w:t
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 0b9d8b88..038eb21d 100644
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -89,4 +89,19 @@ abstract class AbstractPart
 
         return new XMLWriter(XMLWriter::STORAGE_MEMORY, './', Settings::hasCompatibility());
     }
+
+    /**
+     * Write an XML text, this will call text() or writeRaw() depending on the value of Settings::isOutputEscapingEnabled()
+     *
+     * @param string $content The text string to write
+     * @return bool Returns true on success or false on failure
+     */
+    protected function writeText($content)
+    {
+        if (Settings::isOutputEscapingEnabled()) {
+            return $this->getXmlWriter()->text($content);
+        }
+
+        return $this->getXmlWriter()->writeRaw($content);
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 2d8f618d..c3703f9f 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -236,7 +236,7 @@ class Chart extends AbstractPart
             $xmlWriter->startElement('c:pt');
             $xmlWriter->writeAttribute('idx', $index);
             $xmlWriter->startElement('c:v');
-            $xmlWriter->writeText($value);
+            $this->writeText($value);
             $xmlWriter->endElement(); // c:v
             $xmlWriter->endElement(); // c:pt
             $index++;

From ab9a3dbc638ef262f3817a039d3b773cb7cb82ae Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 16 Nov 2017 18:03:37 +0100
Subject: [PATCH 142/370] fix warning

---
 tests/PhpWord/Writer/Word2007/Part/DocumentTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index bc3a2aa8..ddc7fc10 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -56,7 +56,7 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
         $docInfo->setCustomProperty('key6', new \DateTime());
         $docInfo->setCustomProperty('key7', time(), DocInfo::PROPERTY_TYPE_DATE);
 
-        $doc = TestHelperDOCX::getDocument($phpWord);
+        TestHelperDOCX::getDocument($phpWord);
 
 //         $this->assertTrue($doc->elementExists('/Properties/property[name="key1"]/vt:lpwstr'));
 //         $this->assertTrue($doc->elementExists('/Properties/property[name="key2"]/vt:bool'));

From b22208f810556ea2048796895a2473867ea28392 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 16 Nov 2017 23:09:56 +0100
Subject: [PATCH 143/370] format

---
 src/PhpWord/Writer/ODText/Part/Styles.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index ce9dbb60..e49fa25e 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -52,7 +52,9 @@ class Styles extends AbstractPart
         // Automatic styles
         $xmlWriter->startElement('office:automatic-styles');
         $this->writePageLayout($xmlWriter);
-        $xmlWriter->endElement();
+        $xmlWriter->endElement(); // office:automatic-styles
+
+        // Master style
         $this->writeMaster($xmlWriter);
 
         $xmlWriter->endElement(); // office:document-styles

From ac357d10d52b8c2e491e56683f8a07665d3fa5ff Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 18 Nov 2017 15:55:05 +0100
Subject: [PATCH 144/370] Various fixes

- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
---
 docs/elements.rst                             |  2 +-
 samples/Sample_26_Html.php                    | 20 ++++++++++--
 src/PhpWord/Element/AbstractContainer.php     |  2 --
 src/PhpWord/Element/Footnote.php              |  5 ++-
 src/PhpWord/Element/Section.php               |  6 ----
 src/PhpWord/Settings.php                      |  4 ---
 src/PhpWord/Shared/Html.php                   | 14 ++++----
 src/PhpWord/SimpleType/Jc.php                 |  2 --
 src/PhpWord/SimpleType/JcTable.php            |  2 --
 src/PhpWord/Style/Cell.php                    | 16 +++++-----
 src/PhpWord/Writer/AbstractWriter.php         |  4 +--
 src/PhpWord/Writer/Word2007/Style/Cell.php    | 12 ++++---
 tests/PhpWord/Shared/ConverterTest.php        |  1 +
 tests/PhpWord/Shared/HtmlTest.php             | 32 +++++++++++++++++--
 tests/PhpWord/Writer/Word2007/ElementTest.php | 19 +++++++++++
 15 files changed, 96 insertions(+), 45 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index e27b45d9..a2e41566 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -415,7 +415,7 @@ Line elements can be added to sections by using ``addLine``.
 .. code-block:: php
 
     $lineStyle = array('weight' => 1, 'width' => 100, 'height' => 0, 'color' => 635552);
-    $section->addLine($lineStyle)
+    $section->addLine($lineStyle);
 
 Available line style attributes:
 
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 8e6e9a33..ba06b063 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -14,11 +14,25 @@ $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</l
 $html .= '<p>Ordered (numbered) list:</p>';
 $html .= '<ol><li>Item 1</li><li>Item 2</li></ol>';
 
+$html .= '<p>List with complex content:</p>';
+$html .= '<ul>
+                <li>
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item1</span>
+                    </span>
+                </li>
+                <li>
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item2</span>
+                    </span>
+                </li>
+            </ul>';
+
 $html .= '<table style="width: 50%; border: 6px #0000FF double;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
-                        <th>header a</th>
-                        <th>header b</th>
+                        <th style="width: 50pt">header a</th>
+                        <th style="width: 50">header          b</th>
                         <th style="background-color: #FFFF00; border-width: 12px"><span style="background-color: #00FF00;">header c</span></th>
                     </tr>
                 </thead>
@@ -28,7 +42,7 @@ $html .= '<table style="width: 50%; border: 6px #0000FF double;">
                 </tbody>
             </table>';
 
-\PhpOffice\PhpWord\Shared\Html::addHtml($section, $html);
+\PhpOffice\PhpWord\Shared\Html::addHtml($section, $html, false, false);
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index cb42cf3d..d44160d8 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -157,8 +157,6 @@ abstract class AbstractContainer extends AbstractElement
      * Get all elements
      *
      * @return array
-     *
-     * @codeCoverageIgnore
      */
     public function getElements()
     {
diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php
index 9acdc4c3..e9a1bfc2 100644
--- a/src/PhpWord/Element/Footnote.php
+++ b/src/PhpWord/Element/Footnote.php
@@ -19,9 +19,6 @@ namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\Paragraph;
 
-/**
- * @codeCoverageIgnore
- */
 class Footnote extends AbstractContainer
 {
     /**
@@ -68,6 +65,7 @@ class Footnote extends AbstractContainer
      * Get Footnote Reference ID
      *
      * @deprecated 0.10.0
+     * @codeCoverageIgnore
      *
      * @return int
      */
@@ -80,6 +78,7 @@ class Footnote extends AbstractContainer
      * Set Footnote Reference ID
      *
      * @deprecated 0.10.0
+     * @codeCoverageIgnore
      *
      * @param int $rId
      */
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index ffc98435..8238277e 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -85,8 +85,6 @@ class Section extends AbstractContainer
      * Get section style
      *
      * @return \PhpOffice\PhpWord\Style\Section
-     *
-     * @codeCoverageIgnore
      */
     public function getStyle()
     {
@@ -125,8 +123,6 @@ class Section extends AbstractContainer
      * Get header elements
      *
      * @return Header[]
-     *
-     * @codeCoverageIgnore
      */
     public function getHeaders()
     {
@@ -137,8 +133,6 @@ class Section extends AbstractContainer
      * Get footer elements
      *
      * @return Footer[]
-     *
-     * @codeCoverageIgnore
      */
     public function getFooters()
     {
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 91efa1a6..144b0fc5 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -318,8 +318,6 @@ class Settings
      * @since 0.13.0
      *
      * @return bool
-     *
-     * @codeCoverageIgnore
      */
     public static function isOutputEscapingEnabled()
     {
@@ -330,8 +328,6 @@ class Settings
      * @since 0.13.0
      *
      * @param bool $outputEscapingEnabled
-     *
-     * @codeCoverageIgnore
      */
     public static function setOutputEscapingEnabled($outputEscapingEnabled)
     {
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 7239a046..479e0f46 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -37,8 +37,9 @@ class Html
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element Where the parts need to be added
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
+     * @param bool $preserveWhiteSpace If false, the whitespaces between nodes will be removed
      */
-    public static function addHtml($element, $html, $fullHTML = false)
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true)
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
@@ -59,7 +60,7 @@ class Html
 
         // Load DOM
         $dom = new \DOMDocument();
-        $dom->preserveWhiteSpace = true;
+        $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
         $node = $dom->getElementsByTagName('body');
 
@@ -395,6 +396,10 @@ class Html
                     $text = $cNode->nodeValue;
                 }
             }
+            //ideally we should be parsing child nodes for any style, for now just take the text
+            if ('' == trim($text) && '' != trim($node->textContent)) {
+                $text = trim($node->textContent);
+            }
             $element->addListItem($text, $data['listdepth'], $styles['font'], $styles['list'], $styles['paragraph']);
         }
     }
@@ -508,16 +513,13 @@ class Html
      */
     private static function mapBorderStyle($cssBorderStyle)
     {
-        if ($cssBorderStyle == null) {
-            return null;
-        }
         switch ($cssBorderStyle) {
             case 'none':
             case 'dashed':
             case 'dotted':
             case 'double':
                 return $cssBorderStyle;
-            case 'solid':
+            default:
                 return 'single';
         }
     }
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index 1a5d33ad..5d0ee33b 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -29,8 +29,6 @@ use PhpOffice\PhpWord\Shared\AbstractEnum;
  *
  * @see \PhpOffice\PhpWord\SimpleType\JcTable For table alignment modes available since ISO/IEC-29500:2008.
  * @see  http://www.datypic.com/sc/ooxml/t-w_ST_Jc.html
- *
- * @codeCoverageIgnore
  */
 final class Jc extends AbstractEnum
 {
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index e1af89ad..71e07397 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -25,8 +25,6 @@ use PhpOffice\PhpWord\Shared\AbstractEnum;
  * Introduced in ISO/IEC-29500:2008.
  *
  * @since 0.13.0
- *
- * @codeCoverageIgnore
  */
 final class JcTable extends AbstractEnum
 {
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index 7fd5814d..c281f998 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -119,11 +119,11 @@ class Cell extends Border
     private $width;
 
     /**
-     * Width type
+     * Width unit
      *
      * @var string
      */
-    private $widthType = Table::WIDTH_TWIP;
+    private $unit = Table::WIDTH_TWIP;
 
     /**
      * Get vertical align.
@@ -292,23 +292,23 @@ class Cell extends Border
     }
 
     /**
-     * Get width type
+     * Get width unit
      *
      * @return string
      */
-    public function getWidthType()
+    public function getUnit()
     {
-        return $this->widthType;
+        return $this->unit;
     }
 
     /**
-     * Set width type
+     * Set width unit
      *
      * @param string $value
      */
-    public function setWidthType($value)
+    public function setUnit($value)
     {
-        $this->widthType = $this->setEnumVal($value, array(Table::WIDTH_AUTO, Table::WIDTH_PERCENT, Table::WIDTH_TWIP), Table::WIDTH_TWIP);
+        $this->unit = $this->setEnumVal($value, array(Table::WIDTH_AUTO, Table::WIDTH_PERCENT, Table::WIDTH_TWIP), Table::WIDTH_TWIP);
 
         return $this;
     }
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 09a00990..50a0cad3 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -223,8 +223,8 @@ abstract class AbstractWriter implements WriterInterface
         if (strtolower($filename) == 'php://output' || strtolower($filename) == 'php://stdout') {
             $filename = tempnam(Settings::getTempDir(), 'PhpWord');
             if (false === $filename) {
-                $filename = $this->originalFilename;
-            }
+                $filename = $this->originalFilename; // @codeCoverageIgnore
+            } // @codeCoverageIgnore
         }
         $this->tempFilename = $filename;
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index 82944d2c..b889aa55 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -45,10 +45,14 @@ class Cell extends AbstractStyle
         $xmlWriter->startElement('w:tcPr');
 
         // Width
-        $xmlWriter->startElement('w:tcW');
-        $xmlWriter->writeAttribute('w:w', $this->width);
-        $xmlWriter->writeAttribute('w:type', 'dxa');
-        $xmlWriter->endElement(); // w:tcW
+        if (!is_null($this->width) || !is_null($style->getWidth())) {
+            $width = is_null($this->width) ? $style->getWidth() : $this->width;
+
+            $xmlWriter->startElement('w:tcW');
+            $xmlWriter->writeAttribute('w:w', $width);
+            $xmlWriter->writeAttribute('w:type', $style->getUnit());
+            $xmlWriter->endElement(); // w:tcW
+        }
 
         // Text direction
         $textDir = $style->getTextDirection();
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 28d68e17..49d5ef6e 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -122,6 +122,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
     public function testCssSizeParser()
     {
         $this->assertEquals(null, Converter::cssToPoint('10em'));
+        $this->assertEquals(0, Converter::cssToPoint('0'));
         $this->assertEquals(10, Converter::cssToPoint('10pt'));
         $this->assertEquals(7.5, Converter::cssToPoint('10px'));
         $this->assertEquals(720, Converter::cssToPoint('10in'));
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 39db0acf..58b0d977 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -190,8 +190,8 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $html = '<table style="width: 50%; border: 6px #0000FF solid;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
-                        <th>header a</th>
-                        <th>header b</th>
+                        <th style="width: 50pt">header a</th>
+                        <th style="width: 50">header b</th>
                         <th style="border-color: #00FF00; border-width: 3px">header c</th>
                     </tr>
                 </thead>
@@ -206,4 +206,32 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
     }
+
+    /**
+     * Tests parsing of ul/li
+     */
+    public function testParseList()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<ul>
+                <li>
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item1</span>
+                    </span>
+                </li>
+                <li>
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item2</span>
+                    </span>
+                </li>
+            </ul>';
+        Html::addHtml($section, $html, false, false);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
+        $this->assertEquals('list item1', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
+        $this->assertEquals('list item2', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->nodeValue);
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index f3c0d553..12f810ce 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -135,6 +135,25 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('center', $doc->getElementAttribute($tableRootElement . '/w:tblPr/w:jc', 'w:val'));
     }
 
+    /**
+     * Tests that the style name gets added
+     */
+    public function testTableWithStyleName()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $table = $section->addTable('my_predefined_style');
+        $table->setWidth(75);
+        $table->addRow(900);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $tableRootElement = '/w:document/w:body/w:tbl';
+        $this->assertTrue($doc->elementExists($tableRootElement . '/w:tblPr/w:tblStyle'));
+        $this->assertEquals('my_predefined_style', $doc->getElementAttribute($tableRootElement . '/w:tblPr/w:tblStyle', 'w:val'));
+    }
+
     /**
      * Test shape elements
      */

From 670d46e5434993fba296e70e11e3bb3928db25cf Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 00:14:31 +0100
Subject: [PATCH 145/370] add getter/setter on paragraph for child spacing rule

---
 CHANGELOG.md                                  |  2 +
 docs/styles.rst                               |  2 +
 src/PhpWord/Element/Field.php                 |  6 +--
 src/PhpWord/Metadata/Settings.php             |  2 +-
 src/PhpWord/Shared/Html.php                   |  8 ++--
 src/PhpWord/SimpleType/LineSpacingRule.php    | 45 +++++++++++++++++++
 src/PhpWord/Style/Paragraph.php               | 22 +++++++++
 src/PhpWord/Style/Spacing.php                 | 36 +++++++++++++--
 .../Writer/HTML/Element/AbstractElement.php   |  2 +-
 src/PhpWord/Writer/Word2007/Style/Spacing.php |  2 +-
 tests/PhpWord/Style/ParagraphTest.php         |  2 +
 tests/PhpWord/Style/SpacingTest.php           |  8 ++--
 12 files changed, 120 insertions(+), 17 deletions(-)
 create mode 100644 src/PhpWord/SimpleType/LineSpacingRule.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af109b3f..5e39ed3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ This is the last version to support PHP 5.3
 - Support for Comments - @troosan #1067
 - Support for paragraph textAlignment - @troosan #1165
 - Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
+- Allow to change cell width unit - guillaume-ro-fr #986
+- Allow to change the line height rule @troosan
 
 ### Fixed
 - Loosen dependency to Zend
diff --git a/docs/styles.rst b/docs/styles.rst
index f223574f..6166f5c9 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -79,6 +79,8 @@ Available Paragraph style options:
 - ``pageBreakBefore``. Start paragraph on next page, *true* or *false*.
 - ``spaceBefore``. Space before paragraph.
 - ``spaceAfter``. Space after paragraph.
+- ``spacing``. Space between lines.
+- ``spacingLineRule``. Line Spacing Rule. *auto*, *exact*, *atLeast*
 - ``tabs``. Set of custom tab stops.
 - ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
 - ``contextualSpacing``. Ignore Spacing Above and Below When Using Identical Styles, *true* or *false*.
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 726938b5..d51cba8d 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -206,10 +206,10 @@ class Field extends AbstractElement
     /**
      * Set Field text
      *
-     * @param string | TextRun $text
+     * @param string|TextRun $text
      *
      * @throws \InvalidArgumentException
-     * @return string | TextRun
+     * @return string|TextRun
      */
     public function setText($text)
     {
@@ -227,7 +227,7 @@ class Field extends AbstractElement
     /**
      * Get Field text
      *
-     * @return string | TextRun
+     * @return string|TextRun
      */
     public function getText()
     {
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 412f5c52..33f72cca 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -91,7 +91,7 @@ class Settings
     /**
      * Spelling and Grammatical Checking State
      *
-     * @var \PhpOffice\PhpWord\Metadata\ProofState
+     * @var \PhpOffice\PhpWord\ComplexType\ProofState
      */
     private $proofState;
 
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 479e0f46..5319c879 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -21,6 +21,7 @@ use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Element\Cell;
 
 /**
  * Common Html functions
@@ -276,8 +277,7 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
-     * @param string $argument1 Method name
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @return Table $element
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
      */
@@ -308,7 +308,7 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @return Row $element
      */
     private static function parseRow($node, $element, &$styles)
     {
@@ -326,7 +326,7 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
-     * @return \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @return Cell $element
      */
     private static function parseCell($node, $element, &$styles)
     {
diff --git a/src/PhpWord/SimpleType/LineSpacingRule.php b/src/PhpWord/SimpleType/LineSpacingRule.php
new file mode 100644
index 00000000..f2cc5e63
--- /dev/null
+++ b/src/PhpWord/SimpleType/LineSpacingRule.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Line Spacing Rule
+ *
+ * @since 0.14.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_LineSpacingRule.html
+ */
+final class LineSpacingRule extends AbstractEnum
+{
+    /**
+     * Automatically Determined Line Height
+     */
+    const AUTO = 'auto';
+
+    /**
+     * Exact Line Height
+     */
+    const EXACT = 'exact';
+
+    /**
+     * Minimum Line Height
+     */
+    const AT_LEAST = 'atLeast';
+}
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 355b495d..3b45344c 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -21,6 +21,7 @@ use PhpOffice\Common\Text;
 use PhpOffice\PhpWord\Exception\InvalidStyleException;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\TextAlignment;
+use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
 
 /**
  * Paragraph style
@@ -489,6 +490,27 @@ class Paragraph extends Border
         return $this->setSpace(array('line' => $value));
     }
 
+    /**
+     * Get spacing line rule
+     *
+     * @return string
+     */
+    public function getSpacingLineRule()
+    {
+        return $this->getChildStyleValue($this->spacing, 'lineRule');
+    }
+
+    /**
+     * Set the spacing line rule
+     *
+     * @param string $value Possible values are defined in LineSpacingRule
+     * @return \PhpOffice\PhpWord\Style\Paragraph
+     */
+    public function setSpacingLineRule($value)
+    {
+        return $this->setSpace(array('lineRule' => $value));
+    }
+
     /**
      * Get line height
      *
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index e0eee374..a932eb1a 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -17,10 +17,12 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
+
 /**
  * Spacing between lines and above/below paragraph style
  *
- * @see  http://www.schemacentral.com/sc/ooxml/t-w_CT_Spacing.html
+ * @see  http://www.datypic.com/sc/ooxml/t-w_CT_Spacing.html
  * @since 0.10.0
  */
 class Spacing extends AbstractStyle
@@ -51,7 +53,7 @@ class Spacing extends AbstractStyle
      *
      * @var string
      */
-    private $rule = 'auto';
+    private $lineRule = LineSpacingRule::AUTO;
 
     /**
      * Create a new instance
@@ -137,6 +139,32 @@ class Spacing extends AbstractStyle
      *
      * @return string
      */
+    public function getLineRule()
+    {
+        return $this->lineRule;
+    }
+    
+    /**
+     * Set line rule
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setLineRule($value = null)
+    {
+        LineSpacingRule::validate($value);
+        $this->lineRule = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get line rule
+     *
+     * @return string
+     * @deprecated Use getLineRule() instead
+     * @codeCoverageIgnore
+     */
     public function getRule()
     {
         return $this->rule;
@@ -147,10 +175,12 @@ class Spacing extends AbstractStyle
      *
      * @param string $value
      * @return self
+     * @deprecated Use setLineRule() instead
+     * @codeCoverageIgnore
      */
     public function setRule($value = null)
     {
-        $this->rule = $value;
+        $this->rule = value;
 
         return $this;
     }
diff --git a/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index f6e06258..47f0f93c 100644
--- a/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -50,7 +50,7 @@ abstract class AbstractElement
     protected $withoutP = false;
 
     /**
-     * @var \Zend\Escaper\Escaper
+     * @var \Zend\Escaper\Escaper|\PhpOffice\PhpWord\Escaper\AbstractEscaper
      */
     protected $escaper;
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
index 8db78161..c18339bd 100644
--- a/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -46,7 +46,7 @@ class Spacing extends AbstractStyle
         $line = $style->getLine();
         $xmlWriter->writeAttributeIf(!is_null($line), 'w:line', $line);
 
-        $xmlWriter->writeAttributeIf(!is_null($line), 'w:lineRule', $style->getRule());
+        $xmlWriter->writeAttributeIf(!is_null($line), 'w:lineRule', $style->getLineRule());
 
         $xmlWriter->endElement();
     }
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index 48acc600..68c0c12e 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
 
 /**
  * Test class for PhpOffice\PhpWord\Style\Paragraph
@@ -71,6 +72,7 @@ class ParagraphTest extends \PHPUnit\Framework\TestCase
             'indent'            => 1,
             'hanging'           => 1,
             'spacing'           => 120,
+            'spacingLineRule'   => LineSpacingRule::AT_LEAST,
             'basedOn'           => 'Normal',
             'next'              => 'Normal',
             'numStyle'          => 'numStyle',
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index 2c26f68b..65be8092 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -31,10 +31,10 @@ class SpacingTest extends \PHPUnit\Framework\TestCase
     {
         $object = new Spacing();
         $properties = array(
-            'before' => array(null, 10),
-            'after'  => array(null, 10),
-            'line'   => array(null, 10),
-            'rule'   => array('auto', 'exact'),
+            'before'   => array(null, 10),
+            'after'    => array(null, 10),
+            'line'     => array(null, 10),
+            'lineRule' => array('auto', 'exact'),
         );
         foreach ($properties as $property => $value) {
             list($default, $expected) = $value;

From e07195c512a066db0469259290391f3ea6bf6a62 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 08:14:22 +0100
Subject: [PATCH 146/370] add test, fix warnings

---
 src/PhpWord/Shared/Html.php                   |  2 +-
 src/PhpWord/Style/Paragraph.php               |  2 +-
 src/PhpWord/Style/Spacing.php                 |  2 +-
 tests/PhpWord/Style/ParagraphTest.php         |  2 +-
 .../Writer/Word2007/Part/DocumentTest.php     | 23 ++++++++++++++++++-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 5319c879..027d5798 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -18,10 +18,10 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
+use PhpOffice\PhpWord\Element\Cell;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\Element\Cell;
 
 /**
  * Common Html functions
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 3b45344c..c00dc97c 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -20,8 +20,8 @@ namespace PhpOffice\PhpWord\Style;
 use PhpOffice\Common\Text;
 use PhpOffice\PhpWord\Exception\InvalidStyleException;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\SimpleType\TextAlignment;
 use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
+use PhpOffice\PhpWord\SimpleType\TextAlignment;
 
 /**
  * Paragraph style
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index a932eb1a..eaa15814 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -143,7 +143,7 @@ class Spacing extends AbstractStyle
     {
         return $this->lineRule;
     }
-    
+
     /**
      * Set line rule
      *
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index 68c0c12e..e961f36a 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -18,8 +18,8 @@
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\TestHelperDOCX;
 use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Style\Paragraph
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index ddc7fc10..42c098cd 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -22,7 +22,9 @@ use PhpOffice\PhpWord\Metadata\DocInfo;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
+use PhpOffice\PhpWord\Style\Cell;
 use PhpOffice\PhpWord\Style\Font;
+use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
@@ -532,6 +534,25 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists("{$parent}/w:smallCaps"));
     }
 
+    /**
+     * Tests that if no color is set on a cell a border gets writen with the default color
+     */
+    public function testWriteDefaultColor()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $cStyles['borderTopSize'] = 120;
+
+        $table = $section->addTable();
+        $table->addRow();
+        $cell = $table->addCell(null, $cStyles);
+        $cell->addText('Test');
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertEquals(Cell::DEFAULT_BORDER_COLOR, $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:tcBorders/w:top', 'w:color'));
+    }
+
     /**
      * covers ::_writeTableStyle
      */
@@ -565,7 +586,7 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
 
         $section = $phpWord->addSection();
         $table = $section->addTable($tStyles);
-        $table->setWidth = 100;
+        $table->setWidth(100);
         $table->addRow($rHeight, $rStyles);
         $cell = $table->addCell($cWidth, $cStyles);
         $cell->addText('Test');

From 38ea5ecb5fc76edaf7ad3887e48514aefbb85df3 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 08:41:42 +0100
Subject: [PATCH 147/370] fix wrong variable

---
 src/PhpWord/Style/Spacing.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index eaa15814..489eb5d7 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -167,7 +167,7 @@ class Spacing extends AbstractStyle
      */
     public function getRule()
     {
-        return $this->rule;
+        return $this->lineRule;
     }
 
     /**
@@ -180,7 +180,7 @@ class Spacing extends AbstractStyle
      */
     public function setRule($value = null)
     {
-        $this->rule = value;
+        $this->lineRule = $value;
 
         return $this;
     }

From 6a5d2a636debeeea57e594835151df0af13e3f99 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 09:02:16 +0100
Subject: [PATCH 148/370] CS fixer warning

---
 src/PhpWord/Settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 6c28f737..22b8ba1f 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -310,6 +310,7 @@ class Settings
         } else {
             $tempDir = sys_get_temp_dir();
         }
+
         return $tempDir;
     }
 

From b4b87cd1dc20cb5e2e7fad8ed3a1f1697487994a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 09:43:35 +0100
Subject: [PATCH 149/370] CS fixer stronger checks

---
 tests/PhpWord/Element/ImageTest.php       | 3 +--
 tests/PhpWord/Shared/ConverterTest.php    | 2 +-
 tests/PhpWord/Style/AbstractStyleTest.php | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 381b9086..0966ea4d 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -37,8 +37,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Image', $oImage);
         $this->assertEquals($src, $oImage->getSource());
         $this->assertEquals(md5($src), $oImage->getMediaId());
-        // todo: change to assertNotTrue when got upgraded to PHPUnit 4.x
-        $this->assertEquals(false, $oImage->isWatermark());
+        $this->assertFalse($oImage->isWatermark());
         $this->assertEquals(Image::SOURCE_LOCAL, $oImage->getSourceType());
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oImage->getStyle());
     }
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 49d5ef6e..c7e0483d 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -121,7 +121,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
      */
     public function testCssSizeParser()
     {
-        $this->assertEquals(null, Converter::cssToPoint('10em'));
+        $this->assertNull(Converter::cssToPoint('10em'));
         $this->assertEquals(0, Converter::cssToPoint('0'));
         $this->assertEquals(10, Converter::cssToPoint('10pt'));
         $this->assertEquals(7.5, Converter::cssToPoint('10px'));
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index d4291c2a..c0263b1b 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -56,8 +56,7 @@ class AbstractStyleTest extends \PHPUnit\Framework\TestCase
     {
         $stub = $this->getMockForAbstractClass('\PhpOffice\PhpWord\Style\AbstractStyle');
 
-        // todo: change to assertNotTrue when got upgraded to PHPUnit 4.x
-        $this->assertEquals(false, self::callProtectedMethod($stub, 'setBoolVal', array('a', false)));
+        $this->assertNotTrue(self::callProtectedMethod($stub, 'setBoolVal', array('a', false)));
         $this->assertEquals(200, self::callProtectedMethod($stub, 'setIntVal', array('foo', 200)));
         $this->assertEquals(2.1, self::callProtectedMethod($stub, 'setFloatVal', array('foo', 2.1)));
         $this->assertEquals('b', self::callProtectedMethod($stub, 'setEnumVal', array(null, array('a', 'b'), 'b')));

From ffa9c156d7a2944f069bdd8e3ddb4c5051f87e47 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 22 Nov 2017 22:31:59 +0100
Subject: [PATCH 150/370] fix formatting

---
 docs/elements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index a2e41566..bf3eb5ac 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -297,7 +297,7 @@ Your TOC can only be generated if you have add at least one title (See "Titles")
 
 Options for ``$tocStyle``:
 
-- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in PHPWord\\Style\\TOC.
+- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in ``\PhpOffice\PhpWord\Style\TOC``.
 - ``tabPos``. The position of the tab where the page number appears in twips.
 - ``indent``. The indent factor of the titles in twips.
 

From ad83196a052b4fcb0b00a278a16dc0ef53ec6c74 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 23 Nov 2017 22:49:21 +0100
Subject: [PATCH 151/370] move password encoding in separate class

fix PHPCS errors
add documentation
add sample
---
 docs/general.rst                              |  11 +
 samples/Sample_38_Protection.php              |  21 ++
 src/PhpWord/Metadata/Protection.php           |  23 +-
 .../Shared/Microsoft/PasswordEncoder.php      | 205 +++++++++++++++++
 src/PhpWord/SimpleType/DocProtect.php         |  55 +++++
 src/PhpWord/Writer/Word2007/Part/Settings.php | 208 ++----------------
 tests/PhpWord/Metadata/SettingsTest.php       |  13 +-
 .../Writer/Word2007/Part/SettingsTest.php     |  33 ++-
 8 files changed, 360 insertions(+), 209 deletions(-)
 create mode 100644 samples/Sample_38_Protection.php
 create mode 100644 src/PhpWord/Shared/Microsoft/PasswordEncoder.php
 create mode 100644 src/PhpWord/SimpleType/DocProtect.php

diff --git a/docs/general.rst b/docs/general.rst
index b11734b1..f6c8df1c 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -271,3 +271,14 @@ points to twips.
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Converter::inchToTwip(.5));
     // 2 cm right margin
     $sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(2));
+
+Document protection
+-------------------
+
+The document (or parts of it) can be password protected.
+
+.. code-block:: php
+
+    $documentProtection = $phpWord->getSettings()->getDocumentProtection();
+    $documentProtection->setEditing(DocProtect::READ_ONLY);
+    $documentProtection->setPassword('myPassword');
diff --git a/samples/Sample_38_Protection.php b/samples/Sample_38_Protection.php
new file mode 100644
index 00000000..ee2b460b
--- /dev/null
+++ b/samples/Sample_38_Protection.php
@@ -0,0 +1,21 @@
+<?php
+use PhpOffice\PhpWord\SimpleType\DocProtect;
+
+include_once 'Sample_Header.php';
+
+// New Word Document
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+$documentProtection = $phpWord->getSettings()->getDocumentProtection();
+$documentProtection->setEditing(DocProtect::READ_ONLY);
+$documentProtection->setPassword('myPassword');
+
+$section = $phpWord->addSection();
+$section->addText('this document is password protected');
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index be78c055..09d08aac 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Metadata;
 
+use PhpOffice\PhpWord\SimpleType\DocProtect;
+
 /**
  * Document protection class
  *
@@ -38,28 +40,28 @@ class Protection
      *
      * @var string
      */
-    private $password = '';
+    private $password;
 
     /**
-     * Number of hashing iterations
+     * Iterations to Run Hashing Algorithm
      *
      * @var int
      */
     private $spinCount = 100000;
 
     /**
-     * Algorithm-SID (see to \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
+     * Cryptographic Hashing Algorithm (see to \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
      *
      * @var int
      */
     private $mswordAlgorithmSid = 4;
 
     /**
-     * salt
+     * Salt for Password Verifier
      *
      * @var string
      */
-    private $salt = '';
+    private $salt;
 
     /**
      * Create a new instance
@@ -68,7 +70,9 @@ class Protection
      */
     public function __construct($editing = null)
     {
-        $this->setEditing($editing);
+        if ($editing != null) {
+            $this->setEditing($editing);
+        }
     }
 
     /**
@@ -84,11 +88,12 @@ class Protection
     /**
      * Set editing protection
      *
-     * @param string $editing
+     * @param string $editing Any value of \PhpOffice\PhpWord\SimpleType\DocProtect
      * @return self
      */
     public function setEditing($editing = null)
     {
+        DocProtect::validate($editing);
         $this->editing = $editing;
 
         return $this;
@@ -177,12 +182,12 @@ class Protection
      * Set salt. Salt HAS to be 16 characters, or an exception will be thrown.
      *
      * @param $salt
-     * @return self
      * @throws \InvalidArgumentException
+     * @return self
      */
     public function setSalt($salt)
     {
-        if ($salt !== null && strlen($salt) !== 16){
+        if ($salt !== null && strlen($salt) !== 16) {
             throw new \InvalidArgumentException('salt has to be of exactly 16 bytes length');
         }
 
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
new file mode 100644
index 00000000..40a3ea12
--- /dev/null
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Shared\Microsoft;
+
+/**
+ * Password encoder for microsoft office applications
+ */
+class PasswordEncoder
+{
+    private static $algorithmMapping = array(
+        1  => 'md2',
+        2  => 'md4',
+        3  => 'md5',
+        4  => 'sha1',
+        5  => '', // 'mac' -> not possible with hash()
+        6  => 'ripemd',
+        7  => 'ripemd160',
+        8  => '',
+        9  => '', //'hmac' -> not possible with hash()
+        10 => '',
+        11 => '',
+        12 => 'sha256',
+        13 => 'sha384',
+        14 => 'sha512',
+    );
+
+    private static $initialCodeArray = array(
+        0xE1F0,
+        0x1D0F,
+        0xCC9C,
+        0x84C0,
+        0x110C,
+        0x0E10,
+        0xF1CE,
+        0x313E,
+        0x1872,
+        0xE139,
+        0xD40F,
+        0x84F9,
+        0x280C,
+        0xA96A,
+        0x4EC3,
+    );
+
+    private static $encryptionMatrix = array(
+        array(0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09),
+        array(0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF),
+        array(0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0),
+        array(0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40),
+        array(0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5),
+        array(0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A),
+        array(0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9),
+        array(0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0),
+        array(0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC),
+        array(0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10),
+        array(0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168),
+        array(0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C),
+        array(0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD),
+        array(0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC),
+        array(0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4),
+    );
+
+    private static $passwordMaxLength = 15;
+
+    /**
+     * Create a hashed password that MS Word will be able to work with
+     * @see https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
+     *
+     * @param string $password
+     * @param number $algorithmSid
+     * @param string $salt
+     * @param number $spinCount
+     * @return string
+     */
+    public static function hashPassword($password, $algorithmSid = 4, $salt = null, $spinCount = 10000)
+    {
+        $origEncoding = mb_internal_encoding();
+        mb_internal_encoding('UTF-8');
+
+        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
+
+        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
+        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
+        $passUtf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
+        $byteChars = array();
+        for ($i = 0; $i < mb_strlen($password); $i++) {
+            $byteChars[$i] = ord(substr($passUtf8, $i * 2, 1));
+            if ($byteChars[$i] == 0) {
+                $byteChars[$i] = ord(substr($passUtf8, $i * 2 + 1, 1));
+            }
+        }
+
+        // build low-order word and hig-order word and combine them
+        $combinedKey = self::buildCombinedKey($byteChars);
+        // build reversed hexadecimal string
+        $hex = str_pad(strtoupper(dechex($combinedKey & 0xFFFFFFFF)), 8, '0', \STR_PAD_LEFT);
+        $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
+
+        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
+
+        // Implementation Notes List:
+        //   Word requires that the initial hash of the password with the salt not be considered in the count.
+        //   The initial hash of salt + key is not included in the iteration count.
+        $algorithm = self::getAlgorithm($algorithmSid);
+        $generatedKey = hash($algorithm, $salt . $generatedKey, true);
+
+        for ($i = 0; $i < $spinCount; $i++) {
+            $generatedKey = hash($algorithm, $generatedKey . pack('CCCC', $i, $i >> 8, $i >> 16, $i >> 24), true);
+        }
+        $generatedKey = base64_encode($generatedKey);
+
+        mb_internal_encoding($origEncoding);
+
+        return $generatedKey;
+    }
+
+    /**
+     * Get algorithm from self::$algorithmMapping
+     *
+     * @param int $sid
+     * @return string
+     */
+    private static function getAlgorithm($sid)
+    {
+        $algorithm = self::$algorithmMapping[$sid];
+        if ($algorithm == '') {
+            $algorithm = 'sha1';
+        }
+
+        return $algorithm;
+    }
+
+    /**
+     * Build combined key from low-order word and high-order word
+     *
+     * @param array $byteChars byte array representation of password
+     * @return int
+     */
+    private static function buildCombinedKey($byteChars)
+    {
+        // Compute the high-order word
+        // Initialize from the initial code array (see above), depending on the passwords length.
+        $highOrderWord = self::$initialCodeArray[count($byteChars) - 1];
+
+        // For each character in the password:
+        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
+        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
+        //   the Encryption Matrix
+        for ($i = 0; $i < count($byteChars); $i++) {
+            $tmp = self::$passwordMaxLength - count($byteChars) + $i;
+            $matrixRow = self::$encryptionMatrix[$tmp];
+            for ($intBit = 0; $intBit < 7; $intBit++) {
+                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
+                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
+                }
+            }
+        }
+
+        // Compute low-order word
+        // Initialize with 0
+        $lowOrderWord = 0;
+        // For each character in the password, going backwards
+        for ($i = count($byteChars) - 1; $i >= 0; $i--) {
+            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
+            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
+        }
+        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
+        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ count($byteChars) ^ 0xCE4B);
+
+        // Combine the Low and High Order Word
+        return self::int32(($highOrderWord << 16) + $lowOrderWord);
+    }
+
+    /**
+     * Simulate behaviour of (signed) int32
+     *
+     * @param int $value
+     * @return int
+     */
+    private static function int32($value)
+    {
+        $value = ($value & 0xFFFFFFFF);
+
+        if ($value & 0x80000000) {
+            $value = -((~$value & 0xFFFFFFFF) + 1);
+        }
+
+        return $value;
+    }
+}
diff --git a/src/PhpWord/SimpleType/DocProtect.php b/src/PhpWord/SimpleType/DocProtect.php
new file mode 100644
index 00000000..cffa0003
--- /dev/null
+++ b/src/PhpWord/SimpleType/DocProtect.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Document Protection Types
+ *
+ * @since 0.14.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_DocProtect.html
+ */
+final class DocProtect extends AbstractEnum
+{
+    /**
+     * No Editing Restrictions
+     */
+    const NONE = 'none';
+
+    /**
+     * Allow No Editing
+     */
+    const READ_ONLY = 'readOnly';
+
+    /**
+     * Allow Editing of Comments
+     */
+    const COMMENTS = 'comments';
+
+    /**
+     * Allow Editing With Revision Tracking
+     */
+    const TRACKED_CHANGES = 'trackedChanges';
+
+    /**
+     * Allow Editing of Form Fields
+     */
+    const FORMS = 'forms';
+}
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index d604caa8..565aab2c 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\Style\Language;
 
 /**
@@ -28,59 +29,6 @@ use PhpOffice\PhpWord\Style\Language;
  */
 class Settings extends AbstractPart
 {
-    static $algorithmMapping = [
-        1 => 'md2',
-        2 => 'md4',
-        3 => 'md5',
-        4 => 'sha1',
-        5 => '', // 'mac' -> not possible with hash()
-        6 => 'ripemd',
-        7 => 'ripemd160',
-        8 => '',
-        9 => '', //'hmac' -> not possible with hash()
-        10 => '',
-        11 => '',
-        12 => 'sha256',
-        13 => 'sha384',
-        14 => 'sha512',
-    ];
-    static $initialCodeArray = [
-        0xE1F0,
-        0x1D0F,
-        0xCC9C,
-        0x84C0,
-        0x110C,
-        0x0E10,
-        0xF1CE,
-        0x313E,
-        0x1872,
-        0xE139,
-        0xD40F,
-        0x84F9,
-        0x280C,
-        0xA96A,
-        0x4EC3
-    ];
-    static $encryptionMatrix =
-        [
-            [0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09],
-            [0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF],
-            [0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0],
-            [0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40],
-            [0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5],
-            [0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A],
-            [0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9],
-            [0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0],
-            [0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC],
-            [0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10],
-            [0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168],
-            [0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C],
-            [0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD],
-            [0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC],
-            [0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4]
-        ];
-    static $passwordMaxLength = 15;
-
     /**
      * Settings value
      *
@@ -238,25 +186,26 @@ class Settings extends AbstractPart
                 $this->settings['w:documentProtection'] = array(
                     '@attributes' => array(
                         'w:enforcement' => 1,
-                        'w:edit' => $documentProtection->getEditing(),
-                    )
+                        'w:edit'        => $documentProtection->getEditing(),
+                    ),
                 );
             } else {
                 if ($documentProtection->getSalt() == null) {
                     $documentProtection->setSalt(openssl_random_pseudo_bytes(16));
                 }
+                $passwordHash = PasswordEncoder::hashPassword($documentProtection->getPassword(), $documentProtection->getMswordAlgorithmSid(), $documentProtection->getSalt(), $documentProtection->getSpinCount());
                 $this->settings['w:documentProtection'] = array(
                     '@attributes' => array(
-                        'w:enforcement' => 1,
-                        'w:edit' => $documentProtection->getEditing(),
-                        'w:cryptProviderType' => 'rsaFull',
+                        'w:enforcement'         => 1,
+                        'w:edit'                => $documentProtection->getEditing(),
+                        'w:cryptProviderType'   => 'rsaFull',
                         'w:cryptAlgorithmClass' => 'hash',
-                        'w:cryptAlgorithmType' => 'typeAny',
-                        'w:cryptAlgorithmSid' => $documentProtection->getMswordAlgorithmSid(),
-                        'w:cryptSpinCount' => $documentProtection->getSpinCount(),
-                        'w:hash' => $this->getEncodedPasswordHash($documentProtection),
-                        'w:salt' => base64_encode($documentProtection->getSalt()),
-                    )
+                        'w:cryptAlgorithmType'  => 'typeAny',
+                        'w:cryptAlgorithmSid'   => $documentProtection->getMswordAlgorithmSid(),
+                        'w:cryptSpinCount'      => $documentProtection->getSpinCount(),
+                        'w:hash'                => $passwordHash,
+                        'w:salt'                => base64_encode($documentProtection->getSalt()),
+                    ),
                 );
             }
         }
@@ -337,135 +286,10 @@ class Settings extends AbstractPart
             $this->settings['w:compat']['w:compatSetting'] = array(
                 '@attributes' => array(
                     'w:name' => 'compatibilityMode',
-                    'w:uri' => 'http://schemas.microsoft.com/office/word',
-                    'w:val' => $compatibility->getOoxmlVersion(),
-                )
+                    'w:uri'  => 'http://schemas.microsoft.com/office/word',
+                    'w:val'  => $compatibility->getOoxmlVersion(),
+                ),
             );
         }
     }
-
-
-    /**
-     * Create a hashed password that MS Word will be able to work with
-     * @link https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
-     *
-     * @param \PhpOffice\PhpWord\Metadata\Protection $protection
-     * @return string
-     */
-    private function getEncodedPasswordHash($protection)
-    {
-        $orig_encoding = mb_internal_encoding();
-        mb_internal_encoding("UTF-8");
-
-        $password = $protection->getPassword();
-        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
-
-        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
-        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
-        $pass_utf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
-        $byteChars = [];
-        for ($i = 0; $i < mb_strlen($password); $i++) {
-            $byteChars[$i] = ord(substr($pass_utf8, $i * 2, 1));
-            if ($byteChars[$i] == 0) {
-                $byteChars[$i] = ord(substr($pass_utf8, $i * 2 + 1, 1));
-            }
-        }
-
-        // build low-order word and hig-order word and combine them
-        $combinedKey = $this->buildCombinedKey($byteChars);
-        // build reversed hexadecimal string
-        $hex         = str_pad(strtoupper(dechex($combinedKey & 0xFFFFFFFF)), 8, '0', \STR_PAD_LEFT);
-        $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
-
-        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
-
-        // Implementation Notes List:
-        //   Word requires that the initial hash of the password with the salt not be considered in the count.
-        //   The initial hash of salt + key is not included in the iteration count.
-        $algorithm    = $this->getAlgorithm($protection->getMswordAlgorithmSid());
-        $generatedKey = hash($algorithm, $protection->getSalt() . $generatedKey, true);
-
-        for ($i = 0; $i < $protection->getSpinCount(); $i++) {
-            $generatedKey = hash($algorithm, $generatedKey . pack("CCCC", $i, $i >> 8, $i >> 16, $i >> 24), true);
-        }
-        $generatedKey = base64_encode($generatedKey);
-
-        mb_internal_encoding($orig_encoding);
-
-        return $generatedKey;
-    }
-
-    /**
-     * Get algorithm from self::$algorithmMapping
-     *
-     * @param int $sid
-     * @return string
-     */
-    private function getAlgorithm($sid)
-    {
-        $algorithm = self::$algorithmMapping[$sid];
-        if ($algorithm == '') {
-            $algorithm = 'sha1';
-        }
-
-        return $algorithm;
-    }
-
-    /**
-     * Build combined key from low-order word and high-order word
-     *
-     * @param array $byteChars -> byte array representation of password
-     * @return int
-     */
-    private function buildCombinedKey($byteChars)
-    {
-        // Compute the high-order word
-        // Initialize from the initial code array (see above), depending on the passwords length.
-        $highOrderWord = self::$initialCodeArray[sizeof($byteChars) - 1];
-
-        // For each character in the password:
-        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
-        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
-        //   the Encryption Matrix
-        for ($i = 0; $i < sizeof($byteChars); $i++) {
-            $tmp       = self::$passwordMaxLength - sizeof($byteChars) + $i;
-            $matrixRow = self::$encryptionMatrix[$tmp];
-            for ($intBit = 0; $intBit < 7; $intBit++) {
-                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
-                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
-                }
-            }
-        }
-
-        // Compute low-order word
-        // Initialize with 0
-        $lowOrderWord = 0;
-        // For each character in the password, going backwards
-        for ($i = sizeof($byteChars) - 1; $i >= 0; $i--) {
-            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
-            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
-        }
-        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
-        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ sizeof($byteChars) ^ 0xCE4B);
-
-        // Combine the Low and High Order Word
-        return $this->int32(($highOrderWord << 16) + $lowOrderWord);
-    }
-
-    /**
-     * Simulate behaviour of (signed) int32
-     *
-     * @param int $value
-     * @return int
-     */
-    private function int32($value)
-    {
-        $value = ($value & 0xFFFFFFFF);
-
-        if ($value & 0x80000000) {
-            $value = -((~$value & 0xFFFFFFFF) + 1);
-        }
-
-        return $value;
-    }
 }
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index bee8d0ca..a2a80b12 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -63,13 +63,22 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
     public function testDocumentProtection()
     {
         $oSettings = new Settings();
-        $oSettings->setDocumentProtection(new Protection());
+        $oSettings->setDocumentProtection(new Protection('trackedChanges'));
         $this->assertNotNull($oSettings->getDocumentProtection());
 
-        $oSettings->getDocumentProtection()->setEditing('trackedChanges');
         $this->assertEquals('trackedChanges', $oSettings->getDocumentProtection()->getEditing());
     }
 
+    /**
+     * Test setting an invalid salt
+     * @expectedException \InvalidArgumentException
+     */
+    public function testInvalidSalt()
+    {
+        $p = new Protection();
+        $p->setSalt('123');
+    }
+
     /**
      * TrackRevistions
      */
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 8c47cb52..7d4ef491 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -58,15 +58,15 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
 
     /**
      * Test document protection with password
-     *
-     * Note: to get comparison values, a docx was generated in Word2010 and the values taken from the settings.xml
      */
     public function testDocumentProtectionWithPassword()
     {
         $phpWord = new PhpWord();
-        $phpWord->getProtection()->setEditing('readOnly');
-        $phpWord->getProtection()->setPassword('testÄö@€!$&');
-        $phpWord->getProtection()->setSalt(base64_decode("uq81pJRRGFIY5U+E9gt8tA=="));
+        $phpWord->getSettings()->getDocumentProtection()->setEditing('readOnly');
+        $phpWord->getSettings()->getDocumentProtection()->setPassword('testÄö@€!$&');
+        $phpWord->getSettings()->getDocumentProtection()->setSalt(base64_decode('uq81pJRRGFIY5U+E9gt8tA=='));
+        $phpWord->getSettings()->getDocumentProtection()->setMswordAlgorithmSid(1);
+        $phpWord->getSettings()->getDocumentProtection()->setSpinCount(10);
 
         $doc = TestHelperDOCX::getDocument($phpWord);
 
@@ -74,7 +74,28 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
 
         $path = '/w:settings/w:documentProtection';
         $this->assertTrue($doc->elementExists($path, $file));
-        $this->assertEquals($doc->getElement($path, $file)->getAttribute('w:hash'), "RA9jfY/u3DX114PMcl+uSekxsYk=");
+        $this->assertEquals('rUuJbk6LuN2/qFyp7IUPQA==', $doc->getElement($path, $file)->getAttribute('w:hash'));
+        $this->assertEquals('1', $doc->getElement($path, $file)->getAttribute('w:cryptAlgorithmSid'));
+        $this->assertEquals('10', $doc->getElement($path, $file)->getAttribute('w:cryptSpinCount'));
+    }
+
+    /**
+     * Test document protection with password only
+     */
+    public function testDocumentProtectionWithPasswordOnly()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->getDocumentProtection()->setEditing('readOnly');
+        $phpWord->getSettings()->getDocumentProtection()->setPassword('testÄö@€!$&');
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:documentProtection';
+        $this->assertTrue($doc->elementExists($path, $file));
+        $this->assertEquals('4', $doc->getElement($path, $file)->getAttribute('w:cryptAlgorithmSid'));
+        $this->assertEquals('100000', $doc->getElement($path, $file)->getAttribute('w:cryptSpinCount'));
     }
 
     /**

From 2e562512f4d969edfd500252b9fe7107c1d45f74 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 24 Nov 2017 14:45:05 +0100
Subject: [PATCH 152/370] Add unit tests for PasswordEncoder

---
 .../Shared/Microsoft/PasswordEncoder.php      |  3 +
 tests/PhpWord/Metadata/SettingsTest.php       |  4 +-
 .../Shared/Microsoft/PasswordEncoderTest.php  | 91 +++++++++++++++++++
 .../Writer/Word2007/Part/SettingsTest.php     | 19 ----
 4 files changed, 96 insertions(+), 21 deletions(-)
 create mode 100644 tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php

diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index 40a3ea12..cddcfcd3 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -98,8 +98,10 @@ class PasswordEncoder
         //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
         $passUtf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
         $byteChars = array();
+
         for ($i = 0; $i < mb_strlen($password); $i++) {
             $byteChars[$i] = ord(substr($passUtf8, $i * 2, 1));
+
             if ($byteChars[$i] == 0) {
                 $byteChars[$i] = ord(substr($passUtf8, $i * 2 + 1, 1));
             }
@@ -189,6 +191,7 @@ class PasswordEncoder
     /**
      * Simulate behaviour of (signed) int32
      *
+     * @codeCoverageIgnore
      * @param int $value
      * @return int
      */
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index a2a80b12..9830fd28 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -75,8 +75,8 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidSalt()
     {
-        $p = new Protection();
-        $p->setSalt('123');
+        $protection = new Protection();
+        $protection->setSalt('123');
     }
 
     /**
diff --git a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
new file mode 100644
index 00000000..7b2bd3e7
--- /dev/null
+++ b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Shared;
+
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for PhpOffice\PhpWord\Shared\Html
+ * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
+ */
+class PasswordEncoderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test that a password can be hashed without specifying any additional parameters
+     */
+    public function testEncodePassword()
+    {
+        //given
+        $password = 'test';
+
+        //when
+        $hashPassword = PasswordEncoder::hashPassword($password);
+
+        //then
+        TestCase::assertEquals('M795/MAlmGU8RIsY9Q9uDLHC7bk=', $hashPassword);
+    }
+
+    /**
+     * Test that a password can be hashed with a custom salt
+     */
+    public function testEncodePasswordWithSalt()
+    {
+        //given
+        $password = 'test';
+        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
+
+        //when
+        $hashPassword = PasswordEncoder::hashPassword($password, 4, $salt);
+
+        //then
+        TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
+    }
+
+    /**
+     * Test that the encoder falls back on SHA-1 if a non supported algorithm is given
+     */
+    public function testDafaultsToSha1IfUnsupportedAlgorithm()
+    {
+        //given
+        $password = 'test';
+        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
+
+        //when
+        $hashPassword = PasswordEncoder::hashPassword($password, 5, $salt);
+
+        //then
+        TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
+    }
+
+    /**
+     * Test that the encoder falls back on SHA-1 if a non supported algorithm is given
+     */
+    public function testEncodePasswordWithNullAsciiCodeInPassword()
+    {
+        //given
+        $password = 'test' . chr(0);
+        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
+
+        //when
+        $hashPassword = PasswordEncoder::hashPassword($password, 5, $salt, 1);
+
+        //then
+        TestCase::assertEquals('rDV9sgdDsztoCQlvRCb1lF2wxNg=', $hashPassword);
+    }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 7d4ef491..7a355042 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -79,25 +79,6 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('10', $doc->getElement($path, $file)->getAttribute('w:cryptSpinCount'));
     }
 
-    /**
-     * Test document protection with password only
-     */
-    public function testDocumentProtectionWithPasswordOnly()
-    {
-        $phpWord = new PhpWord();
-        $phpWord->getSettings()->getDocumentProtection()->setEditing('readOnly');
-        $phpWord->getSettings()->getDocumentProtection()->setPassword('testÄö@€!$&');
-
-        $doc = TestHelperDOCX::getDocument($phpWord);
-
-        $file = 'word/settings.xml';
-
-        $path = '/w:settings/w:documentProtection';
-        $this->assertTrue($doc->elementExists($path, $file));
-        $this->assertEquals('4', $doc->getElement($path, $file)->getAttribute('w:cryptAlgorithmSid'));
-        $this->assertEquals('100000', $doc->getElement($path, $file)->getAttribute('w:cryptSpinCount'));
-    }
-
     /**
      * Test compatibility
      */

From 446d3478e491bed828e1a33f20442f57d1a85abe Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 25 Nov 2017 01:45:27 +0100
Subject: [PATCH 153/370] Create ISSUE_TEMPLATE.md

---
 docs/ISSUE_TEMPLATE.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 docs/ISSUE_TEMPLATE.md

diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..58981f8e
--- /dev/null
+++ b/docs/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+Issue tracker is **ONLY** used for reporting bugs. NO NEW FEATURE ACCEPTED! Use [stackoverflow](https://stackoverflow.com/questions/tagged/phpword) for supporting issues.
+
+# Expected Behavior
+
+Please describe the behavior you are expecting.
+
+# Current Behavior
+
+What is the current behavior?
+
+# Failure Information
+
+Please help provide information about the failure.
+
+## How to Reproduce
+
+Please provide a code sample that reproduces the issue.
+
+```php
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+$section = $phpWord->addSection();
+$section->...
+```
+
+## Context
+
+* PHP version:
+* PHPWord version: 0.14

From 3429c443ad3b18396769da0680806ab7808f1a97 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 25 Nov 2017 01:46:20 +0100
Subject: [PATCH 154/370] Create PULL_REQUEST_TEMPLATE.md

---
 docs/PULL_REQUEST_TEMPLATE.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 docs/PULL_REQUEST_TEMPLATE.md

diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..ad9788c4
--- /dev/null
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,12 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
+
+Fixes # (issue)
+
+# Checklist:
+
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have run phpunit, phpcs, php-cs-fixer, phpmd
+- [ ] The new code is covered by unit tests
+- [ ] I have update the documentation to describe the changes

From ab5d4468f908ac6df7cbef11b465f13cb22a363e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 25 Nov 2017 01:48:30 +0100
Subject: [PATCH 155/370] add the updateFields option on document settings

When set to true, word will ask you to update the fields in the document
when you open the document.
---
 CHANGELOG.md                                  |  3 ++-
 docs/general.rst                              |  9 ++++++++
 samples/Sample_17_TitleTOC.php                |  1 +
 src/PhpWord/Metadata/Settings.php             | 23 +++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php |  1 +
 tests/PhpWord/Metadata/SettingsTest.php       | 10 ++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e39ed3f..d26f6eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,8 +18,9 @@ This is the last version to support PHP 5.3
 - Support for Comments - @troosan #1067
 - Support for paragraph textAlignment - @troosan #1165
 - Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
-- Allow to change cell width unit - guillaume-ro-fr #986
+- Allow to change cell width unit - @guillaume-ro-fr #986
 - Allow to change the line height rule @troosan
+- Allow to force an update of all fields on opening a document - @troosan #951
 
 ### Fixed
 - Loosen dependency to Zend
diff --git a/docs/general.rst b/docs/general.rst
index b11734b1..da80e5f9 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -271,3 +271,12 @@ points to twips.
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Converter::inchToTwip(.5));
     // 2 cm right margin
     $sectionStyle->setMarginRight(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(2));
+
+Automatically Recalculate Fields on Open
+----------------------------------------
+
+To force an update of the fields present in the document, set updateFields to true
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setUpdateFields(true);
diff --git a/samples/Sample_17_TitleTOC.php b/samples/Sample_17_TitleTOC.php
index 306595eb..f99b73ea 100644
--- a/samples/Sample_17_TitleTOC.php
+++ b/samples/Sample_17_TitleTOC.php
@@ -4,6 +4,7 @@ include_once 'Sample_Header.php';
 // New Word document
 echo date('H:i:s'), ' Create new PhpWord object', EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
+$phpWord->getSettings()->setUpdateFields(true);
 
 // New section
 $section = $phpWord->addSection();
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 33f72cca..728cc823 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -116,6 +116,13 @@ class Settings
      */
     private $themeFontLang;
 
+    /**
+     * Automatically Recalculate Fields on Open
+     *
+     * @var bool
+     */
+    private $updateFields = false;
+
     /**
      * Radix Point for Field Code Evaluation
      *
@@ -345,6 +352,22 @@ class Settings
         $this->themeFontLang = $themeFontLang;
     }
 
+    /**
+     * @return bool
+     */
+    public function hasUpdateFields()
+    {
+        return $this->updateFields;
+    }
+
+    /**
+     * @param bool $updateFields
+     */
+    public function setUpdateFields($updateFields)
+    {
+        $this->updateFields = $updateFields === null ? false : $updateFields;
+    }
+
     /**
      * Returns the Radix Point for Field Code Evaluation
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index c8772e71..65cbf274 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -147,6 +147,7 @@ class Settings extends AbstractPart
         $this->setOnOffValue('w:doNotTrackMoves', $documentSettings->hasDoNotTrackMoves());
         $this->setOnOffValue('w:doNotTrackFormatting', $documentSettings->hasDoNotTrackFormatting());
         $this->setOnOffValue('w:evenAndOddHeaders', $documentSettings->hasEvenAndOddHeaders());
+        $this->setOnOffValue('w:updateFields', $documentSettings->hasUpdateFields());
 
         $this->setThemeFontLang($documentSettings->getThemeFontLang());
         $this->setRevisionView($documentSettings->getRevisionView());
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index bee8d0ca..e5b50cb7 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -153,4 +153,14 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $oSettings->setZoom(Zoom::FULL_PAGE);
         $this->assertEquals('fullPage', $oSettings->getZoom());
     }
+
+    /**
+     * Test Update Fields on update
+     */
+    public function testUpdateFields()
+    {
+        $oSettings = new Settings();
+        $oSettings->setUpdateFields(true);
+        $this->assertTrue($oSettings->hasUpdateFields());
+    }
 }

From 5a5ae48bb6fa1891623bbf2a0b7448bf36f7e77a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 25 Nov 2017 21:37:11 +0100
Subject: [PATCH 156/370] also add w:bCs

---
 src/PhpWord/Writer/Word2007/Style/Font.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 3fbff63d..9c2714dc 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -104,6 +104,7 @@ class Font extends AbstractStyle
 
         // Bold, italic
         $xmlWriter->writeElementIf($style->isBold(), 'w:b');
+        $xmlWriter->writeElementIf($style->isBold(), 'w:bCs');
         $xmlWriter->writeElementIf($style->isItalic(), 'w:i');
         $xmlWriter->writeElementIf($style->isItalic(), 'w:iCs');
 

From 5d928db91627245a79cdc38e626208b274b8cc2a Mon Sep 17 00:00:00 2001
From: Michael Spahn <m.spahn@bitexpert.de>
Date: Tue, 16 Aug 2016 17:10:51 +0200
Subject: [PATCH 157/370] Implement PageBreak for odt writer

---
 .../Writer/ODText/Element/PageBreak.php       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 src/PhpWord/Writer/ODText/Element/PageBreak.php

diff --git a/src/PhpWord/Writer/ODText/Element/PageBreak.php b/src/PhpWord/Writer/ODText/Element/PageBreak.php
new file mode 100644
index 00000000..47b4eeba
--- /dev/null
+++ b/src/PhpWord/Writer/ODText/Element/PageBreak.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2016 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\ODText\Element;
+
+/**
+ * PageBreak element writer
+ */
+class PageBreak extends AbstractElement
+{
+    /**
+     * Write element
+     */
+    public function write()
+    {
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->startElement('text:p');
+        $xmlWriter->writeAttribute('text:style-name', 'P1');
+        $xmlWriter->endElement();
+    }
+}

From 72a6b1b19fb26ffcf2871ef41ee95617cc20a55e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 25 Nov 2017 23:44:22 +0100
Subject: [PATCH 158/370] Add unit test

---
 tests/PhpWord/Writer/ODText/ElementTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index 253c8e11..f56114ea 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -18,6 +18,8 @@
 namespace PhpOffice\PhpWord\Writer\ODText;
 
 use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\ODText\Element subnamespace
@@ -40,4 +42,21 @@ class ElementTest extends \PHPUnit\Framework\TestCase
             $this->assertEquals('', $xmlWriter->getData());
         }
     }
+
+    /**
+     * Test PageBreak
+     */
+    public function testPageBreak()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $section->addText('test');
+        $section->addPageBreak();
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'ODText');
+
+        $element = '/office:document-content/office:body/office:text/text:section/text:p[2]';
+        $this->assertTrue($doc->elementExists($element, 'content.xml'));
+        $this->assertEquals('P1', $doc->getElementAttribute($element, 'text:style-name', 'content.xml'));
+    }
 }

From 355027d854b27889a64de6e74634c9589ea27853 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 26 Nov 2017 00:11:09 +0100
Subject: [PATCH 159/370] PHP-CS fix, improve code coverage

---
 src/PhpWord/Writer/ODText/Element/Link.php      |  8 +-------
 src/PhpWord/Writer/ODText/Element/PageBreak.php |  4 ++--
 src/PhpWord/Writer/ODText/Element/Text.php      | 12 ++----------
 src/PhpWord/Writer/ODText/Element/Title.php     |  8 +-------
 src/PhpWord/Writer/ODText/Part/Meta.php         |  7 +------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/src/PhpWord/Writer/ODText/Element/Link.php b/src/PhpWord/Writer/ODText/Element/Link.php
index c996ab59..34d72c1a 100644
--- a/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/src/PhpWord/Writer/ODText/Element/Link.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * Text element writer
  *
@@ -44,11 +42,7 @@ class Link extends AbstractElement
         $xmlWriter->startElement('text:a');
         $xmlWriter->writeAttribute('xlink:type', 'simple');
         $xmlWriter->writeAttribute('xlink:href', $element->getSource());
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($element->getText());
-        } else {
-            $xmlWriter->writeRaw($element->getText());
-        }
+        $this->writeText($element->getText());
         $xmlWriter->endElement(); // text:a
 
         if (!$this->withoutP) {
diff --git a/src/PhpWord/Writer/ODText/Element/PageBreak.php b/src/PhpWord/Writer/ODText/Element/PageBreak.php
index 47b4eeba..6eee6cfc 100644
--- a/src/PhpWord/Writer/ODText/Element/PageBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/PageBreak.php
@@ -10,8 +10,8 @@
  * file that was distributed with this source code. For the full list of
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2016 PHPWord contributors
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index 3b06217d..dc377699 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -58,11 +58,7 @@ class Text extends AbstractElement
             } elseif (is_string($paragraphStyle)) {
                 $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
             }
-            if (Settings::isOutputEscapingEnabled()) {
-                $xmlWriter->text($element->getText());
-            } else {
-                $xmlWriter->writeRaw($element->getText());
-            }
+            $this->writeText($element->getText());
         } else {
             if (empty($paragraphStyle)) {
                 $xmlWriter->writeAttribute('text:style-name', 'Standard');
@@ -74,11 +70,7 @@ class Text extends AbstractElement
             if (is_string($fontStyle)) {
                 $xmlWriter->writeAttribute('text:style-name', $fontStyle);
             }
-            if (Settings::isOutputEscapingEnabled()) {
-                $xmlWriter->text($element->getText());
-            } else {
-                $xmlWriter->writeRaw($element->getText());
-            }
+            $this->writeText($element->getText());
             $xmlWriter->endElement();
         }
         if (!$this->withoutP) {
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index bf9bf9d6..769d293f 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
-use PhpOffice\PhpWord\Settings;
-
 /**
  * Title element writer
  *
@@ -39,11 +37,7 @@ class Title extends AbstractElement
 
         $xmlWriter->startElement('text:h');
         $xmlWriter->writeAttribute('text:outline-level', $element->getDepth());
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($element->getText());
-        } else {
-            $xmlWriter->writeRaw($element->getText());
-        }
+        $this->writeText($element->getText());
         $xmlWriter->endElement(); // text:h
     }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Meta.php b/src/PhpWord/Writer/ODText/Part/Meta.php
index 72d03ae6..f592c5f0 100644
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -18,7 +18,6 @@
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
-use PhpOffice\PhpWord\Settings;
 
 /**
  * ODText meta part writer: meta.xml
@@ -100,11 +99,7 @@ class Meta extends AbstractPart
         // if ($type !== null) {
         //     $xmlWriter->writeAttribute('meta:value-type', $type);
         // }
-        if (Settings::isOutputEscapingEnabled()) {
-            $xmlWriter->text($value);
-        } else {
-            $xmlWriter->writeRaw($value);
-        }
+        $this->writeText($value);
         $xmlWriter->endElement(); // meta:user-defined
     }
 }

From 01008a591b731579f960bed7093853da6c690d03 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 26 Nov 2017 00:35:21 +0100
Subject: [PATCH 160/370] update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e39ed3f..7f5376a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.14.0 (?? ???? 2017)
+v0.14.0 (?? Dec 2017)
 ----------------------
 This release fixes several bugs and adds some new features.
 This is the last version to support PHP 5.3
@@ -20,6 +20,7 @@ This is the last version to support PHP 5.3
 - Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
 - Allow to change cell width unit - guillaume-ro-fr #986
 - Allow to change the line height rule @troosan
+- Implement PageBreak for odt writer @cookiekiller #863 #824
 
 ### Fixed
 - Loosen dependency to Zend

From 23bc8376668cfff4a2be8ff7286c5ba5ee399f36 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 26 Nov 2017 17:54:47 +0100
Subject: [PATCH 161/370] Scrutinizer fixes

---
 run_tests.sh                               | 8 +++++++-
 src/PhpWord/Element/Field.php              | 4 ++--
 src/PhpWord/Element/TrackChange.php        | 2 +-
 src/PhpWord/Reader/Word2007/Settings.php   | 6 +++---
 src/PhpWord/Shared/AbstractEnum.php        | 2 +-
 src/PhpWord/Shared/ZipArchive.php          | 2 +-
 src/PhpWord/Writer/ODText/Element/Text.php | 1 -
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 6b81d69c..a5d94259 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
+echo "Running composer update"
+composer update
 
 ## PHP_CodeSniffer
+echo "Running CodeSniffer"
 ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
 
 ## PHP-CS-Fixer
+echo "Running CS Fixer"
 ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
 
 ## PHP Mess Detector
+echo "Running Mess Detector"
 ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
 
 ## PHPUnit
-./vendor/bin/phpunit -c ./ --no-coverage
+echo "Running PHPUnit"
+./vendor/bin/phpunit -c ./
 
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index d51cba8d..4481f16b 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -74,7 +74,7 @@ class Field extends AbstractElement
     /**
      * Field text
      *
-     * @var TextRun | string
+     * @var TextRun|string
      */
     protected $text;
 
@@ -98,7 +98,7 @@ class Field extends AbstractElement
      * @param string $type
      * @param array $properties
      * @param array $options
-     * @param TextRun | string $text
+     * @param TextRun|string $text
      */
     public function __construct($type = null, $properties = array(), $options = array(), $text = null)
     {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index d900b053..9ed623f9 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -37,7 +37,7 @@ class TrackChange extends AbstractContainer
     /**
      * Date
      *
-     * @var DateTime
+     * @var \DateTime
      */
     private $date;
 
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 2580209e..c116425e 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -150,11 +150,11 @@ class Settings extends AbstractPart
     protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
         $revisionView = new TrackChangesView();
-        $revisionView->setMarkup($xmlReader->getAttribute('w:markup', $node));
+        $revisionView->setMarkup(filter_var($xmlReader->getAttribute('w:markup', $node), FILTER_VALIDATE_BOOLEAN));
         $revisionView->setComments($xmlReader->getAttribute('w:comments', $node));
         $revisionView->setInsDel($xmlReader->getAttribute('w:insDel', $node));
-        $revisionView->setFormatting($xmlReader->getAttribute('w:formatting', $node));
-        $revisionView->setInkAnnotations($xmlReader->getAttribute('w:inkAnnotations', $node));
+        $revisionView->setFormatting(filter_var($xmlReader->getAttribute('w:formatting', $node), FILTER_VALIDATE_BOOLEAN));
+        $revisionView->setInkAnnotations(filter_var($xmlReader->getAttribute('w:inkAnnotations', $node), FILTER_VALIDATE_BOOLEAN));
         $phpWord->getSettings()->setRevisionView($revisionView);
     }
 }
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index 58601a14..442d8251 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -48,7 +48,7 @@ abstract class AbstractEnum
     /**
      * Returns true the value is valid for this enum
      *
-     * @param strign $value
+     * @param string $value
      * @return bool true if value is valid
      */
     public static function isValid($value)
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index d73f6c33..77a84488 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -351,7 +351,7 @@ class ZipArchive
      * Returns the name of an entry using its index (emulate \ZipArchive)
      *
      * @param int $index
-     * @return string
+     * @return string|bool
      * @since 0.10.0
      */
     public function pclzipGetNameIndex($index)
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index dc377699..1fc0b800 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -18,7 +18,6 @@
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
 use PhpOffice\PhpWord\Exception\Exception;
-use PhpOffice\PhpWord\Settings;
 
 /**
  * Text element writer

From ca25eba8aa6b2e07d0d345d2104c21014ccc0e92 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 26 Nov 2017 22:55:37 +0100
Subject: [PATCH 162/370] Scrutinizer fixes

---
 phpstan.neon                                | 13 +++++++++++++
 src/PhpWord/Element/Endnote.php             |  4 +---
 src/PhpWord/Element/Field.php               |  4 ++--
 src/PhpWord/Element/Image.php               |  2 +-
 src/PhpWord/Element/ListItemRun.php         |  3 +--
 src/PhpWord/Element/Section.php             |  2 +-
 src/PhpWord/Metadata/DocInfo.php            |  2 +-
 src/PhpWord/Shared/PCLZip/pclzip.lib.php    |  4 ++--
 src/PhpWord/Writer/PDF/TCPDF.php            | 17 ++++++++---------
 src/PhpWord/Writer/Word2007/Element/SDT.php |  2 +-
 tests/PhpWord/Shared/ConverterTest.php      |  6 +++---
 tests/PhpWord/Style/NumberingTest.php       | 16 ++++++++--------
 tests/PhpWord/Style/TableTest.php           |  3 +++
 13 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 phpstan.neon

diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 00000000..5ae6d0f2
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,13 @@
+includes:
+	- vendor/phpstan/phpstan/conf/config.level1.neon
+parameters:
+	memory-limit: 200000
+	autoload_directories:
+		- tests
+	autoload_files:
+		- tests/bootstrap.php
+	excludes_analyse:
+		- */pclzip.lib.php
+		- src/PhpWord/Shared/OLERead.php
+		- src/PhpWord/Reader/MsDoc.php
+		- src/PhpWord/Writer/PDF/MPDF.php
\ No newline at end of file
diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php
index 6565c039..b6e94fba 100644
--- a/src/PhpWord/Element/Endnote.php
+++ b/src/PhpWord/Element/Endnote.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Style\Paragraph;
-
 /**
  * Endnote element
  *
@@ -38,6 +36,6 @@ class Endnote extends Footnote
      */
     public function __construct($paragraphStyle = null)
     {
-        $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
+        parent::__construct($paragraphStyle);
     }
 }
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 4481f16b..6ea63c6b 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -98,7 +98,7 @@ class Field extends AbstractElement
      * @param string $type
      * @param array $properties
      * @param array $options
-     * @param TextRun|string $text
+     * @param TextRun|string|null $text
      */
     public function __construct($type = null, $properties = array(), $options = array(), $text = null)
     {
@@ -209,7 +209,7 @@ class Field extends AbstractElement
      * @param string|TextRun $text
      *
      * @throws \InvalidArgumentException
-     * @return string|TextRun
+     * @return null|string|TextRun
      */
     public function setText($text)
     {
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index a5bd7283..f1f6bab5 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -137,7 +137,7 @@ class Image extends AbstractElement
         $this->setIsWatermark($watermark);
         $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
 
-        $this->checkImage($source);
+        $this->checkImage();
     }
 
     /**
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
index 5286f662..e311dc24 100644
--- a/src/PhpWord/Element/ListItemRun.php
+++ b/src/PhpWord/Element/ListItemRun.php
@@ -18,7 +18,6 @@
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\Style\ListItem as ListItemStyle;
-use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
  * List item element
@@ -61,7 +60,7 @@ class ListItemRun extends TextRun
         } else {
             $this->style = $this->setNewStyle(new ListItemStyle(), $listStyle, true);
         }
-        $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
+        parent::__construct($paragraphStyle);
     }
 
     /**
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 8238277e..06acf1f9 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -142,7 +142,7 @@ class Section extends AbstractContainer
     /**
      * Get the footnote properties
      *
-     * @return \PhpOffice\PhpWord\Element\FooterProperties
+     * @return FootnoteProperties
      */
     public function getFootnotePropoperties()
     {
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index e5dee659..09714f9e 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -410,7 +410,7 @@ class DocInfo
      * Get a Custom Property Value
      *
      * @param string $propertyName
-     * @return string
+     * @return mixed
      */
     public function getCustomPropertyValue($propertyName)
     {
diff --git a/src/PhpWord/Shared/PCLZip/pclzip.lib.php b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
index 0a69f687..5620c754 100644
--- a/src/PhpWord/Shared/PCLZip/pclzip.lib.php
+++ b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
@@ -3790,7 +3790,7 @@ class PclZip
         }
 
         // ----- Write gz file format header
-        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+        $v_binary_data = pack('va1a1Va1a1', 0x8b1f, chr($p_entry['compression']), chr(0x00), time(), chr(0x00), chr(3));
         @fwrite($v_dest_file, $v_binary_data, 10);
 
         // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
@@ -4383,7 +4383,7 @@ class PclZip
                 //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
                 // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
                 // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
-                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
+                $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | ord($v_byte);
 
                 // ----- Compare the bytes
                 if ($v_bytes == 0x504b0506) {
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index 3b82511a..85e3614c 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -40,7 +40,6 @@ class TCPDF extends AbstractRenderer implements WriterInterface
      * Save PhpWord to file.
      *
      * @param string $filename Name of the file to save as
-     * @return vois
      */
     public function save($filename = null)
     {
@@ -55,21 +54,21 @@ class TCPDF extends AbstractRenderer implements WriterInterface
         $pdf->setFontSubsetting(false);
         $pdf->setPrintHeader(false);
         $pdf->setPrintFooter(false);
-        $pdf->addPage();
-        $pdf->setFont($this->getFont());
+        $pdf->AddPage();
+        $pdf->SetFont($this->getFont());
         $pdf->writeHTML($this->getContent());
 
         // Write document properties
         $phpWord = $this->getPhpWord();
         $docProps = $phpWord->getDocInfo();
-        $pdf->setTitle($docProps->getTitle());
-        $pdf->setAuthor($docProps->getCreator());
-        $pdf->setSubject($docProps->getSubject());
-        $pdf->setKeywords($docProps->getKeywords());
-        $pdf->setCreator($docProps->getCreator());
+        $pdf->SetTitle($docProps->getTitle());
+        $pdf->SetAuthor($docProps->getCreator());
+        $pdf->SetSubject($docProps->getSubject());
+        $pdf->SetKeywords($docProps->getKeywords());
+        $pdf->SetCreator($docProps->getCreator());
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output($filename, 'S'));
+        fwrite($fileHandle, $pdf->Output($filename, 'S'));
 
         parent::restoreStateAfterSave($fileHandle);
     }
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 8899a1d8..6a202564 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -101,7 +101,7 @@ class SDT extends Text
      */
     private function writeDropDownList(XMLWriter $xmlWriter, SDTElement $element)
     {
-        $this->writecomboBox($xmlWriter, $element);
+        $this->writeComboBox($xmlWriter, $element);
     }
 
     /**
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index c7e0483d..752b9a8a 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -73,7 +73,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
             $result = Converter::pixelToPoint($value);
             $this->assertEquals($value / 96 * 72, $result);
 
-            $result = Converter::pixelToEMU($value);
+            $result = Converter::pixelToEmu($value);
             $this->assertEquals(round($value * 9525), $result);
 
             $result = Converter::pointToTwip($value);
@@ -82,7 +82,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
             $result = Converter::pointToPixel($value);
             $this->assertEquals($value / 72 * 96, $result);
 
-            $result = Converter::pointToEMU($value);
+            $result = Converter::pointToEmu($value);
             $this->assertEquals(round($value / 72 * 96 * 9525), $result);
 
             $result = Converter::emuToPixel($value);
@@ -111,7 +111,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
         $values[] = array('0F9D', false); // 4 characters
         // Conduct test
         foreach ($values as $value) {
-            $result = Converter::htmlToRGB($value[0]);
+            $result = Converter::htmlToRgb($value[0]);
             $this->assertEquals($value[1], $result);
         }
     }
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index 0103c503..4ec12366 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -29,21 +29,21 @@ class NumberingTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetSetProperties()
     {
-        $this->object = new Numbering();
-        $this->properties = array(
+        $object = new Numbering();
+        $properties = array(
             'numId' => array(null, 1),
             'type'  => array(null, 'singleLevel'),
         );
-        foreach ($this->properties as $property => $value) {
+        foreach ($properties as $property => $value) {
             list($default, $expected) = $value;
             $get = "get{$property}";
             $set = "set{$property}";
 
-            $this->assertEquals($default, $this->object->$get()); // Default value
+            $this->assertEquals($default, $object->$get()); // Default value
 
-            $this->object->$set($expected);
+            $object->$set($expected);
 
-            $this->assertEquals($expected, $this->object->$get()); // New value
+            $this->assertEquals($expected, $object->$get()); // New value
         }
     }
 
@@ -52,8 +52,8 @@ class NumberingTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetLevels()
     {
-        $this->object = new Numbering();
+        $object = new Numbering();
 
-        $this->assertEmpty($this->object->getLevels());
+        $this->assertEmpty($object->getLevels());
     }
 }
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index ff813927..2d57b1b8 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -99,6 +99,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
 
         $value = 'FF0000';
         $object->setBorderColor($value);
+        $values = array();
         foreach ($parts as $part) {
             $get = "getBorder{$part}Color";
             $values[] = $value;
@@ -121,6 +122,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
 
         $value = 4;
         $object->setBorderSize($value);
+        $values = array();
         foreach ($parts as $part) {
             $get = "getBorder{$part}Size";
             $values[] = $value;
@@ -143,6 +145,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
 
         $value = 240;
         $object->setCellMargin($value);
+        $values = array();
         foreach ($parts as $part) {
             $get = "getCellMargin{$part}";
             $values[] = $value;

From 274f50ce5a6cef27bd863ed813f854600d61ac35 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 4 Dec 2017 22:30:49 +0100
Subject: [PATCH 163/370] Add unit tests & add array type checks

---
 CHANGELOG.md                                  |  5 ++++-
 src/PhpWord/Shared/Html.php                   |  4 ++--
 src/PhpWord/Shared/ZipArchive.php             |  3 ++-
 src/PhpWord/Writer/RTF/Style/Border.php       |  2 +-
 src/PhpWord/Writer/Word2007/Part/Settings.php |  7 ++++---
 tests/PhpWord/Writer/RTF/StyleTest.php        | 20 +++++++++++++++++++
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 442f6dc0..f9679faf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@ This is the last version to support PHP 5.3
 ### Fixed
 - Loosen dependency to Zend
 - Images are not being printed when generating PDF - @hubertinio #1074 #431
-- Fixed some PHP 7 warnings - @	likeuntomurphy #927
+- Fixed some PHP 7 warnings - @likeuntomurphy #927
 - Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
 - Fixed image loading over https - @troosan #988
 - Impossibility to set different even and odd page headers - @troosan #981
@@ -41,6 +41,9 @@ This is the last version to support PHP 5.3
 - Fix incorrect image size between windows and mac - @bskrtich #874
 - Fix adding HTML table to document - @mogilvie @arivanbastos #324
 
+###Deprecated
+- PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
+
 v0.13.0 (31 July 2016)
 -------------------
 This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 027d5798..3f94e2ba 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -182,7 +182,7 @@ class Html
     {
         if ('li' != $node->nodeName) {
             $cNodes = $node->childNodes;
-            if (count($cNodes) > 0) {
+            if (!empty($cNodes)) {
                 foreach ($cNodes as $cNode) {
                     if ($element instanceof AbstractContainer || $element instanceof Table || $element instanceof Row) {
                         self::parseNode($cNode, $element, $styles, $data);
@@ -389,7 +389,7 @@ class Html
     private static function parseListItem($node, $element, &$styles, $data)
     {
         $cNodes = $node->childNodes;
-        if (count($cNodes) > 0) {
+        if (!empty($cNodes)) {
             $text = '';
             foreach ($cNodes as $cNode) {
                 if ($cNode->nodeName == '#text') {
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index 77a84488..bb42a92a 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -140,7 +140,8 @@ class ZipArchive
         } else {
             $zip = new \PclZip($this->filename);
             $this->tempDir = Settings::getTempDir();
-            $this->numFiles = count($zip->listContent());
+            $zipContent = $zip->listContent();
+            $this->numFiles = is_array($zipContent) ? count($zipContent) : 0;
         }
         $this->zip = $zip;
 
diff --git a/src/PhpWord/Writer/RTF/Style/Border.php b/src/PhpWord/Writer/RTF/Style/Border.php
index e63d767f..0ba9f602 100644
--- a/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/src/PhpWord/Writer/RTF/Style/Border.php
@@ -48,7 +48,7 @@ class Border extends AbstractStyle
         $content = '';
 
         $sides = array('top', 'left', 'right', 'bottom');
-        $sizeCount = count($this->sizes) - 1;
+        $sizeCount = count($this->sizes);
 
         // Page border measure
         // 8 = from text, infront off; 32 = from edge, infront on; 40 = from edge, infront off
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 65cbf274..eafb6734 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -76,7 +76,7 @@ class Settings extends AbstractPart
     {
         if ($settingValue == '') {
             $xmlWriter->writeElement($settingKey);
-        } else {
+        } elseif (is_array($settingValue) && !empty($settingValue)) {
             $xmlWriter->startElement($settingKey);
 
             /** @var array $settingValue Type hint */
@@ -154,7 +154,7 @@ class Settings extends AbstractPart
         $this->setDocumentProtection($documentSettings->getDocumentProtection());
         $this->setProofState($documentSettings->getProofState());
         $this->setZoom($documentSettings->getZoom());
-        $this->getCompatibility();
+        $this->setCompatibility();
     }
 
     /**
@@ -216,6 +216,7 @@ class Settings extends AbstractPart
     private function setRevisionView(TrackChangesView $trackChangesView = null)
     {
         if ($trackChangesView != null) {
+            $revisionView = array();
             $revisionView['w:markup'] = $trackChangesView->hasMarkup() ? 'true' : 'false';
             $revisionView['w:comments'] = $trackChangesView->hasComments() ? 'true' : 'false';
             $revisionView['w:insDel'] = $trackChangesView->hasInsDel() ? 'true' : 'false';
@@ -259,7 +260,7 @@ class Settings extends AbstractPart
     /**
      * Get compatibility setting.
      */
-    private function getCompatibility()
+    private function setCompatibility()
     {
         $compatibility = $this->getParentWriter()->getPhpWord()->getCompatibility();
         if ($compatibility->getOoxmlVersion() !== null) {
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index b9dc7b45..42f76430 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\RTF;
 
+use PhpOffice\PhpWord\Writer\RTF\Style\Border;
+
 /**
  * Test class for PhpOffice\PhpWord\Writer\RTF\Style subnamespace
  */
@@ -35,4 +37,22 @@ class StyleTest extends \PHPUnit\Framework\TestCase
             $this->assertEquals('', $object->write());
         }
     }
+
+    public function testBorderWithNonRegisteredColors()
+    {
+        $border = new Border();
+        $border->setSizes(array(1, 2, 3, 4));
+        $border->setColors(array('#FF0000', '#FF0000', '#FF0000', '#FF0000'));
+        $border->setSizes(array(20, 20, 20, 20));
+
+        $content = $border->write();
+
+        $expected = '\pgbrdropt32';
+        $expected .= '\pgbrdrt\brdrs\brdrw20\brdrcf0\brsp480 ';
+        $expected .= '\pgbrdrl\brdrs\brdrw20\brdrcf0\brsp480 ';
+        $expected .= '\pgbrdrr\brdrs\brdrw20\brdrcf0\brsp480 ';
+        $expected .= '\pgbrdrb\brdrs\brdrw20\brdrcf0\brsp480 ';
+
+        $this->assertEquals($expected, $content);
+    }
 }

From 3b6f9cea212d319251d5912c4943ac0526b1c0d2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 4 Dec 2017 22:31:10 +0100
Subject: [PATCH 164/370] Allow use of stdlib 3.x

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ee4f9bd5..70b60b46 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
         "php": ">=5.3.3",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "zendframework/zend-stdlib": "^2.2",
+        "zendframework/zend-stdlib": "^2.2 || ^3.0",
         "phpoffice/common": "^0.2"
     },
     "require-dev": {

From 86115b9e2dcaa8efd10c7d6e3f2415ea36380cd6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 5 Dec 2017 00:14:57 +0100
Subject: [PATCH 165/370] update installation instructions

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f712c6c6..85808888 100644
--- a/README.md
+++ b/README.md
@@ -67,10 +67,18 @@ PHPWord requires the following:
 ## Installation
 
 PHPWord is installed via [Composer](https://getcomposer.org/).
-You just need to [add dependency](https://getcomposer.org/doc/04-schema.md#package-links>) on PHPWord into your package.
+To [add a dependency](https://getcomposer.org/doc/04-schema.md#package-links>) to PHPWord in your project, either
 
-Example:
+Run the following to use the latest stable version
+```sh
+    composer require phpoffice/phpword
+```
+or if you want the latest master version
+```sh
+    composer require phpoffice/phpword:dev-master
+```
 
+You can of course also manually edit your composer.json file
 ```json
 {
     "require": {

From 05e2f1bf638655793c032961d8166af993ee9c5b Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 5 Dec 2017 08:02:23 +0100
Subject: [PATCH 166/370] use non deprecated method

---
 src/PhpWord/Reader/MsDoc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index 297a85b4..c134377a 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -2224,7 +2224,7 @@ class MsDoc extends AbstractReader implements ReaderInterface
     {
         foreach ($this->arraySections as $itmSection) {
             $oSection = $this->phpWord->addSection();
-            $oSection->setSettings($itmSection->styleSection);
+            $oSection->setStyle($itmSection->styleSection);
 
             $sHYPERLINK = '';
             foreach ($this->arrayParagraphs as $itmParagraph) {

From 9081ed9868f517d84a83599a5ccd4325677736a1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 5 Dec 2017 17:40:23 +0100
Subject: [PATCH 167/370] fix warning

---
 src/PhpWord/Shared/Html.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index e19c3fb6..d448e697 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -527,11 +527,11 @@ class Html
 
     /**
      * Parse line break
-    *
-    * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
-    */
+     *
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+     */
     private static function parseLineBreak($element)
     {
         $element->addTextBreak();
     }
-}
\ No newline at end of file
+}

From c079bf7f10123b3b7190c25b2deb58484da2e37a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 5 Dec 2017 20:47:34 +0100
Subject: [PATCH 168/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e39ed3f..82f1cc59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ This is the last version to support PHP 5.3
 - Support for Comments - @troosan #1067
 - Support for paragraph textAlignment - @troosan #1165
 - Add support for HTML underline tag <u> in addHtml - @zNightFalLz #1186
+- Add support for HTML <br> in addHtml - @anrikun @troosan #659
 - Allow to change cell width unit - guillaume-ro-fr #986
 - Allow to change the line height rule @troosan
 

From f6dd78daa6b1c7d50a06c65801c54b15f598f23a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 5 Dec 2017 21:39:28 +0100
Subject: [PATCH 169/370] update doc and changelog

---
 CHANGELOG.md      |  3 ++-
 docs/elements.rst | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9679faf..0752a42a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ This is the last version to support PHP 5.3
 - Allow to change the line height rule @troosan
 - Implement PageBreak for odt writer @cookiekiller #863 #824
 - Allow to force an update of all fields on opening a document - @troosan #951
+- Allow adding a CheckBox in a TextRun - @irond #727
 
 ### Fixed
 - Loosen dependency to Zend
@@ -41,7 +42,7 @@ This is the last version to support PHP 5.3
 - Fix incorrect image size between windows and mac - @bskrtich #874
 - Fix adding HTML table to document - @mogilvie @arivanbastos #324
 
-###Deprecated
+### Deprecated
 - PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
 
 v0.13.0 (31 July 2016)
diff --git a/docs/elements.rst b/docs/elements.rst
index bf3eb5ac..c73ffa06 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -39,7 +39,7 @@ column shows the containers while the rows lists the elements.
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
 | 15    | Endnote         | v         | -        | -        | v\*\*   | v\*\*      | -          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
-| 16    | CheckBox        | v         | v        | v        | v       | -          | -          |
+| 16    | CheckBox        | v         | v        | v        | v       | v          | -          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
 | 17    | TextBox         | v         | v        | v        | v       | -          | -          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
@@ -47,6 +47,8 @@ column shows the containers while the rows lists the elements.
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
 | 19    | Line            | v         | v        | v        | v       | v          | v          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
+| 20    | Chart           | v         |          |          | v       |            |            |
++-------+-----------------+-----------+----------+----------+---------+------------+------------+
 
 Legend:
 
@@ -408,7 +410,7 @@ For instance for the INDEX field, you can do the following (See `Index Field for
     $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), $fieldText);
 
 Line
-------
+----
 
 Line elements can be added to sections by using ``addLine``.
 
@@ -428,8 +430,21 @@ Available line style attributes:
 - ``height``. Line-object height in pt.
 - ``flip``. Flip the line element: true, false.
 
+Chart
+-----
+
+Charts can be added using
+
+.. code-block:: php
+
+    $categories = array('A', 'B', 'C', 'D', 'E');
+    $series = array(1, 3, 2, 5, 4);
+    $chart = $section->addChart('line', $categories, $series);
+
+check out the Sample_32_Chart.php for more options and styling.
+
 Comments
----------
+--------
 
 Comments can be added to a document by using ``addComment``.
 The comment can contain formatted text. Once the comment has been added, it can be linked to any element with ``setCommentStart``.

From 253b0602417e14755bdfa0b4cb17b9154cd8f2bc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 07:47:49 +0100
Subject: [PATCH 170/370] correctly parse on/off values
 (w:val="true|false|1|0|on|off")

---
 src/PhpWord/Reader/Word2007/AbstractPart.php |  18 +++++++++++++++---
 tests/PhpWord/Reader/Word2007Test.php        |   8 ++++++++
 tests/PhpWord/_files/documents/reader.docx   | Bin 105546 -> 105726 bytes
 tests/PhpWord/_includes/XmlDocument.php      |   1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 521c8a7f..4b7f6e0a 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -223,7 +223,7 @@ abstract class AbstractPart
                 // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
                 $target = $this->getMediaTarget($docPart, $rId);
                 if (!is_null($target)) {
-                    $textContent = "<Object: {$target}>";
+                    $textContent = "&lt;Object: {$target}>";
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
                 }
             } else {
@@ -477,9 +477,9 @@ abstract class AbstractPart
         if (self::READ_SIZE == $method) {
             $style = $attributeValue / 2;
         } elseif (self::READ_TRUE == $method) {
-            $style = true;
+            $style = $this->isOn($attributeValue);
         } elseif (self::READ_FALSE == $method) {
-            $style = false;
+            $style = !$this->isOn($attributeValue);
         } elseif (self::READ_EQUAL == $method) {
             $style = $attributeValue == $expected;
         }
@@ -487,6 +487,18 @@ abstract class AbstractPart
         return $style;
     }
 
+    /**
+     * Parses the value of the on/off value, null is considered true as it means the w:val attribute was not present
+     *
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_OnOff.html
+     * @param string $value
+     * @return bool
+     */
+    private function isOn($value = null)
+    {
+        return $value == null || $value == '1' || $value == 'true' || $value == 'on';
+    }
+
     /**
      * Returns the target of image, object, or link as stored in ::readMainRels
      *
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 8b787247..9a555672 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader;
 
 use PhpOffice\PhpWord\IOFactory;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Reader\Word2007
@@ -54,6 +55,13 @@ class Word2007Test extends \PHPUnit\Framework\TestCase
     {
         $filename = __DIR__ . '/../_files/documents/reader.docx';
         $phpWord = IOFactory::load($filename);
+
         $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
+        $this->assertTrue($phpWord->getSettings()->hasDoNotTrackMoves());
+        $this->assertFalse($phpWord->getSettings()->hasDoNotTrackFormatting());
+        $this->assertEquals(100, $phpWord->getSettings()->getZoom());
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r[w:t/node()="italics"]/w:rPr/w:b'));
     }
 }
diff --git a/tests/PhpWord/_files/documents/reader.docx b/tests/PhpWord/_files/documents/reader.docx
index ef6b6615a90234c26186e5ea689de97d045c378a..65c761e0a6a7ebfc3594466155b30e98bc273072 100644
GIT binary patch
delta 4496
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
O(un{SQB3UVQ2qxoT|H9(

delta 4273
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
DJ_F4a

diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index c82c5a8e..21a12105 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -97,6 +97,7 @@ class XmlDocument
 
         if (null === $this->xpath) {
             $this->xpath = new \DOMXpath($this->dom);
+            $this->xpath->registerNamespace('w14', 'http://schemas.microsoft.com/office/word/2010/wordml');
         }
 
         return $this->xpath->query($path);

From dc7cb1ee75b2edcc3ab1c19671f3b245ec353e3f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 22:48:58 +0100
Subject: [PATCH 171/370] update changelog & doc

---
 CHANGELOG.md                                 | 1 +
 src/PhpWord/Element/Comment.php              | 1 +
 src/PhpWord/Element/TrackChange.php          | 1 +
 src/PhpWord/Reader/Word2007/AbstractPart.php | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dc8b458..51f92434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ This is the last version to support PHP 5.3
 - Padded the $args array to remove error - @kaigoh #1150, @reformed #870
 - Fix incorrect image size between windows and mac - @bskrtich #874
 - Fix adding HTML table to document - @mogilvie @arivanbastos #324
+- Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
 
 ### Deprecated
 - PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 908b8785..18836929 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
 
 /**
  * Comment element
+ * @see http://datypic.com/sc/ooxml/t-w_CT_Comment.html
  */
 class Comment extends TrackChange
 {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 9ed623f9..d14fc201 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Element;
 
 /**
  * TrackChange element
+ * @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
  */
 class TrackChange extends AbstractContainer
 {
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 4b7f6e0a..6a48fd46 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -384,7 +384,7 @@ abstract class AbstractPart
     {
         $style = null;
         $margins = array('top', 'left', 'bottom', 'right');
-        $borders = $margins + array('insideH', 'insideV');
+        $borders = array_merge($margins, array('insideH', 'insideV'));
 
         if ($xmlReader->elementExists('w:tblPr', $domNode)) {
             if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
@@ -422,7 +422,7 @@ abstract class AbstractPart
             'textDirection' => array(self::READ_VALUE, 'w:textDirection'),
             'gridSpan'      => array(self::READ_VALUE, 'w:gridSpan'),
             'vMerge'        => array(self::READ_VALUE, 'w:vMerge'),
-            'bgColor'       => array(self::READ_VALUE, 'w:shd/w:fill'),
+            'bgColor'       => array(self::READ_VALUE, 'w:shd', 'w:fill'),
         );
 
         return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);

From 9e029415cc3eafad7581346b8ed84e05d7674b08 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 23:17:01 +0100
Subject: [PATCH 172/370] align with pull request submitted in PHPOffice/Commom

---
 src/PhpWord/Metadata/Protection.php           | 23 ++++---
 .../Shared/Microsoft/PasswordEncoder.php      | 68 ++++++++++++-------
 src/PhpWord/Writer/Word2007/Part/Settings.php |  2 +-
 .../Shared/Microsoft/PasswordEncoderTest.php  |  6 +-
 4 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 09d08aac..bb1cc1ad 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Metadata;
 
 use PhpOffice\PhpWord\SimpleType\DocProtect;
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 
 /**
  * Document protection class
@@ -50,11 +51,11 @@ class Protection
     private $spinCount = 100000;
 
     /**
-     * Cryptographic Hashing Algorithm (see to \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
+     * Cryptographic Hashing Algorithm (see constants defined in \PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder)
      *
-     * @var int
+     * @var string
      */
-    private $mswordAlgorithmSid = 4;
+    private $algorithm = PasswordEncoder::ALGORITHM_SHA_1;
 
     /**
      * Salt for Password Verifier
@@ -146,24 +147,24 @@ class Protection
     }
 
     /**
-     * Get algorithm-sid
+     * Get algorithm
      *
-     * @return int
+     * @return string
      */
-    public function getMswordAlgorithmSid()
+    public function getAlgorithm()
     {
-        return $this->mswordAlgorithmSid;
+        return $this->algorithm;
     }
 
     /**
-     * Set algorithm-sid (see \PhpOffice\PhpWord\Writer\Word2007\Part\Settings::$algorithmMapping)
+     * Set algorithm
      *
-     * @param $mswordAlgorithmSid
+     * @param $algorithm
      * @return self
      */
-    public function setMswordAlgorithmSid($mswordAlgorithmSid)
+    public function setMswordAlgorithmSid($algorithm)
     {
-        $this->mswordAlgorithmSid = $mswordAlgorithmSid;
+        $this->algorithm = $algorithm;
 
         return $this;
     }
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index cddcfcd3..a3ba345c 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -22,21 +22,36 @@ namespace PhpOffice\PhpWord\Shared\Microsoft;
  */
 class PasswordEncoder
 {
+    const ALGORITHM_MD2 = 'MD2';
+    const ALGORITHM_MD4 = 'MD4';
+    const ALGORITHM_MD5 = 'MD5';
+    const ALGORITHM_SHA_1 = 'SHA-1';
+    const ALGORITHM_SHA_256 = 'SHA-256';
+    const ALGORITHM_SHA_384 = 'SHA-384';
+    const ALGORITHM_SHA_512 = 'SHA-512';
+    const ALGORITHM_RIPEMD = 'RIPEMD';
+    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
+    const ALGORITHM_MAC = 'MAC';
+    const ALGORITHM_HMAC= 'HMAC';
+
+    /**
+     * Mapping between algorithm name and algorithm ID
+     *
+     * @var array
+     * @see https://msdn.microsoft.com/en-us/library/documentformat.openxml.wordprocessing.writeprotection.cryptographicalgorithmsid(v=office.14).aspx
+     */
     private static $algorithmMapping = array(
-        1  => 'md2',
-        2  => 'md4',
-        3  => 'md5',
-        4  => 'sha1',
-        5  => '', // 'mac' -> not possible with hash()
-        6  => 'ripemd',
-        7  => 'ripemd160',
-        8  => '',
-        9  => '', //'hmac' -> not possible with hash()
-        10 => '',
-        11 => '',
-        12 => 'sha256',
-        13 => 'sha384',
-        14 => 'sha512',
+        self::ALGORITHM_MD2 => array(1, 'md2'),
+        self::ALGORITHM_MD4 => array(2, 'md4'),
+        self::ALGORITHM_MD5 => array(3, 'md5'),
+        self::ALGORITHM_SHA_1 => array(4, 'sha1'),
+        self::ALGORITHM_MAC => array(5, ''), // 'mac' -> not possible with hash()
+        self::ALGORITHM_RIPEMD => array(6, 'ripemd'),
+        self::ALGORITHM_RIPEMD_160 => array(7, 'ripemd160'),
+        self::ALGORITHM_HMAC => array(9, ''), //'hmac' -> not possible with hash()
+        self::ALGORITHM_SHA_256 => array(12, 'sha256'),
+        self::ALGORITHM_SHA_384 => array(13, 'sha384'),
+        self::ALGORITHM_SHA_512 => array(14, 'sha512'),
     );
 
     private static $initialCodeArray = array(
@@ -82,12 +97,12 @@ class PasswordEncoder
      * @see https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
      *
      * @param string $password
-     * @param number $algorithmSid
+     * @param string $algorithmName
      * @param string $salt
-     * @param number $spinCount
+     * @param integer $spinCount
      * @return string
      */
-    public static function hashPassword($password, $algorithmSid = 4, $salt = null, $spinCount = 10000)
+    public static function hashPassword($password, $algorithmName = PasswordEncoder::ALGORITHM_SHA_1, $salt = null, $spinCount = 10000)
     {
         $origEncoding = mb_internal_encoding();
         mb_internal_encoding('UTF-8');
@@ -118,7 +133,7 @@ class PasswordEncoder
         // Implementation Notes List:
         //   Word requires that the initial hash of the password with the salt not be considered in the count.
         //   The initial hash of salt + key is not included in the iteration count.
-        $algorithm = self::getAlgorithm($algorithmSid);
+        $algorithm = self::getAlgorithm($algorithmName);
         $generatedKey = hash($algorithm, $salt . $generatedKey, true);
 
         for ($i = 0; $i < $spinCount; $i++) {
@@ -134,12 +149,12 @@ class PasswordEncoder
     /**
      * Get algorithm from self::$algorithmMapping
      *
-     * @param int $sid
+     * @param string $algorithmName
      * @return string
      */
-    private static function getAlgorithm($sid)
+    private static function getAlgorithm($algorithmName)
     {
-        $algorithm = self::$algorithmMapping[$sid];
+        $algorithm = self::$algorithmMapping[$algorithmName][1];
         if ($algorithm == '') {
             $algorithm = 'sha1';
         }
@@ -155,16 +170,17 @@ class PasswordEncoder
      */
     private static function buildCombinedKey($byteChars)
     {
+        $byteCharsLength = count($byteChars);
         // Compute the high-order word
         // Initialize from the initial code array (see above), depending on the passwords length.
-        $highOrderWord = self::$initialCodeArray[count($byteChars) - 1];
+        $highOrderWord = self::$initialCodeArray[$byteCharsLength - 1];
 
         // For each character in the password:
         //   For every bit in the character, starting with the least significant and progressing to (but excluding)
         //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
         //   the Encryption Matrix
-        for ($i = 0; $i < count($byteChars); $i++) {
-            $tmp = self::$passwordMaxLength - count($byteChars) + $i;
+        for ($i = 0; $i < $byteCharsLength; $i++) {
+            $tmp = self::$passwordMaxLength - $byteCharsLength + $i;
             $matrixRow = self::$encryptionMatrix[$tmp];
             for ($intBit = 0; $intBit < 7; $intBit++) {
                 if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
@@ -177,12 +193,12 @@ class PasswordEncoder
         // Initialize with 0
         $lowOrderWord = 0;
         // For each character in the password, going backwards
-        for ($i = count($byteChars) - 1; $i >= 0; $i--) {
+        for ($i = $byteCharsLength - 1; $i >= 0; $i--) {
             // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
             $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
         }
         // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
-        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ count($byteChars) ^ 0xCE4B);
+        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteCharsLength ^ 0xCE4B);
 
         // Combine the Low and High Order Word
         return self::int32(($highOrderWord << 16) + $lowOrderWord);
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 565aab2c..f292583e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -193,7 +193,7 @@ class Settings extends AbstractPart
                 if ($documentProtection->getSalt() == null) {
                     $documentProtection->setSalt(openssl_random_pseudo_bytes(16));
                 }
-                $passwordHash = PasswordEncoder::hashPassword($documentProtection->getPassword(), $documentProtection->getMswordAlgorithmSid(), $documentProtection->getSalt(), $documentProtection->getSpinCount());
+                $passwordHash = PasswordEncoder::hashPassword($documentProtection->getPassword(), $documentProtection->getAlgorithm(), $documentProtection->getSalt(), $documentProtection->getSpinCount());
                 $this->settings['w:documentProtection'] = array(
                     '@attributes' => array(
                         'w:enforcement'         => 1,
diff --git a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
index 7b2bd3e7..c42a6eb4 100644
--- a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
+++ b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
@@ -51,7 +51,7 @@ class PasswordEncoderTest extends \PHPUnit\Framework\TestCase
         $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
 
         //when
-        $hashPassword = PasswordEncoder::hashPassword($password, 4, $salt);
+        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_SHA_1, $salt);
 
         //then
         TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
@@ -67,7 +67,7 @@ class PasswordEncoderTest extends \PHPUnit\Framework\TestCase
         $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
 
         //when
-        $hashPassword = PasswordEncoder::hashPassword($password, 5, $salt);
+        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_MAC, $salt);
 
         //then
         TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
@@ -83,7 +83,7 @@ class PasswordEncoderTest extends \PHPUnit\Framework\TestCase
         $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
 
         //when
-        $hashPassword = PasswordEncoder::hashPassword($password, 5, $salt, 1);
+        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_MAC, $salt, 1);
 
         //then
         TestCase::assertEquals('rDV9sgdDsztoCQlvRCb1lF2wxNg=', $hashPassword);

From f7d2ad7201bc91f79253a6e0fdbcdaf0154679d5 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 23:24:37 +0100
Subject: [PATCH 173/370] formatting

---
 src/PhpWord/Metadata/Protection.php           |  2 +-
 .../Shared/Microsoft/PasswordEncoder.php      | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index bb1cc1ad..634751fb 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -17,8 +17,8 @@
 
 namespace PhpOffice\PhpWord\Metadata;
 
-use PhpOffice\PhpWord\SimpleType\DocProtect;
 use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
+use PhpOffice\PhpWord\SimpleType\DocProtect;
 
 /**
  * Document protection class
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index a3ba345c..a6a607a1 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -32,7 +32,7 @@ class PasswordEncoder
     const ALGORITHM_RIPEMD = 'RIPEMD';
     const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
     const ALGORITHM_MAC = 'MAC';
-    const ALGORITHM_HMAC= 'HMAC';
+    const ALGORITHM_HMAC = 'HMAC';
 
     /**
      * Mapping between algorithm name and algorithm ID
@@ -41,17 +41,17 @@ class PasswordEncoder
      * @see https://msdn.microsoft.com/en-us/library/documentformat.openxml.wordprocessing.writeprotection.cryptographicalgorithmsid(v=office.14).aspx
      */
     private static $algorithmMapping = array(
-        self::ALGORITHM_MD2 => array(1, 'md2'),
-        self::ALGORITHM_MD4 => array(2, 'md4'),
-        self::ALGORITHM_MD5 => array(3, 'md5'),
-        self::ALGORITHM_SHA_1 => array(4, 'sha1'),
-        self::ALGORITHM_MAC => array(5, ''), // 'mac' -> not possible with hash()
-        self::ALGORITHM_RIPEMD => array(6, 'ripemd'),
+        self::ALGORITHM_MD2        => array(1, 'md2'),
+        self::ALGORITHM_MD4        => array(2, 'md4'),
+        self::ALGORITHM_MD5        => array(3, 'md5'),
+        self::ALGORITHM_SHA_1      => array(4, 'sha1'),
+        self::ALGORITHM_MAC        => array(5, ''), // 'mac' -> not possible with hash()
+        self::ALGORITHM_RIPEMD     => array(6, 'ripemd'),
         self::ALGORITHM_RIPEMD_160 => array(7, 'ripemd160'),
-        self::ALGORITHM_HMAC => array(9, ''), //'hmac' -> not possible with hash()
-        self::ALGORITHM_SHA_256 => array(12, 'sha256'),
-        self::ALGORITHM_SHA_384 => array(13, 'sha384'),
-        self::ALGORITHM_SHA_512 => array(14, 'sha512'),
+        self::ALGORITHM_HMAC       => array(9, ''), //'hmac' -> not possible with hash()
+        self::ALGORITHM_SHA_256    => array(12, 'sha256'),
+        self::ALGORITHM_SHA_384    => array(13, 'sha384'),
+        self::ALGORITHM_SHA_512    => array(14, 'sha512'),
     );
 
     private static $initialCodeArray = array(
@@ -99,10 +99,10 @@ class PasswordEncoder
      * @param string $password
      * @param string $algorithmName
      * @param string $salt
-     * @param integer $spinCount
+     * @param int $spinCount
      * @return string
      */
-    public static function hashPassword($password, $algorithmName = PasswordEncoder::ALGORITHM_SHA_1, $salt = null, $spinCount = 10000)
+    public static function hashPassword($password, $algorithmName = self::ALGORITHM_SHA_1, $salt = null, $spinCount = 10000)
     {
         $origEncoding = mb_internal_encoding();
         mb_internal_encoding('UTF-8');

From 5a57409df028bb609f9f180424c0a0f489334b6f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 13 Dec 2017 23:55:48 +0100
Subject: [PATCH 174/370] fix tests

---
 src/PhpWord/Metadata/Protection.php                 |  2 +-
 src/PhpWord/Shared/Microsoft/PasswordEncoder.php    | 11 +++++++++++
 src/PhpWord/Writer/Word2007/Part/Settings.php       |  4 ++--
 tests/PhpWord/Writer/Word2007/Part/SettingsTest.php |  3 ++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 634751fb..35391cb2 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -162,7 +162,7 @@ class Protection
      * @param $algorithm
      * @return self
      */
-    public function setMswordAlgorithmSid($algorithm)
+    public function setAlgorithm($algorithm)
     {
         $this->algorithm = $algorithm;
 
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index a6a607a1..d3a03d97 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -162,6 +162,17 @@ class PasswordEncoder
         return $algorithm;
     }
 
+    /**
+     * Returns the algorithm ID
+     *
+     * @param sting $algorithmName
+     * @return int
+     */
+    public static function getAlgorithmId($algorithmName)
+    {
+        return self::$algorithmMapping[$algorithmName][0];
+    }
+
     /**
      * Build combined key from low-order word and high-order word
      *
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 6ac5ec4a..e56e2612 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -183,7 +183,7 @@ class Settings extends AbstractPart
     private function setDocumentProtection($documentProtection)
     {
         if ($documentProtection->getEditing() !== null) {
-            if (empty($documentProtection->getPassword())) {
+            if ($documentProtection->getPassword() == null) {
                 $this->settings['w:documentProtection'] = array(
                     '@attributes' => array(
                         'w:enforcement' => 1,
@@ -202,7 +202,7 @@ class Settings extends AbstractPart
                         'w:cryptProviderType'   => 'rsaFull',
                         'w:cryptAlgorithmClass' => 'hash',
                         'w:cryptAlgorithmType'  => 'typeAny',
-                        'w:cryptAlgorithmSid'   => $documentProtection->getMswordAlgorithmSid(),
+                        'w:cryptAlgorithmSid'   => PasswordEncoder::getAlgorithmId($documentProtection->getAlgorithm()),
                         'w:cryptSpinCount'      => $documentProtection->getSpinCount(),
                         'w:hash'                => $passwordHash,
                         'w:salt'                => base64_encode($documentProtection->getSalt()),
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 7a355042..1e6af567 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -24,6 +24,7 @@ use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings
@@ -65,7 +66,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $phpWord->getSettings()->getDocumentProtection()->setEditing('readOnly');
         $phpWord->getSettings()->getDocumentProtection()->setPassword('testÄö@€!$&');
         $phpWord->getSettings()->getDocumentProtection()->setSalt(base64_decode('uq81pJRRGFIY5U+E9gt8tA=='));
-        $phpWord->getSettings()->getDocumentProtection()->setMswordAlgorithmSid(1);
+        $phpWord->getSettings()->getDocumentProtection()->setAlgorithm(PasswordEncoder::ALGORITHM_MD2);
         $phpWord->getSettings()->getDocumentProtection()->setSpinCount(10);
 
         $doc = TestHelperDOCX::getDocument($phpWord);

From 5d5362a3fda20d3e79c089510a19e696d836cf63 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 14 Dec 2017 00:15:23 +0100
Subject: [PATCH 175/370] sort imports

---
 tests/PhpWord/Writer/Word2007/Part/SettingsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 1e6af567..50b444b8 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -21,10 +21,10 @@ use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Settings

From 87acd3764bb0a3ce435475cca9b3a123d8df944f Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 14 Dec 2017 12:21:16 -0200
Subject: [PATCH 176/370] Clean elses

---
 src/PhpWord/Shared/OLERead.php           | 40 ++++++++++++------------
 src/PhpWord/Shared/PCLZip/pclzip.lib.php | 20 ++++++------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index 1321b8da..bcdda0c3 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -115,7 +115,7 @@ class OLERead
             $bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
         }
         // @codeCoverageIgnoreEnd
-        
+
         for ($i = 0; $i < $bbdBlocks; ++$i) {
             $bigBlockDepotBlocks[$i] = self::getInt4d($this->data, $pos);
             $pos += 4;
@@ -192,27 +192,27 @@ class OLERead
                 $block = self::getInt4d($this->smallBlockChain, $block*4);
             }
 
-            return $streamData;
-        } else {
-            $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
-            if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
-                ++$numBlocks;
-            }
-
-            if ($numBlocks == 0) {
-                return '';// @codeCoverageIgnore
-            }
-
-            $block = $this->props[$stream]['startBlock'];
-
-            while ($block != -2) {
-                $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-                $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-                $block = self::getInt4d($this->bigBlockChain, $block*4);
-            }
-
             return $streamData;
         }
+
+        $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
+        if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
+            ++$numBlocks;
+        }
+
+        if ($numBlocks == 0) {
+            return '';// @codeCoverageIgnore
+        }
+
+        $block = $this->props[$stream]['startBlock'];
+
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block*4);
+        }
+
+        return $streamData;
     }
 
     /**
diff --git a/src/PhpWord/Shared/PCLZip/pclzip.lib.php b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
index 5620c754..3fbc9327 100644
--- a/src/PhpWord/Shared/PCLZip/pclzip.lib.php
+++ b/src/PhpWord/Shared/PCLZip/pclzip.lib.php
@@ -1244,9 +1244,9 @@ class PclZip
     {
         if (PCLZIP_ERROR_EXTERNAL == 1) {
             return (PclErrorCode());
-        } else {
-            return ($this->error_code);
         }
+
+        return ($this->error_code);
     }
     // --------------------------------------------------------------------------------
 
@@ -1289,9 +1289,9 @@ class PclZip
 
         if ($p_with_code) {
             return ($v_value . ' (' . $this->error_code . ')');
-        } else {
-            return ($v_value);
         }
+
+        return ($v_value);
     }
     // --------------------------------------------------------------------------------
 
@@ -1304,13 +1304,13 @@ class PclZip
     {
         if (PCLZIP_ERROR_EXTERNAL == 1) {
             return (PclErrorString());
-        } else {
-            if ($p_full) {
-                return ($this->errorName(true) . " : " . $this->error_string);
-            } else {
-                return ($this->error_string . " [code " . $this->error_code . "]");
-            }
         }
+
+        if ($p_full) {
+            return ($this->errorName(true) . " : " . $this->error_string);
+        }
+
+        return ($this->error_string . " [code " . $this->error_code . "]");
     }
     // --------------------------------------------------------------------------------
 

From 46a037ebd0ace99f10052d19aa6511a85b471f69 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 18 Dec 2017 17:02:34 +0100
Subject: [PATCH 177/370] add composer scripts

---
 composer.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 70b60b46..41730374 100644
--- a/composer.json
+++ b/composer.json
@@ -34,12 +34,22 @@
             "name": "Antoine de Troostembergh"
         }
     ],
+    "scripts": {
+        "check": [
+            "./vendor/bin/php-cs-fixer fix --ansi --dry-run --diff",
+            "./vendor/bin/phpcs --report-width=200 --report-summary  --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
+            "./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
+            "./vendor/bin/phpunit --color=always"
+        ],
+        "fix": [
+            "./vendor/bin/php-cs-fixer fix --ansi"
+        ]
+    },
     "require": {
         "php": ">=5.3.3",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "zendframework/zend-stdlib": "^2.2 || ^3.0",
-        "phpoffice/common": "^0.2"
+        "zendframework/zend-stdlib": "^2.2 || ^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36",

From 7908491ba3e24f170da5aea61fbf9b85c6c21abb Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 19 Dec 2017 22:14:52 +0100
Subject: [PATCH 178/370] revert mistakenly deleted line

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 41730374..2774ad98 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,8 @@
         "php": ">=5.3.3",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "zendframework/zend-stdlib": "^2.2 || ^3.0"
+        "zendframework/zend-stdlib": "^2.2 || ^3.0",
+        "phpoffice/common": "^0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36",

From 3e6745f14697d74b74e8d3ab9af670c8fad2ee3f Mon Sep 17 00:00:00 2001
From: SRG Group <adam.balint@srg.hu>
Date: Thu, 21 Dec 2017 00:03:52 +0100
Subject: [PATCH 179/370] HTML image support & TextRun paragraph style (#934)

* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
---
 CHANGELOG.md                              |  3 ++
 src/PhpWord/Element/TextRun.php           | 24 +++++++++-
 src/PhpWord/Shared/Html.php               | 58 +++++++++++++++++++++++
 tests/PhpWord/Element/ListItemRunTest.php |  4 +-
 tests/PhpWord/Element/TextRunTest.php     | 33 ++++++++++++-
 tests/PhpWord/Shared/HtmlTest.php         | 19 ++++++++
 6 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51f92434..ae1618a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ This is the last version to support PHP 5.3
 - Implement PageBreak for odt writer @cookiekiller #863 #824
 - Allow to force an update of all fields on opening a document - @troosan #951
 - Allow adding a CheckBox in a TextRun - @irond #727
+- Add support for HTML img tag - @srggroup #934
+- Add support for password protection for docx - @mariahaubner #1019
 
 ### Fixed
 - Loosen dependency to Zend
@@ -43,6 +45,7 @@ This is the last version to support PHP 5.3
 - Fix incorrect image size between windows and mac - @bskrtich #874
 - Fix adding HTML table to document - @mogilvie @arivanbastos #324
 - Fix parsing on/off values (w:val="true|false|1|0|on|off") - @troosan #1221 #1219
+- Fix error on Empty Dropdown Entry - @ComputerTinker #592
 
 ### Deprecated
 - PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
index d8a898b4..6d9ae9f4 100644
--- a/src/PhpWord/Element/TextRun.php
+++ b/src/PhpWord/Element/TextRun.php
@@ -43,7 +43,7 @@ class TextRun extends AbstractContainer
      */
     public function __construct($paragraphStyle = null)
     {
-        $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
+        $this->paragraphStyle = $this->setParagraphStyle($paragraphStyle);
     }
 
     /**
@@ -55,4 +55,26 @@ class TextRun extends AbstractContainer
     {
         return $this->paragraphStyle;
     }
+
+    /**
+     * Set Paragraph style
+     *
+     * @param string|array|\PhpOffice\PhpWord\Style\Paragraph $style
+     * @return string|\PhpOffice\PhpWord\Style\Paragraph
+     */
+    public function setParagraphStyle($style = null)
+    {
+        if (is_array($style)) {
+            $this->paragraphStyle = new Paragraph();
+            $this->paragraphStyle->setStyleByArray($style);
+        } elseif ($style instanceof Paragraph) {
+            $this->paragraphStyle = $style;
+        } elseif (null === $style) {
+            $this->paragraphStyle = new Paragraph();
+        } else {
+            $this->paragraphStyle = $style;
+        }
+
+        return $this->paragraphStyle;
+    }
 }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 739bfb16..8310e515 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -136,6 +136,7 @@ class Html
             'ul'        => array('List',        null,   null,       $styles,    $data,  3,              null),
             'ol'        => array('List',        null,   null,       $styles,    $data,  7,              null),
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
+            'img'       => array('Image',       $node,  $element,   $styles,    null,   null,           null),
             'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
         );
 
@@ -506,6 +507,63 @@ class Html
         return $styles;
     }
 
+    /**
+     * Parse image node
+     *
+     * @param \DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+     *
+     * @return \PhpOffice\PhpWord\Element\Image
+     **/
+    private static function parseImage($node, $element)
+    {
+        $style = array();
+        foreach ($node->attributes as $attribute) {
+            switch ($attribute->name) {
+                case 'src':
+                    $src = $attribute->value;
+                    break;
+                case 'width':
+                    $width = $attribute->value;
+                    $style['width'] = $width;
+                    break;
+                case 'height':
+                    $height = $attribute->value;
+                    $style['height'] = $height;
+                    break;
+                case 'style':
+                    $styleattr = explode(';', $attribute->value);
+                    foreach ($styleattr as $attr) {
+                        if (strpos($attr, ':')) {
+                            list($k, $v) = explode(':', $attr);
+                            switch ($k) {
+                                case 'float':
+                                    if (trim($v) == 'right') {
+                                        $style['hPos'] = \PhpOffice\PhpWord\Style\Image::POS_RIGHT;
+                                        $style['hPosRelTo'] = \PhpOffice\PhpWord\Style\Image::POS_RELTO_PAGE;
+                                        $style['pos'] = \PhpOffice\PhpWord\Style\Image::POS_RELATIVE;
+                                        $style['wrap'] = \PhpOffice\PhpWord\Style\Image::WRAP_TIGHT;
+                                        $style['overlap'] = true;
+                                    }
+                                    if (trim($v) == 'left') {
+                                        $style['hPos'] = \PhpOffice\PhpWord\Style\Image::POS_LEFT;
+                                        $style['hPosRelTo'] = \PhpOffice\PhpWord\Style\Image::POS_RELTO_PAGE;
+                                        $style['pos'] = \PhpOffice\PhpWord\Style\Image::POS_RELATIVE;
+                                        $style['wrap'] = \PhpOffice\PhpWord\Style\Image::WRAP_TIGHT;
+                                        $style['overlap'] = true;
+                                    }
+                                    break;
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        $newElement = $element->addImage($src, $style);
+
+        return $newElement;
+    }
+
     /**
      * Transforms a CSS border style into a word border style
      *
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 999756ba..84beec02 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -27,13 +27,13 @@ class ListItemRunTest extends \PHPUnit\Framework\TestCase
     /**
      * New instance
      */
-    public function testConstructNull()
+    public function testConstruct()
     {
         $oListItemRun = new ListItemRun();
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\ListItemRun', $oListItemRun);
         $this->assertCount(0, $oListItemRun->getElements());
-        $this->assertNull($oListItemRun->getParagraphStyle());
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oListItemRun->getParagraphStyle());
     }
 
     /**
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index 27f5af6b..59b8b89f 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -18,6 +18,8 @@
 namespace PhpOffice\PhpWord\Element;
 
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style\Paragraph;
 
 /**
  * Test class for PhpOffice\PhpWord\Element\TextRun
@@ -29,13 +31,13 @@ class TextRunTest extends \PHPUnit\Framework\TestCase
     /**
      * New instance
      */
-    public function testConstructNull()
+    public function testConstruct()
     {
         $oTextRun = new TextRun();
 
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oTextRun);
         $this->assertCount(0, $oTextRun->getElements());
-        $this->assertNull($oTextRun->getParagraphStyle());
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oTextRun->getParagraphStyle());
     }
 
     /**
@@ -62,6 +64,21 @@ class TextRunTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oTextRun->getParagraphStyle());
     }
 
+    /**
+     * New instance with object
+     */
+    public function testConstructObject()
+    {
+        $oParagraphStyle = new Paragraph();
+        $oParagraphStyle->setAlignment(Jc::BOTH);
+        $oTextRun = new TextRun($oParagraphStyle);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oTextRun);
+        $this->assertCount(0, $oTextRun->getElements());
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oTextRun->getParagraphStyle());
+        $this->assertEquals(Jc::BOTH, $oTextRun->getParagraphStyle()->getAlignment());
+    }
+
     /**
      * Add text
      */
@@ -152,4 +169,16 @@ class TextRunTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Footnote', $element);
         $this->assertCount(1, $oTextRun->getElements());
     }
+
+    /**
+     * Get paragraph style
+     */
+    public function testParagraph()
+    {
+        $oText = new TextRun('paragraphStyle');
+        $this->assertEquals('paragraphStyle', $oText->getParagraphStyle());
+
+        $oText->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => 100));
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oText->getParagraphStyle());
+    }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index bfe24c58..d168c09e 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -252,4 +252,23 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('This is some text', $doc->getElement('/w:document/w:body/w:p/w:r[1]/w:t')->nodeValue);
         $this->assertEquals('with a linebreak.', $doc->getElement('/w:document/w:body/w:p/w:r[2]/w:t')->nodeValue);
     }
+
+    public function testParseImage()
+    {
+        $src = __DIR__ . '/../_files/images/firefox.png';
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/><img src="' . $src . '" style="float: left;"/></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+        $this->assertStringMatchesFormat('%Swidth:150pt%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        $this->assertStringMatchesFormat('%Sheight:200pt%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        $this->assertStringMatchesFormat('%Smso-position-horizontal:right%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        $this->assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
+    }
 }

From ed704da5b2fcf76f8c0dca4b9836ae3bcda65604 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Dec 2017 01:24:20 +0100
Subject: [PATCH 180/370] set release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1618a2..47567dfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.14.0 (?? Dec 2017)
+v0.14.0 (28 Dec 2017)
 ----------------------
 This release fixes several bugs and adds some new features.
 This is the last version to support PHP 5.3

From 56720df4875df75ed42ed07f4e3bdfc851cccce1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Dec 2017 01:32:34 +0100
Subject: [PATCH 181/370] update version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 85808888..ac5f3b95 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ You can of course also manually edit your composer.json file
 ```json
 {
     "require": {
-       "phpoffice/phpword": "v0.13.*"
+       "phpoffice/phpword": "v0.14.*"
     }
 }
 ```

From 7250b15e74ff91c72d103ca40ae12f4524a0bf76 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Dec 2017 08:33:02 +0100
Subject: [PATCH 182/370] Title can be added in Cell

---
 src/PhpWord/Element/AbstractContainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 0de0cbce..e3022b50 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -209,7 +209,7 @@ abstract class AbstractContainer extends AbstractElement
             'Footnote'      => array('Section', 'TextRun', 'Cell'),
             'Endnote'       => array('Section', 'TextRun', 'Cell'),
             'PreserveText'  => array('Section', 'Header', 'Footer', 'Cell'),
-            'Title'         => array('Section'),
+            'Title'         => array('Section', 'Cell'),
             'TOC'           => array('Section'),
             'PageBreak'     => array('Section'),
             'Chart'         => array('Section', 'Cell'),

From 512cf952aeaaa9badcce3c0eb88114f6beaeeb22 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Dec 2017 20:42:37 +0100
Subject: [PATCH 183/370] randomise temp directory name to avoid collisions

---
 src/PhpWord/Writer/AbstractWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 50a0cad3..2be03b06 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -216,7 +216,7 @@ abstract class AbstractWriter implements WriterInterface
     protected function getTempFile($filename)
     {
         // Temporary directory
-        $this->setTempDir(Settings::getTempDir() . '/PHPWordWriter/');
+        $this->setTempDir(Settings::getTempDir() . uniqid('/PHPWordWriter_'). '/');
 
         // Temporary file
         $this->originalFilename = $filename;

From fce1bf28c870132bef8c0f604477e14b2fa54185 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 25 Dec 2017 22:05:46 +0100
Subject: [PATCH 184/370] format code

---
 src/PhpWord/Writer/AbstractWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 2be03b06..884769d7 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -216,7 +216,7 @@ abstract class AbstractWriter implements WriterInterface
     protected function getTempFile($filename)
     {
         // Temporary directory
-        $this->setTempDir(Settings::getTempDir() . uniqid('/PHPWordWriter_'). '/');
+        $this->setTempDir(Settings::getTempDir() . uniqid('/PHPWordWriter_') . '/');
 
         // Temporary file
         $this->originalFilename = $filename;

From b614497ae6dd44280be1c2dda56772198bcd25ae Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 02:30:53 +0100
Subject: [PATCH 185/370] fix dependencies to have 7.1 compatible build (#1228)

* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
---
 .scrutinizer.yml                              |  2 +-
 .travis.yml                                   |  4 +-
 CHANGELOG.md                                  |  4 +-
 composer.json                                 |  9 ++--
 docs/ISSUE_TEMPLATE.md                        | 17 +++++--
 docs/PULL_REQUEST_TEMPLATE.md                 |  7 ++-
 run_tests.sh                                  | 20 --------
 src/PhpWord/Element/AbstractElement.php       | 12 ++---
 src/PhpWord/Element/Field.php                 |  2 +-
 src/PhpWord/Element/TrackChange.php           |  2 -
 src/PhpWord/Metadata/Protection.php           |  2 +-
 src/PhpWord/Reader/Word2007/Settings.php      |  2 +-
 src/PhpWord/Shared/Converter.php              | 38 +++++++--------
 src/PhpWord/Shared/Html.php                   |  1 +
 .../Shared/Microsoft/PasswordEncoder.php      |  2 +-
 src/PhpWord/Shared/ZipArchive.php             |  2 +-
 src/PhpWord/Style/Paper.php                   |  8 ++--
 src/PhpWord/Writer/PDF/MPDF.php               | 24 +++++++---
 src/PhpWord/Writer/Word2007/Part/Comments.php |  4 +-
 tests/PhpWord/Shared/ZipArchiveTest.php       | 46 +++++++++----------
 tests/PhpWord/Writer/ODTextTest.php           |  1 +
 tests/PhpWord/Writer/RTFTest.php              |  1 +
 .../Writer/Word2007/Part/DocumentTest.php     |  3 +-
 23 files changed, 105 insertions(+), 108 deletions(-)
 delete mode 100755 run_tests.sh

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 6f982d8e..c8fe57cf 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -15,7 +15,7 @@ tools:
             ruleset: phpmd.xml.dist
     external_code_coverage:
         enabled: true
-        timeout: 900
+        timeout: 1200
     php_cpd: true
     # php_sim: # Temporarily disabled to allow focus on things other than duplicates
     #    min_mass: 40
diff --git a/.travis.yml b/.travis.yml
index 0ec84081..d63b7bb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,14 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
 
 matrix:
     include:
         - php: 5.6
           env: COVERAGE=1
     allow_failures:
-        - php: 7.0
-        - php: 7.1
+        - php: 7.2
 
 cache:
     directories:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47567dfc..93945189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,10 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.14.0 (28 Dec 2017)
+v0.14.0 (29 Dec 2017)
 ----------------------
 This release fixes several bugs and adds some new features.
-This is the last version to support PHP 5.3
+This version brings compatibility with PHP 7.0 & 7.1
 
 ### Added
 - Possibility to control the footnote numbering - @troosan #1068
diff --git a/composer.json b/composer.json
index 2774ad98..3cc4b131 100644
--- a/composer.json
+++ b/composer.json
@@ -46,23 +46,22 @@
         ]
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
         "zendframework/zend-stdlib": "^2.2 || ^3.0",
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36",
+        "phpunit/phpunit": "^4.8.36 || ^5.0",
         "phpdocumentor/phpdocumentor":"2.*",
-        "twig/twig":"1.27",
         "squizlabs/php_codesniffer": "^2.7",
         "friendsofphp/php-cs-fixer": "^2.0",
         "phpmd/phpmd": "2.*",
-        "phploc/phploc": "2.*",
+        "phploc/phploc": "2.* || 3.* || 4.*",
         "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
-        "mpdf/mpdf": "5.*"
+        "mpdf/mpdf": "5.* || 6.* || 7.*"
     },
     "suggest": {
         "ext-zip": "Allows writing OOXML and ODF",
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
index 58981f8e..ee811b00 100644
--- a/docs/ISSUE_TEMPLATE.md
+++ b/docs/ISSUE_TEMPLATE.md
@@ -1,28 +1,35 @@
-Issue tracker is **ONLY** used for reporting bugs. NO NEW FEATURE ACCEPTED! Use [stackoverflow](https://stackoverflow.com/questions/tagged/phpword) for supporting issues.
+This is:
+
+- [ ] a bug report
+- [ ] a feature request
+- [ ] **not** a usage question (ask them on https://stackoverflow.com/questions/tagged/phpword)
 
 # Expected Behavior
 
 Please describe the behavior you are expecting.
 
-# Current Behavior
+### Current Behavior
 
 What is the current behavior?
 
-# Failure Information
+### Failure Information
 
 Please help provide information about the failure.
 
-## How to Reproduce
+### How to Reproduce
 
 Please provide a code sample that reproduces the issue.
 
 ```php
+<?php
+require __DIR__ . '/vendor/autoload.php';
+
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->addSection();
 $section->...
 ```
 
-## Context
+### Context
 
 * PHP version:
 * PHPWord version: 0.14
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index ad9788c4..cff513a3 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,11 @@
-# Description
+### Description
 
 Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
 
 Fixes # (issue)
 
-# Checklist:
+### Checklist:
 
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have run phpunit, phpcs, php-cs-fixer, phpmd
+- [ ] I have run `composer check` and no errors were reported
 - [ ] The new code is covered by unit tests
 - [ ] I have update the documentation to describe the changes
diff --git a/run_tests.sh b/run_tests.sh
deleted file mode 100755
index a5d94259..00000000
--- a/run_tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-echo "Running composer update"
-composer update
-
-## PHP_CodeSniffer
-echo "Running CodeSniffer"
-./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
-
-## PHP-CS-Fixer
-echo "Running CS Fixer"
-./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
-
-## PHP Mess Detector
-echo "Running Mess Detector"
-./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
-
-## PHPUnit
-echo "Running PHPUnit"
-./vendor/bin/phpunit -c ./
-
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 81e18528..a65c50f4 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -228,7 +228,7 @@ abstract class AbstractElement
     /**
      * Get element unique ID
      *
-     * @return int
+     * @return string
      */
     public function getElementId()
     {
@@ -425,18 +425,18 @@ abstract class AbstractElement
     /**
      * Set enum value
      *
-     * @param mixed $value
-     * @param array $enum
-     * @param mixed $default
+     * @param string|null $value
+     * @param string[] $enum
+     * @param string|null $default
      *
      * @throws \InvalidArgumentException
-     * @return mixed
+     * @return string|null
      *
      * @todo Merge with the same method in AbstractStyle
      */
     protected function setEnumVal($value = null, $enum = array(), $default = null)
     {
-        if ($value != null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
+        if ($value !== null && trim($value) != '' && !empty($enum) && !in_array($value, $enum)) {
             throw new \InvalidArgumentException("Invalid style value: {$value}");
         } elseif ($value === null || trim($value) == '') {
             $value = $default;
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 6ea63c6b..7b33a479 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -211,7 +211,7 @@ class Field extends AbstractElement
      * @throws \InvalidArgumentException
      * @return null|string|TextRun
      */
-    public function setText($text)
+    public function setText($text = null)
     {
         if (isset($text)) {
             if (is_string($text) || $text instanceof TextRun) {
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index d14fc201..44327f26 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -52,8 +52,6 @@ class TrackChange extends AbstractContainer
     {
         $this->author = $author;
         $this->date = $date;
-
-        return $this;
     }
 
     /**
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 35391cb2..39ebc3de 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -182,7 +182,7 @@ class Protection
     /**
      * Set salt. Salt HAS to be 16 characters, or an exception will be thrown.
      *
-     * @param $salt
+     * @param string $salt
      * @throws \InvalidArgumentException
      * @return self
      */
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index c116425e..ccdbed25 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -152,7 +152,7 @@ class Settings extends AbstractPart
         $revisionView = new TrackChangesView();
         $revisionView->setMarkup(filter_var($xmlReader->getAttribute('w:markup', $node), FILTER_VALIDATE_BOOLEAN));
         $revisionView->setComments($xmlReader->getAttribute('w:comments', $node));
-        $revisionView->setInsDel($xmlReader->getAttribute('w:insDel', $node));
+        $revisionView->setInsDel(filter_var($xmlReader->getAttribute('w:insDel', $node), FILTER_VALIDATE_BOOLEAN));
         $revisionView->setFormatting(filter_var($xmlReader->getAttribute('w:formatting', $node), FILTER_VALIDATE_BOOLEAN));
         $revisionView->setInkAnnotations(filter_var($xmlReader->getAttribute('w:inkAnnotations', $node), FILTER_VALIDATE_BOOLEAN));
         $phpWord->getSettings()->setRevisionView($revisionView);
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index bae8985d..56687c98 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -33,7 +33,7 @@ class Converter
     /**
      * Convert centimeter to twip
      *
-     * @param int $centimeter
+     * @param float $centimeter
      * @return float
      */
     public static function cmToTwip($centimeter = 1)
@@ -44,7 +44,7 @@ class Converter
     /**
      * Convert centimeter to inch
      *
-     * @param int $centimeter
+     * @param float $centimeter
      * @return float
      */
     public static function cmToInch($centimeter = 1)
@@ -55,7 +55,7 @@ class Converter
     /**
      * Convert centimeter to pixel
      *
-     * @param int $centimeter
+     * @param float $centimeter
      * @return float
      */
     public static function cmToPixel($centimeter = 1)
@@ -66,7 +66,7 @@ class Converter
     /**
      * Convert centimeter to point
      *
-     * @param int $centimeter
+     * @param float $centimeter
      * @return float
      */
     public static function cmToPoint($centimeter = 1)
@@ -77,8 +77,8 @@ class Converter
     /**
      * Convert centimeter to EMU
      *
-     * @param int $centimeter
-     * @return int
+     * @param float $centimeter
+     * @return float
      */
     public static function cmToEmu($centimeter = 1)
     {
@@ -88,8 +88,8 @@ class Converter
     /**
      * Convert inch to twip
      *
-     * @param int $inch
-     * @return int
+     * @param float $inch
+     * @return float
      */
     public static function inchToTwip($inch = 1)
     {
@@ -99,7 +99,7 @@ class Converter
     /**
      * Convert inch to centimeter
      *
-     * @param int $inch
+     * @param float $inch
      * @return float
      */
     public static function inchToCm($inch = 1)
@@ -110,8 +110,8 @@ class Converter
     /**
      * Convert inch to pixel
      *
-     * @param int $inch
-     * @return int
+     * @param float $inch
+     * @return float
      */
     public static function inchToPixel($inch = 1)
     {
@@ -121,8 +121,8 @@ class Converter
     /**
      * Convert inch to point
      *
-     * @param int $inch
-     * @return int
+     * @param float $inch
+     * @return float
      */
     public static function inchToPoint($inch = 1)
     {
@@ -132,8 +132,8 @@ class Converter
     /**
      * Convert inch to EMU
      *
-     * @param int $inch
-     * @return int
+     * @param float $inch
+     * @return float
      */
     public static function inchToEmu($inch = 1)
     {
@@ -144,7 +144,7 @@ class Converter
      * Convert pixel to twip
      *
      * @param int $pixel
-     * @return int
+     * @return float
      */
     public static function pixelToTwip($pixel = 1)
     {
@@ -188,7 +188,7 @@ class Converter
      * Convert point to twip unit
      *
      * @param int $point
-     * @return int
+     * @return float
      */
     public static function pointToTwip($point = 1)
     {
@@ -210,7 +210,7 @@ class Converter
      * Convert point to EMU
      *
      * @param int $point
-     * @return int
+     * @return float
      */
     public static function pointToEmu($point = 1)
     {
@@ -221,7 +221,7 @@ class Converter
      * Convert EMU to pixel
      *
      * @param int $emu
-     * @return int
+     * @return float
      */
     public static function emuToPixel($emu = 1)
     {
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 8310e515..d8a10b57 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -518,6 +518,7 @@ class Html
     private static function parseImage($node, $element)
     {
         $style = array();
+        $src = null;
         foreach ($node->attributes as $attribute) {
             switch ($attribute->name) {
                 case 'src':
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index d3a03d97..1c7b4c6c 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -165,7 +165,7 @@ class PasswordEncoder
     /**
      * Returns the algorithm ID
      *
-     * @param sting $algorithmName
+     * @param string $algorithmName
      * @return int
      */
     public static function getAlgorithmId($algorithmName)
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index bb42a92a..3d8d0a41 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -161,7 +161,7 @@ class ZipArchive
     {
         if (!$this->usePclzip) {
             if ($this->zip->close() === false) {
-                throw new Exception("Could not close zip file {$this->filename}.");
+                throw new Exception("Could not close zip file {$this->filename}: ");
             }
         }
 
diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index 2fbf59d2..09e4769e 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -118,14 +118,14 @@ class Paper extends AbstractStyle
     /**
      * Width
      *
-     * @var int (twip)
+     * @var float (twip)
      */
     private $width;
 
     /**
      * Height
      *
-     * @var int (twip)
+     * @var float (twip)
      */
     private $height;
 
@@ -175,7 +175,7 @@ class Paper extends AbstractStyle
     /**
      * Get width
      *
-     * @return int
+     * @return float
      */
     public function getWidth()
     {
@@ -185,7 +185,7 @@ class Paper extends AbstractStyle
     /**
      * Get height
      *
-     * @return int
+     * @return float
      */
     public function getHeight()
     {
diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index 80c2eccf..e238057b 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\PDF;
 
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Writer\WriterInterface;
 
 /**
@@ -27,12 +29,14 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
  */
 class MPDF extends AbstractRenderer implements WriterInterface
 {
-    /**
-     * Name of renderer include file
-     *
-     * @var string
-     */
-    protected $includeFile = 'mpdf.php';
+    public function __construct(PhpWord $phpWord)
+    {
+        if (file_exists(Settings::getPdfRendererPath() . '/mpdf.php')) {
+            // MPDF version 5.* needs this file to be included, later versions not
+            $this->includeFile = 'mpdf.php';
+        }
+        parent::__construct($phpWord);
+    }
 
     /**
      * Save PhpWord to file.
@@ -48,7 +52,13 @@ class MPDF extends AbstractRenderer implements WriterInterface
         $orientation = strtoupper('portrait');
 
         //  Create PDF
-        $pdf = new \mpdf();
+        if ($this->includeFile != null) {
+            // MPDF version 5.*
+            $pdf = new \mpdf();
+        } else {
+            // MPDF version > 6.*
+            $pdf = new \Mpdf\Mpdf();
+        }
         $pdf->_setPageSize($paperSize, $orientation);
         $pdf->addPage($orientation);
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index 4551ca92..2b8f9267 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -29,7 +29,7 @@ class Comments extends AbstractPart
     /**
      * Comments collection to be written
      *
-     * @var \PhpOffice\PhpWord\Collection\Comments
+     * @var \PhpOffice\PhpWord\Element\Comment[]
      */
     protected $elements;
 
@@ -92,7 +92,7 @@ class Comments extends AbstractPart
     /**
      * Set element
      *
-     * @param \PhpOffice\PhpWord\Collection\Comments $elements
+     * @param \PhpOffice\PhpWord\Element\Comment[] $elements
      * @return self
      */
     public function setElements($elements)
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index 91f0f030..cb095127 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -27,34 +27,34 @@ use PhpOffice\PhpWord\Settings;
  */
 class ZipArchiveTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * Test close method exception: Working in local, not working in Travis
-     *
-     * expectedException \PhpOffice\PhpWord\Exception\Exception
-     * expectedExceptionMessage Could not close zip file
-     * covers ::close
-     */
-    public function testCloseException()
-    {
-        // $zipFile = __DIR__ . "/../_files/documents/ziptest.zip";
+//     /**
+//      * Test close method exception: Working in local, not working in Travis
+//      *
+//      * expectedException \PhpOffice\PhpWord\Exception\Exception
+//      * expectedExceptionMessage Could not close zip file
+//      * covers ::close
+//      */
+//     public function testCloseException()
+//     {
+//         $zipFile = __DIR__ . "/../_files/documents/ziptest.zip";
 
-        // $object = new ZipArchive();
-        // $object->open($zipFile, ZipArchive::CREATE);
-        // $object->addFromString('content/string.txt', 'Test');
+//         $object = new ZipArchive();
+//         $object->open($zipFile, ZipArchive::CREATE);
+//         $object->addFromString('content/string.txt', 'Test');
 
-        // // Lock the file
-        // $resource = fopen($zipFile, "w");
-        // flock($resource, LOCK_EX);
+//         // Lock the file
+//         $resource = fopen($zipFile, "w");
+//         flock($resource, LOCK_EX);
 
-        // // Closing the file should throws an exception
-        // $object->close();
+//         // Closing the file should throws an exception
+//         $object->close();
 
-        // // Unlock the file
-        // flock($resource, LOCK_UN);
-        // fclose($resource);
+//         // Unlock the file
+//         flock($resource, LOCK_UN);
+//         fclose($resource);
 
-        // @unlink($zipFile);
-    }
+//         @unlink($zipFile);
+//     }
 
     /**
      * Test all methods
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index bb1b9538..1984de0f 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -110,6 +110,7 @@ class ODTextTest extends \PHPUnit\Framework\TestCase
         $section->addText('Test');
         $writer = new ODText($phpWord);
         $writer->save('php://output');
+        $this->assertNotNull($this->getActualOutput());
     }
 
     /**
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index f4442043..803087e5 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -111,5 +111,6 @@ class RTFTest extends \PHPUnit\Framework\TestCase
         $section->addText(htmlspecialchars('Test', ENT_COMPAT, 'UTF-8'));
         $writer = new RTF($phpWord);
         $writer->save('php://output');
+        $this->assertNotNull($this->getActualOutput());
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 42c098cd..6998e717 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -58,7 +58,8 @@ class DocumentTest extends \PHPUnit\Framework\TestCase
         $docInfo->setCustomProperty('key6', new \DateTime());
         $docInfo->setCustomProperty('key7', time(), DocInfo::PROPERTY_TYPE_DATE);
 
-        TestHelperDOCX::getDocument($phpWord);
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertNotNull($doc);
 
 //         $this->assertTrue($doc->elementExists('/Properties/property[name="key1"]/vt:lpwstr'));
 //         $this->assertTrue($doc->elementExists('/Properties/property[name="key2"]/vt:bool'));

From fd7ee764380ad1c99c9075be4963d19d239bec54 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 03:01:36 +0100
Subject: [PATCH 186/370] create alias for develop branch

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 3cc4b131..aa4a2415 100644
--- a/composer.json
+++ b/composer.json
@@ -74,5 +74,10 @@
         "psr-4": {
             "PhpOffice\\PhpWord\\": "src/PhpWord"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "0.15.0-dev"
+        }
     }
 }

From d2b9e88047c0533db351bcefc0bedbe703b09411 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 14:36:07 +0100
Subject: [PATCH 187/370] add parsing of "align" HTML attribute

---
 CHANGELOG.md                      |  7 ++++++
 samples/Sample_26_Html.php        |  2 +-
 src/PhpWord/Shared/Html.php       | 39 ++++++++++++++++++++-----------
 tests/PhpWord/Shared/HtmlTest.php |  4 +++-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93945189..b5396d8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+v0.15.0 (?? ??? 2018)
+----------------------
+### Added
+- Parsing of "align" HTML attribute - @troosan
+
+### Fixed
+
 v0.14.0 (29 Dec 2017)
 ----------------------
 This release fixes several bugs and adds some new features.
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index ba06b063..b993f834 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -28,7 +28,7 @@ $html .= '<ul>
                 </li>
             </ul>';
 
-$html .= '<table style="width: 50%; border: 6px #0000FF double;">
+$html .= '<table align="center" style="width: 50%; border: 6px #0000FF double;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
                         <th style="width: 50pt">header a</th>
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index d8a10b57..38d326c1 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -85,6 +85,8 @@ class Html
                     case 'style':
                         $styles = self::parseStyle($attribute, $styles);
                         break;
+                    case 'align':
+                        $styles['alignment'] = self::mapAlign($attribute->value);
                 }
             }
         }
@@ -431,20 +433,7 @@ class Html
                     }
                     break;
                 case 'text-align':
-                    switch ($cValue) {
-                        case 'left':
-                            $styles['alignment'] = Jc::START;
-                            break;
-                        case 'right':
-                            $styles['alignment'] = Jc::END;
-                            break;
-                        case 'center':
-                            $styles['alignment'] = Jc::CENTER;
-                            break;
-                        case 'justify':
-                            $styles['alignment'] = Jc::BOTH;
-                            break;
-                    }
+                    $styles['alignment'] = self::mapAlign($cValue);
                     break;
                 case 'font-size':
                     $styles['size'] = Converter::cssToPoint($cValue);
@@ -584,6 +573,28 @@ class Html
         }
     }
 
+    /**
+     * Transforms a HTML/CSS alignment into a \PhpOffice\PhpWord\SimpleType\Jc
+     *
+     * @param string $cssAlignment
+     * @return string|null
+     */
+    private static function mapAlign($cssAlignment)
+    {
+        switch ($cssAlignment) {
+            case 'left':
+                return Jc::START;
+            case 'right':
+                return Jc::END;
+            case 'center':
+                return Jc::CENTER;
+            case 'justify':
+                return Jc::BOTH;
+        }
+
+        return null;
+    }
+
     /**
      * Parse line break
      *
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index d168c09e..c7d36470 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -187,7 +187,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
-        $html = '<table style="width: 50%; border: 6px #0000FF solid;">
+        $html = '<table align="left" style="width: 50%; border: 6px #0000FF solid;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
                         <th style="width: 50pt">header a</th>
@@ -205,6 +205,8 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tblPr/w:jc'));
+        $this->assertEquals(Jc::START, $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tblPr/w:jc', 'w:val'));
     }
 
     /**

From 1d8e7b8374547fac04c432cda2f54503077829f2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 14:36:56 +0100
Subject: [PATCH 188/370] split composer scripts, add description (only works
 with composer 1.6)

---
 composer.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aa4a2415..a79c8e19 100644
--- a/composer.json
+++ b/composer.json
@@ -35,16 +35,28 @@
         }
     ],
     "scripts": {
+        "test": [
+            "./vendor/bin/phpunit --color=always"
+        ],
+        "test-no-coverage": [
+            "./vendor/bin/phpunit --color=always --no-coverage"
+        ],
         "check": [
             "./vendor/bin/php-cs-fixer fix --ansi --dry-run --diff",
             "./vendor/bin/phpcs --report-width=200 --report-summary  --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
             "./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
-            "./vendor/bin/phpunit --color=always"
+            "@test"
         ],
         "fix": [
             "./vendor/bin/php-cs-fixer fix --ansi"
         ]
     },
+    "scripts-descriptions": {
+        "test": "Runs all unit tests",
+        "test-no-coverage": "Runs all unit tests, without code coverage",
+        "check": "Runs PHP CheckStyle and PHP Mess detector",
+        "fix": "Fixes issues found by PHP-CS"
+    },
     "require": {
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",

From b20cd4fa9f5db9ee8c028d7ebe34597e9c540340 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 14:37:26 +0100
Subject: [PATCH 189/370] output the source code of the sample that was run

---
 samples/Sample_Header.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index c4996049..36478ad6 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -43,13 +43,19 @@ $pageHeading = IS_INDEX ? '' : "<h1>{$pageHeading}</h1>";
 // Populate samples
 $files = '';
 if ($handle = opendir('.')) {
-    while (false !== ($file = readdir($handle))) {
+    $sampleFiles = array();
+    while (false !== ($sampleFile = readdir($handle))) {
+        $sampleFiles[] = $sampleFile;
+    }
+    sort($sampleFiles);
+    closedir($handle);
+
+    foreach ($sampleFiles as $file) {
         if (preg_match('/^Sample_\d+_/', $file)) {
             $name = str_replace('_', ' ', preg_replace('/(Sample_|\.php)/', '', $file));
             $files .= "<li><a href='{$file}'>{$name}</a></li>";
         }
     }
-    closedir($handle);
 }
 
 /**
@@ -78,6 +84,11 @@ function write($phpWord, $filename, $writers)
     }
 
     $result .= getEndingNotes($writers);
+    $result .= '<pre><code>';
+    if (file_exists($filename . '.php')) {
+        $result .= highlight_file($filename . '.php', true);
+    }
+    $result .= '</code></pre>';
 
     return $result;
 }

From 46e179d1484b12005a0882e5bf12ee76bb5c6856 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 14:42:48 +0100
Subject: [PATCH 190/370] add instructions on how to run the samples in a
 browser

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ac5f3b95..4e3d1e2d 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,8 @@ $objWriter->save('helloWorld.html');
 /* Note: we skip PDF, because "HTML-to-PDF" approach is used to create PDF documents. */
 ```
 
-More examples are provided in the [samples folder](samples/). You can also read the [Developers' Documentation](http://phpword.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPWord/docs/master/) for more detail.
+More examples are provided in the [samples folder](samples/). For an easy access to those samples launch `php -S localhost:8000` in the samples directory then browse to [http://localhost:8000](http://localhost:8000) to view the samples.
+You can also read the [Developers' Documentation](http://phpword.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPWord/docs/master/) for more detail.
 
 ## Contributing
 

From 709ea1e14c2765ef2c439a46bafde1e027bd23f1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 14:48:12 +0100
Subject: [PATCH 191/370] update changelog [skip ci]

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5396d8d..1f22bb2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 v0.15.0 (?? ??? 2018)
 ----------------------
 ### Added
-- Parsing of "align" HTML attribute - @troosan
+- Parsing of "align" HTML attribute - @troosan #1231
 
 ### Fixed
 

From 526d0ac8defcf42354a402ce6e112fe21a89848c Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 03:01:36 +0100
Subject: [PATCH 192/370] create alias for develop branch

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 3cc4b131..aa4a2415 100644
--- a/composer.json
+++ b/composer.json
@@ -74,5 +74,10 @@
         "psr-4": {
             "PhpOffice\\PhpWord\\": "src/PhpWord"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "0.15.0-dev"
+        }
     }
 }

From 400a8e65d35010c88076e425aec7af1f9132e331 Mon Sep 17 00:00:00 2001
From: Maxim <sailormax@live.com>
Date: Fri, 29 Dec 2017 21:19:35 +0200
Subject: [PATCH 193/370] rename 'Object' classes to 'ObjectElement' (php 7.2
 compatibility) (#1185)

merge develop branch
---
 .travis.yml                                   |  5 +++++
 CHANGELOG.md                                  |  3 ++-
 src/PhpWord/Element/AbstractContainer.php     |  6 ++---
 src/PhpWord/Element/AbstractElement.php       |  7 ++++--
 .../Element/{Object.php => OLEObject.php}     |  4 ++--
 .../Element/{Object.php => OLEObject.php}     |  6 ++---
 tests/PhpWord/Element/CellTest.php            |  2 +-
 tests/PhpWord/Element/ObjectTest.php          | 22 +++++++++----------
 tests/PhpWord/Element/SectionTest.php         |  2 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |  2 +-
 10 files changed, 34 insertions(+), 25 deletions(-)
 rename src/PhpWord/Element/{Object.php => OLEObject.php} (98%)
 rename src/PhpWord/Writer/Word2007/Element/{Object.php => OLEObject.php} (95%)

diff --git a/.travis.yml b/.travis.yml
index d63b7bb2..148877ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,11 @@ matrix:
         - php: 5.6
           env: COVERAGE=1
     allow_failures:
+<<<<<<< HEAD
+=======
+        - php: 7.0
+        - php: 7.1
+>>>>>>> branch 'php72_support_object_classes' of https://github.com/SailorMax/PHPWord
         - php: 7.2
 
 cache:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f22bb2e..71b331d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,7 +37,8 @@ This version brings compatibility with PHP 7.0 & 7.1
 ### Fixed
 - Loosen dependency to Zend
 - Images are not being printed when generating PDF - @hubertinio #1074 #431
-- Fixed some PHP 7 warnings - @likeuntomurphy #927
+- Fixed some PHP 7 warnings - @	likeuntomurphy #927
+- Fixed PHP 7.2 compatibility (renamed `Object` class names to `ObjectElement`) - @SailorMax #1185
 - Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
 - Fixed image loading over https - @troosan #988
 - Impossibility to set different even and odd page headers - @troosan #981
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index e3022b50..b00424b7 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -37,7 +37,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method PageBreak addPageBreak()
  * @method Table addTable(mixed $style = null)
  * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
- * @method \PhpOffice\PhpWord\Element\Object addObject(string $source, mixed $style = null)
+ * @method \PhpOffice\PhpWord\Element\OLEObject addObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
  * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
  * @method Line addLine(mixed $lineStyle = null)
@@ -87,7 +87,7 @@ abstract class AbstractContainer extends AbstractElement
         );
         $functions = array();
         foreach ($elements as $element) {
-            $functions['add' . strtolower($element)] = $element;
+            $functions['add' . strtolower($element)] = $element == 'Object' ? 'OLEObject' : $element;
         }
 
         // Run valid `add` command
@@ -193,7 +193,7 @@ abstract class AbstractContainer extends AbstractElement
             'Link'          => $generalContainers,
             'TextBreak'     => $generalContainers,
             'Image'         => $generalContainers,
-            'Object'        => $generalContainers,
+            'OLEObject'     => $generalContainers,
             'Field'         => $generalContainers,
             'Line'          => $generalContainers,
             'Shape'         => $generalContainers,
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index a65c50f4..63892b74 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -358,11 +358,14 @@ abstract class AbstractElement
      */
     private function setMediaRelation()
     {
-        if (!$this instanceof Link && !$this instanceof Image && !$this instanceof Object) {
+        if (!$this instanceof Link && !$this instanceof Image && !$this instanceof OLEObject) {
             return;
         }
 
         $elementName = substr(get_class($this), strrpos(get_class($this), '\\') + 1);
+        if ($elementName == 'OLEObject') {
+            $elementName = 'Object';
+        }
         $mediaPart = $this->getMediaPart();
         $source = $this->getSource();
         $image = null;
@@ -372,7 +375,7 @@ abstract class AbstractElement
         $rId = Media::addElement($mediaPart, strtolower($elementName), $source, $image);
         $this->setRelationId($rId);
 
-        if ($this instanceof Object) {
+        if ($this instanceof OLEObject) {
             $icon = $this->getIcon();
             $rId = Media::addElement($mediaPart, 'image', $icon, new Image($icon));
             $this->setImageRelationId($rId);
diff --git a/src/PhpWord/Element/Object.php b/src/PhpWord/Element/OLEObject.php
similarity index 98%
rename from src/PhpWord/Element/Object.php
rename to src/PhpWord/Element/OLEObject.php
index 8fe83224..5da94c3a 100644
--- a/src/PhpWord/Element/Object.php
+++ b/src/PhpWord/Element/OLEObject.php
@@ -21,9 +21,9 @@ use PhpOffice\PhpWord\Exception\InvalidObjectException;
 use PhpOffice\PhpWord\Style\Image as ImageStyle;
 
 /**
- * Object element
+ * OLEObject element
  */
-class Object extends AbstractElement
+class OLEObject extends AbstractElement
 {
     /**
      * Ole-Object Src
diff --git a/src/PhpWord/Writer/Word2007/Element/Object.php b/src/PhpWord/Writer/Word2007/Element/OLEObject.php
similarity index 95%
rename from src/PhpWord/Writer/Word2007/Element/Object.php
rename to src/PhpWord/Writer/Word2007/Element/OLEObject.php
index 8231ec0c..50891d97 100644
--- a/src/PhpWord/Writer/Word2007/Element/Object.php
+++ b/src/PhpWord/Writer/Word2007/Element/OLEObject.php
@@ -20,11 +20,11 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Image as ImageStyleWriter;
 
 /**
- * Object element writer
+ * OLEObject element writer
  *
  * @since 0.10.0
  */
-class Object extends AbstractElement
+class OLEObject extends AbstractElement
 {
     /**
      * Write object element.
@@ -33,7 +33,7 @@ class Object extends AbstractElement
     {
         $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
-        if (!$element instanceof \PhpOffice\PhpWord\Element\Object) {
+        if (!$element instanceof \PhpOffice\PhpWord\Element\OLEObject) {
             return;
         }
 
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index 4e8daa0e..a1132cfa 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -181,7 +181,7 @@ class CellTest extends \PHPUnit\Framework\TestCase
         $element = $oCell->addObject($src);
 
         $this->assertCount(1, $oCell->getElements());
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $element);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\OLEObject', $element);
     }
 
     /**
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index 71f12974..ba761b70 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -18,9 +18,9 @@
 namespace PhpOffice\PhpWord\Element;
 
 /**
- * Test class for PhpOffice\PhpWord\Element\Object
+ * Test class for PhpOffice\PhpWord\Element\OLEObject
  *
- * @coversDefaultClass \PhpOffice\PhpWord\Element\Object
+ * @coversDefaultClass \PhpOffice\PhpWord\Element\OLEObject
  * @runTestsInSeparateProcesses
  */
 class ObjectTest extends \PHPUnit\Framework\TestCase
@@ -31,9 +31,9 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testConstructWithSupportedFiles()
     {
         $src = __DIR__ . '/../_files/documents/reader.docx';
-        $oObject = new Object($src);
+        $oObject = new OLEObject($src);
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\OLEObject', $oObject);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
         $this->assertEquals($src, $oObject->getSource());
     }
@@ -44,9 +44,9 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testConstructWithSupportedFilesLong()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
-        $oObject = new Object($src);
+        $oObject = new OLEObject($src);
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\OLEObject', $oObject);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
         $this->assertEquals($src, $oObject->getSource());
     }
@@ -59,7 +59,7 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testConstructWithNotSupportedFiles()
     {
         $src = __DIR__ . '/../_files/xsl/passthrough.xsl';
-        $oObject = new Object($src);
+        $oObject = new OLEObject($src);
         $oObject->getSource();
     }
 
@@ -69,9 +69,9 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testConstructWithSupportedFilesAndStyle()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
-        $oObject = new Object($src, array('width' => '230px'));
+        $oObject = new OLEObject($src, array('width' => '230px'));
 
-        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Object', $oObject);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\OLEObject', $oObject);
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
         $this->assertEquals($src, $oObject->getSource());
     }
@@ -82,7 +82,7 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testRelationId()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
-        $oObject = new Object($src);
+        $oObject = new OLEObject($src);
 
         $iVal = rand(1, 1000);
         $oObject->setRelationId($iVal);
@@ -95,7 +95,7 @@ class ObjectTest extends \PHPUnit\Framework\TestCase
     public function testImageRelationId()
     {
         $src = __DIR__ . '/../_files/documents/sheet.xls';
-        $oObject = new Object($src);
+        $oObject = new OLEObject($src);
 
         $iVal = rand(1, 1000);
         $oObject->setImageRelationId($iVal);
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 8b6c9a43..20f0f0f7 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -70,7 +70,7 @@ class SectionTest extends \PHPUnit\Framework\TestCase
             'PageBreak',
             'Table',
             'ListItem',
-            'Object',
+            'OLEObject',
             'Image',
             'Title',
             'TextRun',
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 12f810ce..4f0d50d9 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -44,7 +44,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
     {
         $elements = array(
             'CheckBox', 'Container', 'Footnote', 'Image', 'Link', 'ListItem', 'ListItemRun',
-            'Object', 'PreserveText', 'Table', 'Text', 'TextBox', 'TextBreak', 'Title', 'TOC',
+            'OLEObject', 'PreserveText', 'Table', 'Text', 'TextBox', 'TextBreak', 'Title', 'TOC',
             'Field', 'Line', 'Shape', 'Chart', 'FormField', 'SDT', 'Bookmark',
         );
         foreach ($elements as $element) {

From 2d87fd320dffbbdafdf280dda78dcfce34f024c1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 20:27:05 +0100
Subject: [PATCH 194/370] fix merge

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 148877ed..d63b7bb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,6 @@ matrix:
         - php: 5.6
           env: COVERAGE=1
     allow_failures:
-<<<<<<< HEAD
-=======
-        - php: 7.0
-        - php: 7.1
->>>>>>> branch 'php72_support_object_classes' of https://github.com/SailorMax/PHPWord
         - php: 7.2
 
 cache:

From d1a79b79f1cc0622bb2da1a555e0614726a5874f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 21:29:31 +0100
Subject: [PATCH 195/370] add branch alias for 0.15.0 [skip ci]

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aa4a2415..09e795de 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.15.0-dev"
+            "dev-master": "0.15.0-dev"
         }
     }
 }

From ca29ceb1fa60c63216f15a30338c2faaeac1edb1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 21:33:29 +0100
Subject: [PATCH 196/370] add branch alias for 0.15.0 [skip ci]

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 09e795de..cba86eb1 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.15.0-dev"
+            "dev-master": "0.15-dev"
         }
     }
 }

From 23693b403c32c13a355adf0e2a32642a480066da Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 21:47:55 +0100
Subject: [PATCH 197/370] change impl to avoid compilation issue

---
 src/PhpWord/Writer/PDF/MPDF.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index e238057b..b6980a9d 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -29,6 +29,12 @@ use PhpOffice\PhpWord\Writer\WriterInterface;
  */
 class MPDF extends AbstractRenderer implements WriterInterface
 {
+    /**
+     * Overridden to set the correct includefile, only needed for MPDF 5
+     *
+     * @codeCoverageIgnore
+     * @param PhpWord $phpWord
+     */
     public function __construct(PhpWord $phpWord)
     {
         if (file_exists(Settings::getPdfRendererPath() . '/mpdf.php')) {
@@ -52,13 +58,8 @@ class MPDF extends AbstractRenderer implements WriterInterface
         $orientation = strtoupper('portrait');
 
         //  Create PDF
-        if ($this->includeFile != null) {
-            // MPDF version 5.*
-            $pdf = new \mpdf();
-        } else {
-            // MPDF version > 6.*
-            $pdf = new \Mpdf\Mpdf();
-        }
+        $mPdfClass = $this->getMPdfClassName();
+        $pdf = new $mPdfClass();
         $pdf->_setPageSize($paperSize, $orientation);
         $pdf->addPage($orientation);
 
@@ -78,4 +79,21 @@ class MPDF extends AbstractRenderer implements WriterInterface
 
         parent::restoreStateAfterSave($fileHandle);
     }
+
+    /**
+     * Return classname of MPDF to instantiate
+     *
+     * @codeCoverageIgnore
+     * @return string
+     */
+    private function getMPdfClassName()
+    {
+        if ($this->includeFile != null) {
+            // MPDF version 5.*
+            return '\mpdf';
+        }
+
+        // MPDF version > 6.*
+        return '\Mpdf\Mpdf';
+    }
 }

From d480aab1b000c23f1035b62b8370492fe1d4cce2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 21:29:31 +0100
Subject: [PATCH 198/370] add branch alias for 0.15.0 [skip ci]

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a79c8e19..2d2743ec 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.15.0-dev"
+            "dev-master": "0.15.0-dev"
         }
     }
 }

From 7d929fee8cc0aae31edbe71c7f6adf8cb3c4b545 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 29 Dec 2017 21:33:29 +0100
Subject: [PATCH 199/370] add branch alias for 0.15.0 [skip ci]

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2d2743ec..614865d8 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.15.0-dev"
+            "dev-master": "0.15-dev"
         }
     }
 }

From bdca366d9109d91a8deeb46558b4ed0ef347bc04 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 3 Jan 2018 14:15:59 +0100
Subject: [PATCH 200/370] remove link to obsolete URL [skip ci]

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index ac5f3b95..61f48036 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ Read more about PHPWord:
 - [Getting started](#getting-started)
 - [Contributing](#contributing)
 - [Developers' Documentation](http://phpword.readthedocs.org/)
-- [API Documentation](http://phpoffice.github.io/PHPWord/docs/master/)
 
 ## Features
 

From 4a530d1d97b064b87d9e2a1cc64cab996246569c Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 3 Jan 2018 17:16:19 +0100
Subject: [PATCH 201/370] Do not show script source when running from CLI

---
 samples/Sample_Header.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index 36478ad6..ac51f983 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -84,11 +84,6 @@ function write($phpWord, $filename, $writers)
     }
 
     $result .= getEndingNotes($writers);
-    $result .= '<pre><code>';
-    if (file_exists($filename . '.php')) {
-        $result .= highlight_file($filename . '.php', true);
-    }
-    $result .= '</code></pre>';
 
     return $result;
 }
@@ -127,6 +122,12 @@ function getEndingNotes($writers)
                 }
             }
             $result .= '</p>';
+
+            $result .= '<pre>';
+            if (file_exists($filename . '.php')) {
+                $result .= highlight_file($filename . '.php', true);
+            }
+            $result .= '</pre>';
         }
     }
 

From 99b04f0353e4c2d398f8b4c4db37df5e5772fc1d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 12 Jan 2018 23:42:22 +0100
Subject: [PATCH 202/370] fix reading of docx default style (#1238)

---
 CHANGELOG.md                                  |  7 +-
 docs/elements.rst                             |  7 +-
 docs/general.rst                              |  3 +-
 docs/installing.rst                           |  1 -
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 68 +++++++++++++++++--
 src/PhpWord/Reader/Word2007/Settings.php      |  4 +-
 src/PhpWord/Reader/Word2007/Styles.php        | 23 +++++++
 src/PhpWord/Style/Paragraph.php               |  1 -
 src/PhpWord/Writer/Word2007/Element/Shape.php |  4 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php   | 21 ++++--
 .../Writer/Word2007/Style/Paragraph.php       |  2 +-
 11 files changed, 115 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71b331d6..62694eea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ v0.15.0 (?? ??? 2018)
 - Parsing of "align" HTML attribute - @troosan #1231
 
 ### Fixed
+- fix reading of docx default style - @troosan #1238
+
+
 
 v0.14.0 (29 Dec 2017)
 ----------------------
@@ -58,6 +61,8 @@ This version brings compatibility with PHP 7.0 & 7.1
 ### Deprecated
 - PhpWord->getProtection(), get it from the settings instead PhpWord->getSettings()->getDocumentProtection();
 
+
+
 v0.13.0 (31 July 2016)
 -------------------
 This release brings several improvements in `TemplateProcessor`, automatic output escaping feature for OOXML, ODF, HTML, and RTF (turned off, by default).
@@ -77,7 +82,7 @@ Manual installation feature has been dropped since the release. Please, use [Com
 - Improved error message for the case when `autoload.php` is not found. - @RomanSyroeshko #371
 - Renamed the `align` option of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles into `alignment`. - @RomanSyroeshko
 - Improved performance of `TemplateProcessor::setValue()`. - @kazitanvirahsan #614, #617
-- Fixed some HTML tags not rendering any output (p, header & table) - #257, #324 - @twmobius and @garethellis 
+- Fixed some HTML tags not rendering any output (p, header & table) - #257, #324 - @twmobius and @garethellis
 
 ### Deprecated
 - `getAlign` and `setAlign` methods of `NumberingLevel`, `Frame`, `Table`, and `Paragraph` styles.
diff --git a/docs/elements.rst b/docs/elements.rst
index c73ffa06..94ff2667 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -160,7 +160,7 @@ Parameters:
 - ``$text``. Text that appears in the document.
 - ``$depth``. Depth of list item.
 - ``$fontStyle``. See :ref:`font-style`.
-- ``$listStyle``. List style of the current element TYPE\_NUMBER, 
+- ``$listStyle``. List style of the current element TYPE\_NUMBER,
   TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\\Style\\ListItem.
 - ``$paragraphStyle``. See :ref:`paragraph-style`.
 
@@ -345,7 +345,7 @@ The footnote numbering can be controlled by setting the FootnoteProperties on th
 .. code-block:: php
 
     $fp = new PhpWord\SimpleType\FootnoteProperties();
-    //sets the position of the footnote (pageBottom (default), beneathText, sectEnd, docEnd) 
+    //sets the position of the footnote (pageBottom (default), beneathText, sectEnd, docEnd)
     $fp->setPos(FootnoteProperties::POSITION_DOC_END);
     //set the number format to use (decimal (default), upperRoman, upperLetter, ...)
     $fp->setNumFmt(FootnoteProperties::NUMBER_FORMAT_LOWER_ROMAN);
@@ -353,7 +353,6 @@ The footnote numbering can be controlled by setting the FootnoteProperties on th
     $fp->setNumStart(2);
     //when to restart counting (continuous (default), eachSect, eachPage)
     $fp->setNumRestart(FootnoteProperties::RESTART_NUMBER_EACH_PAGE);
-    
     //And finaly, set it on the Section
     $section->setFootnoteProperties($properties);
 
@@ -379,7 +378,7 @@ To be completed
 Fields
 ------
 
-Currently the following fields are supported: 
+Currently the following fields are supported:
 
 - PAGE
 - NUMPAGES
diff --git a/docs/general.rst b/docs/general.rst
index ae090f2d..09a23cee 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -167,7 +167,6 @@ Use mirror margins to set up facing pages for double-sided documents, such as bo
 
     $phpWord->getSettings()->setMirrorMargins(true);
 
-
 Spelling and grammatical checks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -191,7 +190,7 @@ You can also specify the status of the spell and grammar checks, marking spellin
 
 Track Revisions
 ~~~~~~~~~~~~~~~
-Track changes can be activated using ``setTrackRevisions``, you can furture specify 
+Track changes can be activated using ``setTrackRevisions``, you can furture specify
 
 -  Not to use move syntax, instead moved items will be seen as deleted in one place and added in another
 -  Not track formatting revisions
diff --git a/docs/installing.rst b/docs/installing.rst
index 37e4d379..4f407f54 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -51,7 +51,6 @@ Example:
         }
     }
 
-
 Using samples
 -------------
 
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 6a48fd46..3d853e8f 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -307,7 +307,7 @@ abstract class AbstractPart
 
         $styleNode = $xmlReader->getElement('w:pPr', $domNode);
         $styleDefs = array(
-            'styleName'         => array(self::READ_VALUE, 'w:pStyle'),
+            'styleName'         => array(self::READ_VALUE, array('w:pStyle', 'w:name')),
             'alignment'         => array(self::READ_VALUE, 'w:jc'),
             'basedOn'           => array(self::READ_VALUE, 'w:basedOn'),
             'next'              => array(self::READ_VALUE, 'w:next'),
@@ -349,9 +349,9 @@ abstract class AbstractPart
         $styleNode = $xmlReader->getElement('w:rPr', $domNode);
         $styleDefs = array(
             'styleName'           => array(self::READ_VALUE, 'w:rStyle'),
-            'name'                => array(self::READ_VALUE, 'w:rFonts', 'w:ascii'),
+            'name'                => array(self::READ_VALUE, 'w:rFonts', array('w:ascii', 'w:hAnsi', 'w:eastAsia', 'w:cs')),
             'hint'                => array(self::READ_VALUE, 'w:rFonts', 'w:hint'),
-            'size'                => array(self::READ_SIZE,  'w:sz'),
+            'size'                => array(self::READ_SIZE,  array('w:sz', 'w:szCs')),
             'color'               => array(self::READ_VALUE, 'w:color'),
             'underline'           => array(self::READ_VALUE, 'w:u'),
             'bold'                => array(self::READ_TRUE,  'w:b'),
@@ -364,9 +364,7 @@ abstract class AbstractPart
             'subScript'           => array(self::READ_EQUAL, 'w:vertAlign', 'w:val', 'subscript'),
             'fgColor'             => array(self::READ_VALUE, 'w:highlight'),
             'rtl'                 => array(self::READ_TRUE,  'w:rtl'),
-            'font-latin'          => array(self::READ_VALUE,  'w:font', 'w:val'),
-            'font-eastAsia'       => array(self::READ_VALUE,  'w:font', 'w:eastAsia'),
-            'font-bidi'           => array(self::READ_VALUE,  'w:font', 'w:bidi'),
+            'lang'                => array(self::READ_VALUE, 'w:lang'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
@@ -400,6 +398,7 @@ abstract class AbstractPart
                     $ucfSide = ucfirst($side);
                     $styleDefs["border{$ucfSide}Size"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:sz');
                     $styleDefs["border{$ucfSide}Color"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:color');
+                    $styleDefs["border{$ucfSide}Style"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:val');
                 }
                 $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
             }
@@ -428,6 +427,54 @@ abstract class AbstractPart
         return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
     }
 
+    /**
+     * Returns the first child element found
+     *
+     * @param XMLReader $xmlReader
+     * @param \DOMElement $parentNode
+     * @param string|array $elements
+     * @return string|null
+     */
+    private function findPossibleElement(XMLReader $xmlReader, \DOMElement $parentNode = null, $elements)
+    {
+        if (is_array($elements)) {
+            //if element is an array, we take the first element that exists in the XML
+            foreach ($elements as $possibleElement) {
+                if ($xmlReader->elementExists($possibleElement, $parentNode)) {
+                    return $possibleElement;
+                }
+            }
+        } else {
+            return $elements;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the first attribute found
+     *
+     * @param XMLReader $xmlReader
+     * @param \DOMElement $node
+     * @param string|array $attributes
+     * @return string|null
+     */
+    private function findPossibleAttribute(XMLReader $xmlReader, \DOMElement $node, $attributes)
+    {
+        //if attribute is an array, we take the first attribute that exists in the XML
+        if (is_array($attributes)) {
+            foreach ($attributes as $possibleAttribute) {
+                if ($xmlReader->getAttribute($possibleAttribute, $node)) {
+                    return $possibleAttribute;
+                }
+            }
+        } else {
+            return $attributes;
+        }
+
+        return null;
+    }
+
     /**
      * Read style definition
      *
@@ -442,11 +489,18 @@ abstract class AbstractPart
         $styles = array();
 
         foreach ($styleDefs as $styleProp => $styleVal) {
-            @list($method, $element, $attribute, $expected) = $styleVal;
+            list($method, $element, $attribute, $expected) = array_pad($styleVal, 4, null);
+
+            $element = $this->findPossibleElement($xmlReader, $parentNode, $element);
+            if ($element === null) {
+                continue;
+            }
 
             if ($xmlReader->elementExists($element, $parentNode)) {
                 $node = $xmlReader->getElement($element, $parentNode);
 
+                $attribute = $this->findPossibleAttribute($xmlReader, $node, $attribute);
+
                 // Use w:val as default if no attribute assigned
                 $attribute = ($attribute === null) ? 'w:val' : $attribute;
                 $attributeValue = $xmlReader->getAttribute($attribute, $node);
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index ccdbed25..581a546d 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -80,8 +80,8 @@ class Settings extends AbstractPart
 
         $themeFontLang = new Language();
         $themeFontLang->setLatin($val);
-        $themeFontLang->setLatin($eastAsia);
-        $themeFontLang->setLatin($bidi);
+        $themeFontLang->setEastAsia($eastAsia);
+        $themeFontLang->setBidirectional($bidi);
 
         $phpWord->getSettings()->setThemeFontLang($themeFontLang);
     }
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index b8e6f22b..c6e64e45 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -19,6 +19,7 @@ namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Style\Language;
 
 /**
  * Styles reader
@@ -37,6 +38,28 @@ class Styles extends AbstractPart
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
 
+        $fontDefaults = $xmlReader->getElement('w:docDefaults/w:rPrDefault');
+        if ($fontDefaults !== null) {
+            $fontDefaultStyle = $this->readFontStyle($xmlReader, $fontDefaults);
+            if (array_key_exists('name', $fontDefaultStyle)) {
+                $phpWord->setDefaultFontName($fontDefaultStyle['name']);
+            }
+            if (array_key_exists('size', $fontDefaultStyle)) {
+                $phpWord->setDefaultFontSize($fontDefaultStyle['size']);
+            }
+            if (array_key_exists('lang', $fontDefaultStyle)) {
+                $phpWord->getSettings()->setThemeFontLang(new Language($fontDefaultStyle['lang']));
+            }
+        }
+
+        $paragraphDefaults = $xmlReader->getElement('w:docDefaults/w:pPrDefault');
+        if ($paragraphDefaults !== null) {
+            $paragraphDefaultStyle = $this->readParagraphStyle($xmlReader, $paragraphDefaults);
+            if ($paragraphDefaultStyle != null) {
+                $phpWord->setDefaultParagraphStyle();
+            }
+        }
+
         $nodes = $xmlReader->getElements('w:style');
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index c00dc97c..7e40d9e4 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -20,7 +20,6 @@ namespace PhpOffice\PhpWord\Style;
 use PhpOffice\Common\Text;
 use PhpOffice\PhpWord\Exception\InvalidStyleException;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
 use PhpOffice\PhpWord\SimpleType\TextAlignment;
 
 /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index e384db06..9f111293 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -154,12 +154,12 @@ class Shape extends AbstractElement
             case 'arc':
             case 'line':
                 $points = explode(' ', $value);
-                @list($start, $end) = $points;
+                list($start, $end) = array_pad($points, 2, null);
                 $points = array('start' => $start, 'end' => $end);
                 break;
             case 'curve':
                 $points = explode(' ', $value);
-                @list($start, $end, $point1, $point2) = $points;
+                list($start, $end, $point1, $point2) = array_pad($points, 4, null);
                 $points = array('start' => $start, 'end' => $end, 'point1' => $point1, 'point2' => $point2);
                 break;
         }
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 126cda4f..1cc94806 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -18,7 +18,6 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
 use PhpOffice\Common\XMLWriter;
-use PhpOffice\PhpWord\Settings as PhpWordSettings;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font as FontStyle;
 use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
@@ -82,9 +81,10 @@ class Styles extends AbstractPart
      */
     private function writeDefaultStyles(XMLWriter $xmlWriter, $styles)
     {
-        $fontName = PhpWordSettings::getDefaultFontName();
-        $fontSize = PhpWordSettings::getDefaultFontSize();
-        $language = $this->getParentWriter()->getPhpWord()->getSettings()->getThemeFontLang();
+        $phpWord = $this->getParentWriter()->getPhpWord();
+        $fontName = $phpWord->getDefaultFontName();
+        $fontSize = $phpWord->getDefaultFontSize();
+        $language = $phpWord->getSettings()->getThemeFontLang();
         $latinLanguage = ($language == null || $language->getLatin() === null) ? 'en-US' : $language->getLatin();
 
         // Default font
@@ -123,7 +123,18 @@ class Styles extends AbstractPart
         $xmlWriter->writeAttribute('w:val', 'Normal');
         $xmlWriter->endElement(); // w:name
         if (isset($styles['Normal'])) {
-            $styleWriter = new ParagraphStyleWriter($xmlWriter, $styles['Normal']);
+            $normalStyle = $styles['Normal'];
+            // w:pPr
+            if ($normalStyle instanceof Fontstyle && $normalStyle->getParagraph() != null) {
+                $styleWriter = new ParagraphStyleWriter($xmlWriter, $normalStyle->getParagraph());
+                $styleWriter->write();
+            } elseif ($normalStyle instanceof ParagraphStyle) {
+                $styleWriter = new ParagraphStyleWriter($xmlWriter, $normalStyle);
+                $styleWriter->write();
+            }
+
+            // w:rPr
+            $styleWriter = new FontStyleWriter($xmlWriter, $normalStyle);
             $styleWriter->write();
         }
         $xmlWriter->endElement(); // w:style
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 424b87f8..8915fb4c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -109,7 +109,7 @@ class Paragraph extends AbstractStyle
         //Paragraph contextualSpacing
         $xmlWriter->writeElementIf($styles['contextualSpacing'] === true, 'w:contextualSpacing');
 
-        //Paragraph contextualSpacing
+        //Paragraph textAlignment
         $xmlWriter->writeElementIf($styles['textAlignment'] !== null, 'w:textAlignment', 'w:val', $styles['textAlignment']);
 
         // Child style: alignment, indentation, spacing, and shading

From 4c68ebbe9dcb887c049ff1569df170551c2d5d0e Mon Sep 17 00:00:00 2001
From: samimussbach <mussbach@demos-deutschland.de>
Date: Sat, 13 Jan 2018 10:03:53 +0100
Subject: [PATCH 203/370] Parse formatting inside HTML lists (#1239)

---
 CHANGELOG.md                              |  1 +
 README.md                                 |  2 +-
 docs/elements.rst                         |  4 +-
 samples/Sample_26_Html.php                | 39 +++++++++---
 src/PhpWord/Element/AbstractContainer.php |  7 ++-
 src/PhpWord/Shared/Html.php               | 75 ++++++++++++++++------
 tests/PhpWord/Shared/HtmlTest.php         | 76 +++++++++++++++++++++--
 7 files changed, 170 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62694eea..d6f8b2da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ v0.15.0 (?? ??? 2018)
 ----------------------
 ### Added
 - Parsing of "align" HTML attribute - @troosan #1231
+- Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
 
 ### Fixed
 - fix reading of docx default style - @troosan #1238
diff --git a/README.md b/README.md
index 07b0d439..59fc3c44 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF.
 
-PHPWord is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/) and the [API Documentation](http://phpoffice.github.io/PHPWord/docs/develop/).
+PHPWord is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/).
 
 If you have any questions, please ask on [StackOverFlow](https://stackoverflow.com/questions/tagged/phpword)
 
diff --git a/docs/elements.rst b/docs/elements.rst
index 94ff2667..fe673304 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -405,8 +405,10 @@ For instance for the INDEX field, you can do the following (See `Index Field for
     $fieldText->addText('My ');
     $fieldText->addText('bold index', ['bold' => true]);
     $fieldText->addText(' entry');
+    $section->addField('XE', array(), array(), $fieldText);
 
-    $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), $fieldText);
+    //this actually adds the index
+    $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), 'right click to update index');
 
 Line
 ----
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index b993f834..99a35f9c 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -9,25 +9,50 @@ $section = $phpWord->addSection();
 $html = '<h1>Adding element via HTML</h1>';
 $html .= '<p>Some well formed HTML snippet needs to be used</p>';
 $html .= '<p>With for example <strong>some<sup>1</sup> <em>inline</em> formatting</strong><sub>1</sub></p>';
-$html .= '<p>Unordered (bulleted) list:</p>';
-$html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
-$html .= '<p>Ordered (numbered) list:</p>';
-$html .= '<ol><li>Item 1</li><li>Item 2</li></ol>';
 
-$html .= '<p>List with complex content:</p>';
+$html .= '<p style="margin-top: 240pt;">Unordered (bulleted) list:</p>';
+$html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
+
+$html .= '<p style="margin-top: 240pt;">Ordered (numbered) list:</p>';
+$html .= '<ol>
+                <li><p style="font-weight: bold;">List 1 item 1</p></li>
+                <li>List 1 item 2</li>
+                <ol>
+                    <li>sub list 1</li>
+                    <li>sub list 2</li>
+                </ol>
+                <li>List 1 item 3</li>
+            </ol>
+            <p style="margin-top: 15px;">A second list, numbering should restart</p>
+            <ol>
+                <li>List 2 item 1</li>
+                <li>List 2 item 2</li>
+                <ol>
+                    <li>sub list 1</li>
+                    <li>sub list 2</li>
+                </ol>
+                <li>List 2 item 3</li>
+                <ol>
+                    <li>sub list 1, restarts with a</li>
+                    <li>sub list 2</li>
+                </ol>
+            </ol>';
+
+$html .= '<p style="margin-top: 240pt;">List with formatted content:</p>';
 $html .= '<ul>
                 <li>
                     <span style="font-family: arial,helvetica,sans-serif;">
-                        <span style="font-size: 12px;">list item1</span>
+                        <span style="font-size: 16px;">big list item1</span>
                     </span>
                 </li>
                 <li>
                     <span style="font-family: arial,helvetica,sans-serif;">
-                        <span style="font-size: 12px;">list item2</span>
+                        <span style="font-size: 10px; font-weight: bold;">list item2 in bold</span>
                     </span>
                 </li>
             </ul>';
 
+$html .= '<p style="margin-top: 240pt;">A table with formatting:</p>';
 $html .= '<table align="center" style="width: 50%; border: 6px #0000FF double;">
                 <thead>
                     <tr style="background-color: #FF0000; text-align: center; color: #FFFFFF; font-weight: bold; ">
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index b00424b7..28d45672 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -33,11 +33,10 @@ namespace PhpOffice\PhpWord\Element;
  * @method CheckBox addCheckBox(string $name, $text, mixed $fStyle = null, mixed $pStyle = null)
  * @method Title addTitle(string $text, int $depth = 1)
  * @method TOC addTOC(mixed $fontStyle = null, mixed $tocStyle = null, int $minDepth = 1, int $maxDepth = 9)
- *
  * @method PageBreak addPageBreak()
  * @method Table addTable(mixed $style = null)
  * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
- * @method \PhpOffice\PhpWord\Element\OLEObject addObject(string $source, mixed $style = null)
+ * @method OLEObject addOLEObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
  * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
  * @method Line addLine(mixed $lineStyle = null)
@@ -46,6 +45,8 @@ namespace PhpOffice\PhpWord\Element;
  * @method FormField addFormField(string $type, mixed $fStyle = null, mixed $pStyle = null)
  * @method SDT addSDT(string $type)
  *
+ * @method \PhpOffice\PhpWord\Element\OLEObject addObject(string $source, mixed $style = null) deprecated, use addOLEObject instead
+ *
  * @since 0.10.0
  */
 abstract class AbstractContainer extends AbstractElement
@@ -200,7 +201,7 @@ abstract class AbstractContainer extends AbstractElement
             'FormField'     => $generalContainers,
             'SDT'           => $generalContainers,
             'TrackChange'   => $generalContainers,
-            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange'),
+            'TextRun'       => array('Section', 'Header', 'Footer', 'Cell', 'TextBox', 'TrackChange', 'ListItemRun'),
             'ListItem'      => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'ListItemRun'   => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 38d326c1..fd0bd545 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -18,10 +18,10 @@
 namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\AbstractContainer;
-use PhpOffice\PhpWord\Element\Cell;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
 /**
  * Common Html functions
@@ -30,6 +30,8 @@ use PhpOffice\PhpWord\SimpleType\Jc;
  */
 class Html
 {
+    private static $listIndex = 0;
+
     /**
      * Add HTML parts.
      *
@@ -135,8 +137,8 @@ class Html
             'tr'        => array('Row',         $node,  $element,   $styles,    null,   null,           null),
             'td'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
             'th'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
-            'ul'        => array('List',        null,   null,       $styles,    $data,  3,              null),
-            'ol'        => array('List',        null,   null,       $styles,    $data,  7,              null),
+            'ul'        => array('List',        $node,  $element,   $styles,    $data,  null,           null),
+            'ol'        => array('List',        $node,  $element,   $styles,    $data,  null,           null),
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
             'img'       => array('Image',       $node,  $element,   $styles,    null,   null,           null),
             'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
@@ -330,7 +332,7 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
-     * @return Cell $element
+     * @return \PhpOffice\PhpWord\Element\Cell $element
      */
     private static function parseCell($node, $element, &$styles)
     {
@@ -365,18 +367,56 @@ class Html
     /**
      * Parse list node
      *
+     * @param \DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
      * @param array &$styles
      * @param array &$data
-     * @param string $argument1 List type
      */
-    private static function parseList(&$styles, &$data, $argument1)
+    private static function parseList($node, $element, &$styles, &$data)
     {
+        $isOrderedList = $node->nodeName == 'ol';
         if (isset($data['listdepth'])) {
             $data['listdepth']++;
         } else {
             $data['listdepth'] = 0;
+            $styles['list'] = 'listStyle_' . self::$listIndex++;
+            $element->getPhpWord()->addNumberingStyle($styles['list'], self::getListStyle($isOrderedList));
         }
-        $styles['list']['listType'] = $argument1;
+    }
+
+    private static function getListStyle($isOrderedList)
+    {
+        if ($isOrderedList) {
+            return array(
+                'type'   => 'multilevel',
+                'levels' => array(
+                    array('format' => NumberFormat::DECIMAL,      'text' => '%1.', 'alignment' => 'left',  'tabPos' => 720,  'left' => 720,  'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%2.', 'alignment' => 'left',  'tabPos' => 1440, 'left' => 1440, 'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%3.', 'alignment' => 'right', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 180),
+                    array('format' => NumberFormat::DECIMAL,      'text' => '%4.', 'alignment' => 'left',  'tabPos' => 2880, 'left' => 2880, 'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%5.', 'alignment' => 'left',  'tabPos' => 3600, 'left' => 3600, 'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%6.', 'alignment' => 'right', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 180),
+                    array('format' => NumberFormat::DECIMAL,      'text' => '%7.', 'alignment' => 'left',  'tabPos' => 5040, 'left' => 5040, 'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_LETTER, 'text' => '%8.', 'alignment' => 'left',  'tabPos' => 5760, 'left' => 5760, 'hanging' => 360),
+                    array('format' => NumberFormat::LOWER_ROMAN,  'text' => '%9.', 'alignment' => 'right', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 180),
+                ),
+            );
+        }
+
+        return array(
+            'type'   => 'hybridMultilevel',
+            'levels' => array(
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 720,  'left' => 720,  'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 1440, 'left' => 1440, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2160, 'left' => 2160, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 2880, 'left' => 2880, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 3600, 'left' => 3600, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 4320, 'left' => 4320, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 5040, 'left' => 5040, 'hanging' => 360, 'font' => 'Symbol',      'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => 'o',  'alignment' => 'left', 'tabPos' => 5760, 'left' => 5760, 'hanging' => 360, 'font' => 'Courier New', 'hint' => 'default'),
+                array('format' => NumberFormat::BULLET, 'text' => '', 'alignment' => 'left', 'tabPos' => 6480, 'left' => 6480, 'hanging' => 360, 'font' => 'Wingdings',   'hint' => 'default'),
+            ),
+        );
     }
 
     /**
@@ -394,17 +434,10 @@ class Html
     {
         $cNodes = $node->childNodes;
         if (!empty($cNodes)) {
-            $text = '';
+            $listRun = $element->addListItemRun($data['listdepth'], $styles['list'], $styles['paragraph']);
             foreach ($cNodes as $cNode) {
-                if ($cNode->nodeName == '#text') {
-                    $text = $cNode->nodeValue;
-                }
+                self::parseNode($cNode, $listRun, $styles, $data);
             }
-            //ideally we should be parsing child nodes for any style, for now just take the text
-            if ('' == trim($text) && '' != trim($node->textContent)) {
-                $text = trim($node->textContent);
-            }
-            $element->addListItem($text, $data['listdepth'], $styles['font'], $styles['list'], $styles['paragraph']);
         }
     }
 
@@ -462,6 +495,12 @@ class Html
                     }
                     $styles['italic'] = $tValue;
                     break;
+                case 'margin-top':
+                    $styles['spaceBefore'] = Converter::cssToPoint($cValue);
+                    break;
+                case 'margin-bottom':
+                    $styles['spaceAfter'] = Converter::cssToPoint($cValue);
+                    break;
                 case 'border-color':
                     $styles['color'] = trim($cValue, '#');
                     break;
@@ -582,14 +621,14 @@ class Html
     private static function mapAlign($cssAlignment)
     {
         switch ($cssAlignment) {
-            case 'left':
-                return Jc::START;
             case 'right':
                 return Jc::END;
             case 'center':
                 return Jc::CENTER;
             case 'justify':
                 return Jc::BOTH;
+            default:
+                return Jc::START;
         }
 
         return null;
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index c7d36470..9c4cfd55 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -35,7 +35,8 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $content = '';
 
         // Default
-        $section = new Section(1);
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
         $this->assertCount(0, $section->getElements());
 
         // Heading
@@ -57,7 +58,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(7, $section->getElements());
 
         // Other parts
-        $section = new Section(1);
+        $section = $phpWord->addSection();
         $content = '';
         $content .= '<table><tr><th>Header</th><td>Content</td></tr></table>';
         $content .= '<ul><li>Bullet</li><ul><li>Bullet</li></ul></ul>';
@@ -172,10 +173,11 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
-        Html::addHtml($section, '<p style="text-align: center;"><span style="text-decoration: underline;">test</span></p>');
+        Html::addHtml($section, '<p style="text-align: center; margin-top: 15px; margin-bottom: 15px;"><span style="text-decoration: underline;">test</span></p>');
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:jc'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:spacing'));
         $this->assertEquals(Jc::CENTER, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:jc', 'w:val'));
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:r/w:rPr/w:u', 'w:val'));
     }
@@ -224,7 +226,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
                 </li>
                 <li>
                     <span style="font-family: arial,helvetica,sans-serif;">
-                        <span style="font-size: 12px;">list item2</span>
+                        <span style="font-size: 10px; font-weight: bold;">list item2</span>
                     </span>
                 </li>
             </ul>';
@@ -235,6 +237,69 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
         $this->assertEquals('list item1', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
         $this->assertEquals('list item2', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->nodeValue);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:b'));
+    }
+
+    /**
+     * Tests parsing of ul/li
+     */
+    public function tesOrderedListNumbering()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<ol>
+                <li>List 1 item 1</li>
+                <li>List 1 item 2</li>
+            </ol>
+            <p>Some Text</p>
+            <ol>
+                <li>List 2 item 1</li>
+                <li>List 2 item 2</li>
+            </ol>';
+        Html::addHtml($section, $html, false, false);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        echo $doc->printXml();
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
+
+        $this->assertEquals('List 1 item 1', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
+        $this->assertEquals('List 2 item 1', $doc->getElement('/w:document/w:body/w:p[4]/w:r/w:t')->nodeValue);
+
+        $firstListnumId = $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:numPr/w:numId', 'w:val');
+        $secondListnumId = $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:numPr/w:numId', 'w:val');
+
+        $this->assertNotEquals($firstListnumId, $secondListnumId);
+    }
+
+    /**
+     * Tests parsing of ul/li
+     */
+    public function testParseListWithFormat()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = preg_replace('/\s+/', ' ', '<ul>
+                <li>Some text before
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item1 <b>bold</b> with text after bold</span>
+                    </span>
+                    and some after
+                </li>
+                <li>
+                    <span style="font-family: arial,helvetica,sans-serif;">
+                        <span style="font-size: 12px;">list item2</span>
+                    </span>
+                </li>
+            </ul>');
+        Html::addHtml($section, $html, false, false);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
+        $this->assertEquals('list item2', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->nodeValue);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:b'));
+        $this->assertEquals('bold', $doc->getElement('/w:document/w:body/w:p[1]/w:r[3]/w:t')->nodeValue);
     }
 
     /**
@@ -255,6 +320,9 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('with a linebreak.', $doc->getElement('/w:document/w:body/w:p/w:r[2]/w:t')->nodeValue);
     }
 
+    /**
+     * Test parsing of img
+     */
     public function testParseImage()
     {
         $src = __DIR__ . '/../_files/images/firefox.png';

From 8ed3cacfe8d6ddb9c44843ed981d0bede3a9aab9 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Tue, 16 Jan 2018 20:19:54 -0200
Subject: [PATCH 204/370] Refactoring

---
 src/PhpWord/Writer/Word2007/Element/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
index 47dae29b..b6d1145c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -46,7 +46,7 @@ class Container extends AbstractElement
             return;
         }
         $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
-        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote', 'ListItemRun')) ? true : false;
+        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote', 'ListItemRun'));
         $xmlWriter = $this->getXmlWriter();
 
         // Loop through elements

From 0425a25cdbbb820eded9473f4026ef32db57baa4 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 25 Jan 2018 23:24:21 +0100
Subject: [PATCH 205/370] Add parsing of HTML links

---
 samples/Sample_26_Html.php        |  2 ++
 src/PhpWord/Shared/Html.php       | 23 +++++++++++++++++++++++
 tests/PhpWord/Shared/HtmlTest.php | 13 +++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 99a35f9c..69d9d131 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -10,6 +10,8 @@ $html = '<h1>Adding element via HTML</h1>';
 $html .= '<p>Some well formed HTML snippet needs to be used</p>';
 $html .= '<p>With for example <strong>some<sup>1</sup> <em>inline</em> formatting</strong><sub>1</sub></p>';
 
+$html .= '<p>A link to <a href="http://phpword.readthedocs.io/">Read the docs</a></p>';
+
 $html .= '<p style="margin-top: 240pt;">Unordered (bulleted) list:</p>';
 $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
 
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index fd0bd545..0f5f446a 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -142,6 +142,7 @@ class Html
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
             'img'       => array('Image',       $node,  $element,   $styles,    null,   null,           null),
             'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
+            'a'         => array('Link',        $node,  $element,   $styles,    null,   null,           null),
         );
 
         $newElement = null;
@@ -643,4 +644,26 @@ class Html
     {
         $element->addTextBreak();
     }
+
+    /**
+     * Parse link node
+     *
+     * @param \DOMNode $node
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+     * @param array $styles
+     */
+    private static function parseLink($node, $element, &$styles)
+    {
+        $target = null;
+        foreach ($node->attributes as $attribute) {
+            switch ($attribute->name) {
+                case 'href':
+                    $target = $attribute->value;
+                    break;
+            }
+        }
+        self::parseInlineStyle($node, $styles['font']);
+
+        return $element->addLink($target, $node->textContent, $styles['font'], $styles['paragraph']);
+    }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 9c4cfd55..6122924f 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -341,4 +341,17 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertStringMatchesFormat('%Smso-position-horizontal:right%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
         $this->assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
     }
+
+    public function testParseLink()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><a href="http://phpword.readthedocs.io/" style="text-decoration: underline">link text</a></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
+        $this->assertEquals('link text', $doc->getElement('/w:document/w:body/w:p/w:hyperlink/w:r/w:t')->nodeValue);
+    }
 }

From 30183e28810391b66c07e8f896421449830a3558 Mon Sep 17 00:00:00 2001
From: Nicolas Dermine <nicolas.dermine@gmail.com>
Date: Fri, 26 Jan 2018 18:31:35 +0100
Subject: [PATCH 206/370] fix typo in comment

---
 src/PhpWord/TemplateProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index c46038ee..5dd7b0bf 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -422,7 +422,7 @@ class TemplateProcessor
         }
 
         /*
-         * Note: we do not use `rename` function here, because it looses file ownership data on Windows platform.
+         * Note: we do not use `rename` function here, because it loses file ownership data on Windows platform.
          * As a result, user cannot open the file directly getting "Access denied" message.
          *
          * @see https://github.com/PHPOffice/PHPWord/issues/532

From caba7e238ff05c2cfd2a438d3f4cb77ee235623e Mon Sep 17 00:00:00 2001
From: Samuel Laulhau <zouliloua@gmail.com>
Date: Wed, 31 Jan 2018 10:17:40 +0100
Subject: [PATCH 207/370] Delete VERSION

Delete VERSION file since it's outdated so not usefull anymore
---
 VERSION | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 VERSION

diff --git a/VERSION b/VERSION
deleted file mode 100644
index 51de3305..00000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.13.0
\ No newline at end of file

From 8a9a4784d91da529ab327670f6712f719541491a Mon Sep 17 00:00:00 2001
From: Sami Mussbach <mussbach@demos-deutschland.de>
Date: Thu, 1 Feb 2018 13:58:08 +0100
Subject: [PATCH 208/370] add (failing) test and correct documentation sample
 to valid HTML

---
 samples/Sample_26_Html.php        | 11 +++++----
 tests/PhpWord/Shared/HtmlTest.php | 37 +++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 69d9d131..b05f8d08 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -29,10 +29,13 @@ $html .= '<ol>
             <ol>
                 <li>List 2 item 1</li>
                 <li>List 2 item 2</li>
-                <ol>
-                    <li>sub list 1</li>
-                    <li>sub list 2</li>
-                </ol>
+                <li>
+                    <ol>
+                        <li>sub list 1</li>
+                        <li>sub list 2</li>
+                    </ol>
+                </li>
+                
                 <li>List 2 item 3</li>
                 <ol>
                     <li>sub list 1, restarts with a</li>
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 6122924f..936c35f9 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -272,6 +272,43 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertNotEquals($firstListnumId, $secondListnumId);
     }
 
+    /**
+     * Tests parsing of nested ul/li
+     */
+    public function testOrderedNestedListNumbering()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<ol>
+                <li>List 1 item 1</li>
+                <li>List 1 item 2</li>
+            </ol>
+            <p>Some Text</p>
+            <ol>
+                <li>List 2 item 1</li>
+                <li>
+                    <ol>
+                        <li>sub list 1</li>
+                        <li>sub list 2</li>
+                    </ol>
+                </li>
+            </ol>';
+        Html::addHtml($section, $html, false, false);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        echo $doc->printXml();
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
+
+        $this->assertEquals('List 1 item 1', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
+        $this->assertEquals('List 2 item 1', $doc->getElement('/w:document/w:body/w:p[4]/w:r/w:t')->nodeValue);
+
+        $firstListnumId = $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:numPr/w:numId', 'w:val');
+        $secondListnumId = $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:numPr/w:numId', 'w:val');
+
+        $this->assertNotEquals($firstListnumId, $secondListnumId);
+    }
+
     /**
      * Tests parsing of ul/li
      */

From e0096dba084c767582e15917bf5b357c790a5995 Mon Sep 17 00:00:00 2001
From: Sami Mussbach <mussbach@demos-deutschland.de>
Date: Thu, 1 Feb 2018 14:12:56 +0100
Subject: [PATCH 209/370] fix typo in test method name

---
 tests/PhpWord/Shared/HtmlTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 6122924f..97a8fb15 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -243,7 +243,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     /**
      * Tests parsing of ul/li
      */
-    public function tesOrderedListNumbering()
+    public function testOrderedListNumbering()
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();

From 4105a9aad1bd8e08cd3e7d5a74810a9e73f80fd4 Mon Sep 17 00:00:00 2001
From: Nicolas Dermine <nicolas.dermine@gmail.com>
Date: Fri, 2 Feb 2018 16:19:21 +0100
Subject: [PATCH 210/370] improve `cloneBlock` regex

it wrongly matched `<w:pPr` when looking for `<w:p`

in that case the cloned block would not be valid XML,
and so the generated docx document could not be opened by Word

adding the `\b` word boundary to the regex fixes this.

the accompanying unit test failed with this message when trying to load
the generated file:

```
ErrorException: DOMDocument::loadXML(): Opening and ending tag mismatch:
p line 2 and body in Entity, line: 2
```

This might solve issues such as #681 and #664.
---
 src/PhpWord/TemplateProcessor.php       |  2 +-
 tests/PhpWord/TemplateProcessorTest.php | 52 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 5dd7b0bf..db68f567 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -322,7 +322,7 @@ class TemplateProcessor
     {
         $xmlBlock = null;
         preg_match(
-            '/(<\?xml.*)(<w:p.*>\${' . $blockname . '}<\/w:.*?p>)(.*)(<w:p.*\${\/' . $blockname . '}<\/w:.*?p>)/is',
+            '/(<\?xml.*)(<w:p\b.*>\${' . $blockname . '}<\/w:.*?p>)(.*)(<w:p\b.*\${\/' . $blockname . '}<\/w:.*?p>)/is',
             $this->tempDocumentMainPart,
             $matches
         );
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 7b064ef7..122ed5b6 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -223,4 +223,56 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
         unlink($docName);
         $this->assertTrue($docFound);
     }
+
+    /**
+     * @covers ::cloneBlock
+     * @test
+     */
+    public function cloneBlockCanCloneABlockTwice()
+    {
+        // create template with placeholders and block
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $documentElements = array(
+            'Title: ${title}',
+            '${subreport}',
+            '${subreport.id}: ${subreport.text}. ',
+            '${/subreport}',
+        );
+        foreach ($documentElements as $documentElement) {
+            $section->addText($documentElement);
+        }
+        $objWriter = IOFactory::createWriter($phpWord);
+        $templatePath = 'test.docx';
+        $objWriter->save($templatePath);
+
+        // replace placeholders and save the file
+        $templateProcessor = new TemplateProcessor($templatePath);
+        $templateProcessor->setValue('title', 'Some title');
+        $templateProcessor->cloneBlock('subreport', 2);
+        $templateProcessor->setValue('subreport.id', '123', 1);
+        $templateProcessor->setValue('subreport.text', 'Some text', 1);
+        $templateProcessor->setValue('subreport.id', '456', 1);
+        $templateProcessor->setValue('subreport.text', 'Some other text', 1);
+        $templateProcessor->saveAs($templatePath);
+
+        // assert the block has been cloned twice
+        // and the placeholders have been replaced correctly
+        $phpWord = IOFactory::load($templatePath);
+        $sections = $phpWord->getSections();
+        $actualElements = $sections[0]->getElements();
+        unlink($templatePath);
+        $expectedElements = array(
+            'Title: Some title',
+            '123: Some text. ',
+            '456: Some other text. ',
+        );
+        $this->assertCount(count($expectedElements), $actualElements);
+        foreach ($expectedElements as $i => $expectedElement) {
+            $this->assertEquals(
+                $expectedElement,
+                $actualElements[$i]->getText()
+            );
+        }
+    }
 }

From edd9617c03888ce4dd2e28c2fcacfad98194f4fc Mon Sep 17 00:00:00 2001
From: Nicolas Dermine <nicolas.dermine@gmail.com>
Date: Sun, 4 Feb 2018 08:42:38 +0100
Subject: [PATCH 211/370] fix typo

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 335ad2d5..e62f2e6f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ We want to create a high quality document writer and reader library that people
 
 - **Be brief, but be bold**. State your issues briefly. But speak out your ideas loudly, even if you can't or don't know how to implement it right away. The world will be better with limitless innovations.
 - **Follow PHP-FIG standards**. We follow PHP Standards Recommendations (PSRs) by [PHP Framework Interoperability Group](http://www.php-fig.org/). If you're not familiar with these standards, please, [familiarize yourself now](https://github.com/php-fig/fig-standards). Also, please, use [PHPCodeSniffer](http://pear.php.net/package/PHP_CodeSniffer/) to validate your code against PSRs.
-- **Test your code**. Nobody else knows your code better than you. So, it's completely yours mission to test the changes you made before pull request submission. We use [PHPUnit](https://phpunit.de/) for our testing purposes and recommend you using this tool too. [Here](https://phpunit.de/presentations.html) you can find PHPUnit best practices and additional information on effective unit testing, which helps us making PHPWord better day to day. Do not hesitate to smoke it carefully. It's a great investment in quality of your work, and it saves you years of life.
+- **Test your code**. Nobody else knows your code better than you. So, it's completely your mission to test the changes you made before pull request submission. We use [PHPUnit](https://phpunit.de/) for our testing purposes and recommend you using this tool too. [Here](https://phpunit.de/presentations.html) you can find PHPUnit best practices and additional information on effective unit testing, which helps us making PHPWord better day to day. Do not hesitate to smoke it carefully. It's a great investment in quality of your work, and it saves you years of life.
 - **Request pull in separate branch**. Do not submit your request to the master branch. But create a separate branch named specifically for the issue that you addressed. Read [GitHub manual](https://help.github.com/articles/using-pull-requests) to find out more about this. If you are new to GitHub, read [this short manual](https://help.github.com/articles/fork-a-repo) to get yourself familiar with forks and how git works in general. [This video](http://www.youtube.com/watch?v=-zvHQXnBO6c) explains how to synchronize your Github Fork with the Branch of PHPWord.
 
 That's it. Thank you for your interest in PHPWord, and welcome!

From 46a5f96d3b5104aaa6b016e5df0730e4382058e7 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 6 Feb 2018 23:16:32 +0100
Subject: [PATCH 212/370] fix parsing of table and p inside table cells

---
 CHANGELOG.md                               |  2 ++
 samples/Sample_26_Html.php                 | 16 +++++++--
 src/PhpWord/Shared/Html.php                | 38 +++++++++++++++++++++-
 src/PhpWord/Writer/Word2007/Style/Font.php |  4 +++
 tests/PhpWord/Shared/HtmlTest.php          |  6 ++--
 5 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f8b2da..fca2922c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@ v0.15.0 (?? ??? 2018)
 ### Added
 - Parsing of "align" HTML attribute - @troosan #1231
 - Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
+- Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #
 
 ### Fixed
 - fix reading of docx default style - @troosan #1238
+- fix the size unit of when parsing html images - @troosan #1254
 
 
 
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 69d9d131..d54d548c 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -7,11 +7,13 @@ $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 $section = $phpWord->addSection();
 $html = '<h1>Adding element via HTML</h1>';
-$html .= '<p>Some well formed HTML snippet needs to be used</p>';
+$html .= '<p>Some well-formed HTML snippet needs to be used</p>';
 $html .= '<p>With for example <strong>some<sup>1</sup> <em>inline</em> formatting</strong><sub>1</sub></p>';
 
 $html .= '<p>A link to <a href="http://phpword.readthedocs.io/">Read the docs</a></p>';
 
+$html .= '<p lang="he-IL" style="text-align: right; direction: rtl">היי, זה פסקה מימין לשמאל</p>';
+
 $html .= '<p style="margin-top: 240pt;">Unordered (bulleted) list:</p>';
 $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
 
@@ -65,10 +67,20 @@ $html .= '<table align="center" style="width: 50%; border: 6px #0000FF double;">
                 </thead>
                 <tbody>
                     <tr><td style="border-style: dotted;">1</td><td colspan="2">2</td></tr>
-                    <tr><td>4</td><td>5</td><td>6</td></tr>
+                    <tr><td>This is <b>bold</b> text</td><td></td><td>6</td></tr>
                 </tbody>
             </table>';
 
+$html .= '<p style="margin-top: 240pt;">Table inside another table:</p>';
+$html .= '<table align="center" style="width: 80%; border: 6px #0000FF double;">
+    <tr><td>
+        <table style="width: 100%; border: 4px #FF0000 dotted;">
+            <tr><td>column 1</td><td>column 2</td></tr>
+        </table>
+    </td></tr>
+    <tr><td style="text-align: center;">Cell in parent table</td></tr>
+</table>';
+
 \PhpOffice\PhpWord\Shared\Html::addHtml($section, $html, false, false);
 
 // Save file
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 0f5f446a..2eeaae8b 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -31,6 +31,7 @@ use PhpOffice\PhpWord\SimpleType\NumberFormat;
 class Html
 {
     private static $listIndex = 0;
+    private static $xpath;
 
     /**
      * Add HTML parts.
@@ -65,6 +66,7 @@ class Html
         $dom = new \DOMDocument();
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
+        self::$xpath = new \DOMXpath($dom);
         $node = $dom->getElementsByTagName('body');
 
         self::parseNode($node->item(0), $element);
@@ -89,6 +91,10 @@ class Html
                         break;
                     case 'align':
                         $styles['alignment'] = self::mapAlign($attribute->value);
+                        break;
+                    case 'lang':
+                        $styles['lang'] = $attribute->value;
+                        break;
                 }
             }
         }
@@ -343,8 +349,33 @@ class Html
         if (!empty($colspan)) {
             $cellStyles['gridSpan'] = $colspan - 0;
         }
+        $cell = $element->addCell(null, $cellStyles);
 
-        return $element->addCell(null, $cellStyles);
+        if (self::shouldAddTextRun($node)) {
+            return $cell->addTextRun(self::parseInlineStyle($node, $styles['paragraph']));
+        }
+
+        return $cell;
+    }
+
+    /**
+     * Checks if $node contains an HTML element that cannot be added to TextRun
+     *
+     * @param \DOMNode $node
+     * @return bool Returns true if the node contains an HTML element that cannot be added to TextRun
+     */
+    private static function shouldAddTextRun(\DOMNode $node)
+    {
+        if (!$node->hasChildNodes()) {
+            return false;
+        }
+
+        $containsBlockElement = self::$xpath->query('.//table|./p', $node)->length > 0;
+        if ($containsBlockElement) {
+            return false;
+        }
+
+        return true;
     }
 
     /**
@@ -469,6 +500,9 @@ class Html
                 case 'text-align':
                     $styles['alignment'] = self::mapAlign($cValue);
                     break;
+                case 'direction':
+                    $styles['rtl'] = $cValue === 'rtl';
+                    break;
                 case 'font-size':
                     $styles['size'] = Converter::cssToPoint($cValue);
                     break;
@@ -556,10 +590,12 @@ class Html
                 case 'width':
                     $width = $attribute->value;
                     $style['width'] = $width;
+                    $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
                     break;
                 case 'height':
                     $height = $attribute->value;
                     $style['height'] = $height;
+                    $style['unit'] = \PhpOffice\PhpWord\Style\Image::UNIT_PX;
                     break;
                 case 'style':
                     $styleattr = explode(';', $attribute->value);
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 9c2714dc..ecaad416 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -90,6 +90,10 @@ class Font extends AbstractStyle
             $xmlWriter->writeAttributeIf($language->getLatin() !== null, 'w:val', $language->getLatin());
             $xmlWriter->writeAttributeIf($language->getEastAsia() !== null, 'w:eastAsia', $language->getEastAsia());
             $xmlWriter->writeAttributeIf($language->getBidirectional() !== null, 'w:bidi', $language->getBidirectional());
+            //if bidi is not set but we are writing RTL, write the latin language in the bidi tag
+            if ($style->isRTL() && $language->getBidirectional() === null && $language->getLatin() !== null) {
+                $xmlWriter->writeAttribute('w:bidi', $language->getLatin());
+            }
             $xmlWriter->endElement();
         }
 
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 97a8fb15..7d5f0b4c 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -259,7 +259,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         Html::addHtml($section, $html, false, false);
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
-        echo $doc->printXml();
+
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
 
@@ -336,8 +336,8 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $baseXpath = '/w:document/w:body/w:p/w:r';
         $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
-        $this->assertStringMatchesFormat('%Swidth:150pt%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
-        $this->assertStringMatchesFormat('%Sheight:200pt%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        $this->assertStringMatchesFormat('%Swidth:150px%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
+        $this->assertStringMatchesFormat('%Sheight:200px%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
         $this->assertStringMatchesFormat('%Smso-position-horizontal:right%S', $doc->getElementAttribute($baseXpath . '[1]/w:pict/v:shape', 'style'));
         $this->assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
     }

From 47c837abef8f25fa0f28da352cd3e94c8be99ece Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 6 Feb 2018 23:31:56 +0100
Subject: [PATCH 213/370] add unit tests

---
 src/PhpWord/Shared/Html.php       |  4 ----
 tests/PhpWord/Shared/HtmlTest.php | 29 ++++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 2eeaae8b..e11d7390 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -366,10 +366,6 @@ class Html
      */
     private static function shouldAddTextRun(\DOMNode $node)
     {
-        if (!$node->hasChildNodes()) {
-            return false;
-        }
-
         $containsBlockElement = self::$xpath->query('.//table|./p', $node)->length > 0;
         if ($containsBlockElement) {
             return false;
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 7d5f0b4c..44fe97fc 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -150,6 +150,33 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('15', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:r/w:rPr/w:sz', 'w:val'));
     }
 
+    /**
+     * Test direction style
+     */
+    public function testParseTextDirection()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<span style="direction: rtl">test</span>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:rtl'));
+    }
+
+    /**
+     * Test html lang
+     */
+    public function testParseLang()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<span lang="fr-BE">test</span>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:lang'));
+        $this->assertEquals('fr-BE', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:lang', 'w:val'));
+    }
+
     /**
      * Test font-family style
      */
@@ -199,7 +226,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
                 </thead>
                 <tbody>
                     <tr><td style="border-style: dotted;">1</td><td colspan="2">2</td></tr>
-                    <tr><td>4</td><td>5</td><td>6</td></tr>
+                    <tr><td>This is <b>bold</b> text</td><td>5</td><td><p>6</p></td></tr>
                 </tbody>
             </table>';
         Html::addHtml($section, $html);

From 46476d71014a1136810bdf7576724edc6e50fe30 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 7 Feb 2018 07:09:27 +0100
Subject: [PATCH 214/370] update phpdoc

---
 src/PhpWord/Shared/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index e11d7390..2a92ed2a 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -339,7 +339,7 @@ class Html
      * @param \DOMNode $node
      * @param \PhpOffice\PhpWord\Element\Table $element
      * @param array &$styles
-     * @return \PhpOffice\PhpWord\Element\Cell $element
+     * @return \PhpOffice\PhpWord\Element\Cell|\PhpOffice\PhpWord\Element\TextRun $element
      */
     private static function parseCell($node, $element, &$styles)
     {

From 33739ea21cbdc74b661ed8e9de42a75db7c6391e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 7 Feb 2018 21:39:01 +0100
Subject: [PATCH 215/370] cannot add list on textrun

---
 src/PhpWord/Shared/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 2a92ed2a..a3ea0cc0 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -366,7 +366,7 @@ class Html
      */
     private static function shouldAddTextRun(\DOMNode $node)
     {
-        $containsBlockElement = self::$xpath->query('.//table|./p', $node)->length > 0;
+        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./li', $node)->length > 0;
         if ($containsBlockElement) {
             return false;
         }

From 304173c4d78b65685e2e91654beccd573fe8b4ee Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 8 Feb 2018 07:02:28 +0100
Subject: [PATCH 216/370] fix nested list

---
 src/PhpWord/Element/AbstractElement.php | 13 +++++++++++++
 src/PhpWord/Shared/Html.php             |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 63892b74..52279645 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -93,6 +93,13 @@ abstract class AbstractElement
      */
     private $nestedLevel = 0;
 
+    /**
+     * A reference to the parent
+     *
+     * @var \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    private $parent;
+
     /**
      * Parent container type
      *
@@ -321,6 +328,11 @@ abstract class AbstractElement
         $this->commentRangeEnd->setEndElement($this);
     }
 
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
     /**
      * Set parent container
      *
@@ -331,6 +343,7 @@ abstract class AbstractElement
     public function setParentContainer(AbstractElement $container)
     {
         $this->parentContainer = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
+        $this->parent = $container;
 
         // Set nested level
         $this->nestedLevel = $container->getNestedLevel();
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index a3ea0cc0..971776ff 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -366,7 +366,7 @@ class Html
      */
     private static function shouldAddTextRun(\DOMNode $node)
     {
-        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./li', $node)->length > 0;
+        $containsBlockElement = self::$xpath->query('.//table|./p|./ul|./ol', $node)->length > 0;
         if ($containsBlockElement) {
             return false;
         }
@@ -402,7 +402,7 @@ class Html
      */
     private static function parseList($node, $element, &$styles, &$data)
     {
-        $isOrderedList = $node->nodeName == 'ol';
+        $isOrderedList = $node->nodeName === 'ol';
         if (isset($data['listdepth'])) {
             $data['listdepth']++;
         } else {
@@ -410,6 +410,9 @@ class Html
             $styles['list'] = 'listStyle_' . self::$listIndex++;
             $element->getPhpWord()->addNumberingStyle($styles['list'], self::getListStyle($isOrderedList));
         }
+        if ($node->parentNode->nodeName === 'li') {
+            return $element->getParent();
+        }
     }
 
     private static function getListStyle($isOrderedList)

From 24f3463f9af8a4ade049d11202ee8e34bec92ec3 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 8 Feb 2018 07:18:02 +0100
Subject: [PATCH 217/370] remove output

---
 CHANGELOG.md                      | 3 ++-
 tests/PhpWord/Shared/HtmlTest.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fca2922c..21f4ec81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,12 @@ v0.15.0 (?? ??? 2018)
 ### Added
 - Parsing of "align" HTML attribute - @troosan #1231
 - Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
-- Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #
+- Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
 
 ### Fixed
 - fix reading of docx default style - @troosan #1238
 - fix the size unit of when parsing html images - @troosan #1254
+- fixed HTML parsing of nested lists - @troosan #1265
 
 
 
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index b1ebf349..ac68b887 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -323,7 +323,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         Html::addHtml($section, $html, false, false);
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
-        echo $doc->printXml();
+
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
 

From 9cd5ab74330f9957b99c7d4634bf95fdb7e1a9e6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 9 Feb 2018 17:17:13 +0100
Subject: [PATCH 218/370] update changelog

---
 CHANGELOG.md               | 1 +
 samples/Sample_26_Html.php | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21f4ec81..3d3f60f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ v0.15.0 (?? ??? 2018)
 - fix reading of docx default style - @troosan #1238
 - fix the size unit of when parsing html images - @troosan #1254
 - fixed HTML parsing of nested lists - @troosan #1265
+- Save PNG alpha information when using remote images. @samsullivan #779
 
 
 
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 6e505fdb..f6086357 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -37,7 +37,6 @@ $html .= '<ol>
                         <li>sub list 2</li>
                     </ol>
                 </li>
-                
                 <li>List 2 item 3</li>
                 <ol>
                     <li>sub list 1, restarts with a</li>

From 604e60cae9cad0e5d114ddda0c88c6e2ebe93693 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 9 Feb 2018 21:49:11 +0100
Subject: [PATCH 219/370] Add support for Track changes (#1262)

* add changed information to HTML writer
* add missing writeFontStyle
* refactor track changes
* set the style
* update documentation and release note
* Update the changelog and doc
* fix scrutinizer issues
---
 CHANGELOG.md                                  |   1 +
 docs/elements.rst                             |  41 +++++++++--
 samples/Sample_16_Object.php                  |   2 +-
 samples/Sample_39_TrackChanges.php            |  29 ++++++++
 samples/resources/Sample_11_ReadWord2007.docx | Bin 67881 -> 63320 bytes
 samples/resources/Sample_24_ReadODText.odt    | Bin 11952 -> 11540 bytes
 src/PhpWord/Element/AbstractContainer.php     |   4 +-
 src/PhpWord/Element/AbstractElement.php       |  39 +++++++++++
 src/PhpWord/Element/Comment.php               |   4 +-
 src/PhpWord/Element/TrackChange.php           |  31 ++++++++-
 src/PhpWord/Reader/ODText/Content.php         |  50 +++++++++++++-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  27 +++++++-
 src/PhpWord/Reader/Word2007/Styles.php        |   2 +-
 src/PhpWord/Writer/HTML/Element/Text.php      |  65 ++++++++++++++++++
 src/PhpWord/Writer/ODText/Element/Text.php    |  60 +++++++++++-----
 src/PhpWord/Writer/ODText/Part/Content.php    |  55 +++++++++++++++
 src/PhpWord/Writer/Word2007/Element/Text.php  |  54 ++++++++++++++-
 tests/PhpWord/Element/TrackChangeTest.php     |  44 ++++++++++++
 tests/PhpWord/Shared/HtmlTest.php             |   2 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |  18 ++++-
 20 files changed, 488 insertions(+), 40 deletions(-)
 create mode 100644 samples/Sample_39_TrackChanges.php
 create mode 100644 tests/PhpWord/Element/TrackChangeTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f8b2da..f82759dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ v0.15.0 (?? ??? 2018)
 ### Added
 - Parsing of "align" HTML attribute - @troosan #1231
 - Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
+- Add support for Track changes @Cip @troosan #354 #1262
 
 ### Fixed
 - fix reading of docx default style - @troosan #1238
diff --git a/docs/elements.rst b/docs/elements.rst
index fe673304..7df3b163 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -31,7 +31,7 @@ column shows the containers while the rows lists the elements.
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
 | 11    | Watermark       | -         | v        | -        | -       | -          | -          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
-| 12    | Object          | v         | v        | v        | v       | v          | v          |
+| 12    | OLEObject       | v         | v        | v        | v       | v          | v          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
 | 13    | TOC             | v         | -        | -        | -       | -          | -          |
 +-------+-----------------+-----------+----------+----------+---------+------------+------------+
@@ -77,6 +77,13 @@ italics, etc) or other elements, e.g. images or links. The syntaxes are as follo
 
 For available styling options see :ref:`font-style` and :ref:`paragraph-style`.
 
+If you want to enable track changes on added text you can mark it as INSERTED or DELETED by a specific user at a given time:
+
+.. code-block:: php
+
+    $text = $section->addText('Hello World!');
+    $text->setChanged(\PhpOffice\PhpWord\Element\ChangedElement::TYPE_INSERTED, 'Fred', (new \DateTime()));
+
 Titles
 ~~~~~~
 
@@ -276,11 +283,11 @@ Objects
 -------
 
 You can add OLE embeddings, such as Excel spreadsheets or PowerPoint
-presentations to the document by using ``addObject`` method.
+presentations to the document by using ``addOLEObject`` method.
 
 .. code-block:: php
 
-    $section->addObject($src, [$style]);
+    $section->addOLEObject($src, [$style]);
 
 Table of contents
 -----------------
@@ -309,7 +316,7 @@ Footnotes & endnotes
 You can create footnotes with ``addFootnote`` and endnotes with
 ``addEndnote`` in texts or textruns, but it's recommended to use textrun
 to have better layout. You can use ``addText``, ``addLink``,
-``addTextBreak``, ``addImage``, ``addObject`` on footnotes and endnotes.
+``addTextBreak``, ``addImage``, ``addOLEObject`` on footnotes and endnotes.
 
 On textrun:
 
@@ -465,4 +472,28 @@ The comment can contain formatted text. Once the comment has been added, it can
     // link the comment to the text you just created
     $text->setCommentStart($comment);
 
-If no end is set for a comment using the ``setCommentEnd``, the comment will be ended automatically at the end of the element it is started on.
\ No newline at end of file
+If no end is set for a comment using the ``setCommentEnd``, the comment will be ended automatically at the end of the element it is started on.
+
+Track Changes
+-------------
+
+Track changes can be set on text elements. There are 2 ways to set the change information on an element.
+Either by calling the `setChangeInfo()`, or by setting the `TrackChange` instance on the element with `setTrackChange()`.
+
+.. code-block:: php
+    $phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+    // New portrait section
+    $section = $phpWord->addSection();
+    $textRun = $section->addTextRun();
+
+    $text = $textRun->addText('Hello World! Time to ');
+
+    $text = $textRun->addText('wake ', array('bold' => true));
+    $text->setChangeInfo(TrackChange::INSERTED, 'Fred', time() - 1800);
+
+    $text = $textRun->addText('up');
+    $text->setTrackChange(new TrackChange(TrackChange::INSERTED, 'Fred'));
+
+    $text = $textRun->addText('go to sleep');
+    $text->setChangeInfo(TrackChange::DELETED, 'Barney', new \DateTime('@' . (time() - 3600)));
diff --git a/samples/Sample_16_Object.php b/samples/Sample_16_Object.php
index 8b05b9e8..c4db7f61 100644
--- a/samples/Sample_16_Object.php
+++ b/samples/Sample_16_Object.php
@@ -9,7 +9,7 @@ $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->addSection();
 $section->addText('You can open this OLE object by double clicking on the icon:');
 $section->addTextBreak(2);
-$section->addObject('resources/_sheet.xls');
+$section->addOLEObject('resources/_sheet.xls');
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/samples/Sample_39_TrackChanges.php b/samples/Sample_39_TrackChanges.php
new file mode 100644
index 00000000..e6a30668
--- /dev/null
+++ b/samples/Sample_39_TrackChanges.php
@@ -0,0 +1,29 @@
+<?php
+use PhpOffice\PhpWord\Element\TrackChange;
+
+include_once 'Sample_Header.php';
+
+// New Word Document
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+// New portrait section
+$section = $phpWord->addSection();
+$textRun = $section->addTextRun();
+
+$text = $textRun->addText('Hello World! Time to ');
+
+$text = $textRun->addText('wake ', array('bold' => true));
+$text->setChangeInfo(TrackChange::INSERTED, 'Fred', time() - 1800);
+
+$text = $textRun->addText('up');
+$text->setTrackChange(new TrackChange(TrackChange::INSERTED, 'Fred'));
+
+$text = $textRun->addText('go to sleep');
+$text->setChangeInfo(TrackChange::DELETED, 'Barney', new \DateTime('@' . (time() - 3600)));
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/samples/resources/Sample_11_ReadWord2007.docx b/samples/resources/Sample_11_ReadWord2007.docx
index c9a50f485a3c8d942fc7982061c5905f342c7634..3faf6f1213f13e82466ef29200862498d2ef7014 100644
GIT binary patch
delta 52080
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
P4(J~eD8+I5<JbQISH0#W

delta 56568
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
Mpd!?_Ya6Zq0b~2=C;$Ke

diff --git a/samples/resources/Sample_24_ReadODText.odt b/samples/resources/Sample_24_ReadODText.odt
index d37c4e6629209390eca9e281454d1eb14e77307f..59ac16da03ff6c11bc589f4b6ab89193851329a0 100644
GIT binary patch
literal 11540
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
HOYQ#wPQ_E}

literal 11952
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
S008FgU*~Olj*<TO_5T0^n7FI}

diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 28d45672..4a5f83f5 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -81,7 +81,7 @@ abstract class AbstractContainer extends AbstractElement
     {
         $elements = array(
             'Text', 'TextRun', 'Bookmark', 'Link', 'PreserveText', 'TextBreak',
-            'ListItem', 'ListItemRun', 'Table', 'Image', 'Object',
+            'ListItem', 'ListItemRun', 'Table', 'Image', 'Object', 'OLEObject',
             'Footnote', 'Endnote', 'CheckBox', 'TextBox', 'Field',
             'Line', 'Shape', 'Title', 'TOC', 'PageBreak',
             'Chart', 'FormField', 'SDT', 'Comment',
@@ -157,7 +157,7 @@ abstract class AbstractContainer extends AbstractElement
     /**
      * Get all elements
      *
-     * @return array
+     * @return \PhpOffice\PhpWord\Element\AbstractElement[]
      */
     public function getElements()
     {
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 63892b74..36c49af0 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -93,6 +93,13 @@ abstract class AbstractElement
      */
     private $nestedLevel = 0;
 
+    /**
+     * changed element info
+     *
+     * @var TrackChange
+     */
+    private $trackChange;
+
     /**
      * Parent container type
      *
@@ -425,6 +432,38 @@ abstract class AbstractElement
         return $style;
     }
 
+    /**
+     * Sets the trackChange information
+     *
+     * @param TrackChange $trackChange
+     */
+    public function setTrackChange(TrackChange $trackChange)
+    {
+        $this->trackChange = $trackChange;
+    }
+
+    /**
+     * Gets the trackChange information
+     *
+     * @return TrackChange
+     */
+    public function getTrackChange()
+    {
+        return $this->trackChange;
+    }
+
+    /**
+     * Set changed
+     *
+     * @param string $type INSERTED|DELETED
+     * @param string $author
+     * @param null|int|\DateTime $date allways in UTC
+     */
+    public function setChangeInfo($type, $author, $date = null)
+    {
+        $this->trackChange = new TrackChange($type, $author, $date);
+    }
+
     /**
      * Set enum value
      *
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 18836929..205ff598 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -55,12 +55,12 @@ class Comment extends TrackChange
      * Create a new Comment Element
      *
      * @param string $author
-     * @param \DateTime $date
+     * @param null|\DateTime $date
      * @param string $initials
      */
     public function __construct($author, $date = null, $initials = null)
     {
-        parent::__construct($author, $date);
+        parent::__construct(null, $author, $date);
         $this->initials = $initials;
     }
 
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 44327f26..dde616cc 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -20,14 +20,25 @@ namespace PhpOffice\PhpWord\Element;
 /**
  * TrackChange element
  * @see http://datypic.com/sc/ooxml/t-w_CT_TrackChange.html
+ * @see http://datypic.com/sc/ooxml/t-w_CT_RunTrackChange.html
  */
 class TrackChange extends AbstractContainer
 {
+    const INSERTED = 'INSERTED';
+    const DELETED = 'DELETED';
+
     /**
      * @var string Container type
      */
     protected $container = 'TrackChange';
 
+    /**
+     * The type of change, (insert or delete), not applicable for PhpOffice\PhpWord\Element\Comment
+     *
+     * @var string
+     */
+    private $changeType;
+
     /**
      * Author
      *
@@ -45,13 +56,17 @@ class TrackChange extends AbstractContainer
     /**
      * Create a new TrackChange Element
      *
+     * @param string $changeType
      * @param string $author
-     * @param \DateTime $date
+     * @param null|int|\DateTime $date
      */
-    public function __construct($author, \DateTime $date = null)
+    public function __construct($changeType = null, $author = null, $date = null)
     {
+        $this->changeType = $changeType;
         $this->author = $author;
-        $this->date = $date;
+        if ($date !== null) {
+            $this->date = ($date instanceof \DateTime) ? $date : new \DateTime('@' . $date);
+        }
     }
 
     /**
@@ -73,4 +88,14 @@ class TrackChange extends AbstractContainer
     {
         return $this->date;
     }
+
+    /**
+     * Get the Change type
+     *
+     * @return string
+     */
+    public function getChangeType()
+    {
+        return $this->changeType;
+    }
 }
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index 8843d8a2..7a7a0468 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\ODText;
 
 use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 
 /**
@@ -37,6 +38,8 @@ class Content extends AbstractPart
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
 
+        $trackedChanges = array();
+
         $nodes = $xmlReader->getElements('office:body/office:text/*');
         if ($nodes->length > 0) {
             $section = $phpWord->addSection();
@@ -48,7 +51,37 @@ class Content extends AbstractPart
                         $section->addTitle($node->nodeValue, $depth);
                         break;
                     case 'text:p': // Paragraph
-                        $section->addText($node->nodeValue);
+                        $children = $node->childNodes;
+                        foreach ($children as $child) {
+                            switch ($child->nodeName) {
+                                case 'text:change-start':
+                                    $changeId = $child->getAttribute('text:change-id');
+                                    if (isset($trackedChanges[$changeId])) {
+                                        $changed = $trackedChanges[$changeId];
+                                    }
+                                    break;
+                                case 'text:change-end':
+                                    unset($changed);
+                                    break;
+                                case 'text:change':
+                                    $changeId = $child->getAttribute('text:change-id');
+                                    if (isset($trackedChanges[$changeId])) {
+                                        $changed = $trackedChanges[$changeId];
+                                    }
+                                    break;
+                            }
+                        }
+
+                        $element = $section->addText($node->nodeValue);
+                        if (isset($changed) && is_array($changed)) {
+                            $element->setTrackChange($changed['changed']);
+                            if (isset($changed['textNodes'])) {
+                                foreach ($changed['textNodes'] as $changedNode) {
+                                    $element = $section->addText($changedNode->nodeValue);
+                                    $element->setTrackChange($changed['changed']);
+                                }
+                            }
+                        }
                         break;
                     case 'text:list': // List
                         $listItems = $xmlReader->getElements('text:list-item/text:p', $node);
@@ -57,6 +90,21 @@ class Content extends AbstractPart
                             $section->addListItem($listItem->nodeValue, 0);
                         }
                         break;
+                    case 'text:tracked-changes':
+                        $changedRegions = $xmlReader->getElements('text:changed-region', $node);
+                        foreach ($changedRegions as $changedRegion) {
+                            $type = ($changedRegion->firstChild->nodeName == 'text:insertion') ? TrackChange::INSERTED : TrackChange::DELETED;
+                            $creatorNode = $xmlReader->getElements('office:change-info/dc:creator', $changedRegion->firstChild);
+                            $author = $creatorNode[0]->nodeValue;
+                            $dateNode = $xmlReader->getElements('office:change-info/dc:date', $changedRegion->firstChild);
+                            $date = $dateNode[0]->nodeValue;
+                            $date = preg_replace('/\.\d+$/', '', $date);
+                            $date = \DateTime::createFromFormat('Y-m-d\TH:i:s', $date);
+                            $changed = new TrackChange($type, $author, $date);
+                            $textNodes = $xmlReader->getElements('text:deletion/text:p', $changedRegion);
+                            $trackedChanges[$changedRegion->getAttribute('text:id')] = array('changed'  => $changed, 'textNodes'=> $textNodes);
+                        }
+                        break;
                 }
             }
         }
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 3d853e8f..366bde7e 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 
 /**
@@ -156,8 +157,10 @@ abstract class AbstractPart
         } else {
             // Text and TextRun
             $runCount = $xmlReader->countElements('w:r', $domNode);
+            $insCount = $xmlReader->countElements('w:ins', $domNode);
+            $delCount = $xmlReader->countElements('w:del', $domNode);
             $linkCount = $xmlReader->countElements('w:hyperlink', $domNode);
-            $runLinkCount = $runCount + $linkCount;
+            $runLinkCount = $runCount + $insCount + $delCount + $linkCount;
             if (0 == $runLinkCount) {
                 $parent->addTextBreak(null, $paragraphStyle);
             } else {
@@ -185,6 +188,13 @@ abstract class AbstractPart
      */
     protected function readRun(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart, $paragraphStyle = null)
     {
+        if (in_array($domNode->nodeName, array('w:ins', 'w:del'))) {
+            $nodes = $xmlReader->getElements('*', $domNode);
+            foreach ($nodes as $node) {
+                return $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
+            }
+        }
+
         if (!in_array($domNode->nodeName, array('w:r', 'w:hyperlink'))) {
             return;
         }
@@ -228,8 +238,19 @@ abstract class AbstractPart
                 }
             } else {
                 // TextRun
-                $textContent = $xmlReader->getValue('w:t', $domNode);
-                $parent->addText($textContent, $fontStyle, $paragraphStyle);
+                if ($domNode->parentNode->nodeName == 'w:del') {
+                    $textContent = $xmlReader->getValue('w:delText', $domNode);
+                } else {
+                    $textContent = $xmlReader->getValue('w:t', $domNode);
+                }
+                /** @var AbstractElement $element */
+                $element = $parent->addText($textContent, $fontStyle, $paragraphStyle);
+                if (in_array($domNode->parentNode->nodeName, array('w:ins', 'w:del'))) {
+                    $type = ($domNode->parentNode->nodeName == 'w:del') ? TrackChange::DELETED : TrackChange::INSERTED;
+                    $author = $domNode->parentNode->getAttribute('w:author');
+                    $date = \DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $domNode->parentNode->getAttribute('w:date'));
+                    $element->setChangeInfo($type, $author, $date);
+                }
             }
         }
     }
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index c6e64e45..8719641e 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -56,7 +56,7 @@ class Styles extends AbstractPart
         if ($paragraphDefaults !== null) {
             $paragraphDefaultStyle = $this->readParagraphStyle($xmlReader, $paragraphDefaults);
             if ($paragraphDefaultStyle != null) {
-                $phpWord->setDefaultParagraphStyle();
+                $phpWord->setDefaultParagraphStyle($paragraphDefaultStyle);
             }
         }
 
diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index 71cb7566..9f8f7773 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -17,6 +17,7 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
@@ -121,6 +122,9 @@ class Text extends AbstractElement
             $content .= "<p{$style}>";
         }
 
+        //open track change tag
+        $content .= $this->writeTrackChangeOpening();
+
         return $content;
     }
 
@@ -132,6 +136,10 @@ class Text extends AbstractElement
     protected function writeClosing()
     {
         $content = '';
+
+        //close track change tag
+        $content .= $this->writeTrackChangeClosing();
+
         if (!$this->withoutP) {
             if (Settings::isOutputEscapingEnabled()) {
                 $content .= $this->escaper->escapeHtml($this->closingText);
@@ -145,6 +153,63 @@ class Text extends AbstractElement
         return $content;
     }
 
+    /**
+     * writes the track change opening tag
+     *
+     * @return string the HTML, an empty string if no track change information
+     */
+    private function writeTrackChangeOpening()
+    {
+        $changed = $this->element->getTrackChange();
+        if ($changed == null) {
+            return '';
+        }
+
+        $content = '';
+        if (($changed->getChangeType() == TrackChange::INSERTED)) {
+            $content .= '<ins data-phpword-prop=\'';
+        } elseif ($changed->getChangeType() == TrackChange::DELETED) {
+            $content .= '<del data-phpword-prop=\'';
+        }
+
+        $changedProp = array('changed' => array('author'=> $changed->getAuthor(), 'id'    => $this->element->getElementId()));
+        if ($changed->getDate() != null) {
+            $changedProp['changed']['date'] = $changed->getDate()->format('Y-m-d\TH:i:s\Z');
+        }
+        $content .= json_encode($changedProp);
+        $content .= '\' ';
+        $content .= 'title="' . $changed->getAuthor();
+        if ($changed->getDate() != null) {
+            $dateUser = $changed->getDate()->format('Y-m-d H:i:s');
+            $content .= ' - ' . $dateUser;
+        }
+        $content .= '">';
+
+        return $content;
+    }
+
+    /**
+     * writes the track change closing tag
+     *
+     * @return string the HTML, an empty string if no track change information
+     */
+    private function writeTrackChangeClosing()
+    {
+        $changed = $this->element->getTrackChange();
+        if ($changed == null) {
+            return '';
+        }
+
+        $content = '';
+        if (($changed->getChangeType() == TrackChange::INSERTED)) {
+            $content .= '</ins>';
+        } elseif ($changed->getChangeType() == TrackChange::DELETED) {
+            $content .= '</del>';
+        }
+
+        return $content;
+    }
+
     /**
      * Write paragraph style
      *
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index 1fc0b800..f9259fc5 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -17,6 +17,7 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\Exception\Exception;
 
 /**
@@ -51,29 +52,50 @@ class Text extends AbstractElement
         if (!$this->withoutP) {
             $xmlWriter->startElement('text:p'); // text:p
         }
-        if (empty($fontStyle)) {
-            if (empty($paragraphStyle)) {
-                $xmlWriter->writeAttribute('text:style-name', 'P1');
-            } elseif (is_string($paragraphStyle)) {
-                $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
-            }
-            $this->writeText($element->getText());
-        } else {
-            if (empty($paragraphStyle)) {
-                $xmlWriter->writeAttribute('text:style-name', 'Standard');
-            } elseif (is_string($paragraphStyle)) {
-                $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
-            }
-            // text:span
-            $xmlWriter->startElement('text:span');
-            if (is_string($fontStyle)) {
-                $xmlWriter->writeAttribute('text:style-name', $fontStyle);
-            }
-            $this->writeText($element->getText());
+        if ($element->getTrackChange() != null && $element->getTrackChange()->getChangeType() == TrackChange::DELETED) {
+            $xmlWriter->startElement('text:change');
+            $xmlWriter->writeAttribute('text:change-id', $element->getTrackChange()->getElementId());
             $xmlWriter->endElement();
+        } else {
+            if (empty($fontStyle)) {
+                if (empty($paragraphStyle)) {
+                    $xmlWriter->writeAttribute('text:style-name', 'P1');
+                } elseif (is_string($paragraphStyle)) {
+                    $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
+                }
+                $this->writeChangeInsertion(true, $element->getTrackChange());
+                $this->writeText($element->getText());
+                $this->writeChangeInsertion(false, $element->getTrackChange());
+            } else {
+                if (empty($paragraphStyle)) {
+                    $xmlWriter->writeAttribute('text:style-name', 'Standard');
+                } elseif (is_string($paragraphStyle)) {
+                    $xmlWriter->writeAttribute('text:style-name', $paragraphStyle);
+                }
+                // text:span
+                $xmlWriter->startElement('text:span');
+                if (is_string($fontStyle)) {
+                    $xmlWriter->writeAttribute('text:style-name', $fontStyle);
+                }
+                $this->writeChangeInsertion(true, $element->getTrackChange());
+                $this->writeText($element->getText());
+                $this->writeChangeInsertion(false, $element->getTrackChange());
+                $xmlWriter->endElement();
+            }
         }
         if (!$this->withoutP) {
             $xmlWriter->endElement(); // text:p
         }
     }
+
+    private function writeChangeInsertion($start = true, TrackChange $trackChange = null)
+    {
+        if ($trackChange == null || $trackChange->getChangeType() != TrackChange::INSERTED) {
+            return;
+        }
+        $xmlWriter = $this->getXmlWriter();
+        $xmlWriter->startElement('text:change-' . ($start ? 'start' : 'end'));
+        $xmlWriter->writeAttribute('text:change-id', $trackChange->getElementId());
+        $xmlWriter->endElement();
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index 8ae4dca9..19d3e54a 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -18,10 +18,12 @@
 namespace PhpOffice\PhpWord\Writer\ODText\Part;
 
 use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Image;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\Element\Text;
 use PhpOffice\PhpWord\Element\TextRun;
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
@@ -74,6 +76,40 @@ class Content extends AbstractPart
         $xmlWriter->startElement('office:body');
         $xmlWriter->startElement('office:text');
 
+        // Tracked changes declarations
+        $trackedChanges = array();
+        $sections = $phpWord->getSections();
+        foreach ($sections as $section) {
+            $this->collectTrackedChanges($section, $trackedChanges);
+        }
+        $xmlWriter->startElement('text:tracked-changes');
+        foreach ($trackedChanges as $trackedElement) {
+            $trackedChange = $trackedElement->getTrackChange();
+            $xmlWriter->startElement('text:changed-region');
+            $trackedChange->setElementId();
+            $xmlWriter->writeAttribute('text:id', $trackedChange->getElementId());
+
+            if (($trackedChange->getChangeType() == TrackChange::INSERTED)) {
+                $xmlWriter->startElement('text:insertion');
+            } elseif ($trackedChange->getChangeType() == TrackChange::DELETED) {
+                $xmlWriter->startElement('text:deletion');
+            }
+
+            $xmlWriter->startElement('office:change-info');
+            $xmlWriter->writeElement('dc:creator', $trackedChange->getAuthor());
+            if ($trackedChange->getDate() != null) {
+                $xmlWriter->writeElement('dc:date', $trackedChange->getDate()->format('Y-m-d\TH:i:s\Z'));
+            }
+            $xmlWriter->endElement(); // office:change-info
+            if ($trackedChange->getChangeType() == TrackChange::DELETED) {
+                $xmlWriter->writeElement('text:p', $trackedElement->getText());
+            }
+
+            $xmlWriter->endElement(); // text:insertion|text:deletion
+            $xmlWriter->endElement(); // text:changed-region
+        }
+        $xmlWriter->endElement(); // text:tracked-changes
+
         // Sequence declarations
         $sequences = array('Illustration', 'Table', 'Text', 'Drawing');
         $xmlWriter->startElement('text:sequence-decls');
@@ -242,4 +278,23 @@ class Content extends AbstractPart
             $element->setParagraphStyle("P{$paragraphStyleCount}");
         }
     }
+
+    /**
+     * Finds all tracked changes
+     *
+     * @param AbstractContainer $container
+     * @param \PhpOffice\PhpWord\Element\AbstractElement[] $trackedChanges
+     */
+    private function collectTrackedChanges(AbstractContainer $container, &$trackedChanges = array())
+    {
+        $elements = $container->getElements();
+        foreach ($elements as $element) {
+            if ($element->getTrackChange() != null) {
+                $trackedChanges[] = $element;
+            }
+            if (is_callable(array($element, 'getElements'))) {
+                $this->collectTrackedChanges($element, $trackedChanges);
+            }
+        }
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index e7149432..130b912b 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
+use PhpOffice\PhpWord\Element\TrackChange;
+
 /**
  * Text element writer
  *
@@ -37,16 +39,66 @@ class Text extends AbstractElement
 
         $this->startElementP();
 
+        $this->writeOpeningTrackChange();
+
         $xmlWriter->startElement('w:r');
 
         $this->writeFontStyle();
 
-        $xmlWriter->startElement('w:t');
+        $textElement = 'w:t';
+        //'w:delText' in case of deleted text
+        $changed = $element->getTrackChange();
+        if ($changed != null && $changed->getChangeType() == TrackChange::DELETED) {
+            $textElement = 'w:delText';
+        }
+        $xmlWriter->startElement($textElement);
+
         $xmlWriter->writeAttribute('xml:space', 'preserve');
         $this->writeText($this->getText($element->getText()));
         $xmlWriter->endElement();
         $xmlWriter->endElement(); // w:r
 
+        $this->writeClosingTrackChange();
+
         $this->endElementP(); // w:p
     }
+
+    /**
+     * Write opening of changed element
+     */
+    protected function writeOpeningTrackChange()
+    {
+        $changed = $this->getElement()->getTrackChange();
+        if ($changed == null) {
+            return;
+        }
+
+        $xmlWriter = $this->getXmlWriter();
+
+        if (($changed->getChangeType() == TrackChange::INSERTED)) {
+            $xmlWriter->startElement('w:ins');
+        } elseif ($changed->getChangeType() == TrackChange::DELETED) {
+            $xmlWriter->startElement('w:del');
+        }
+        $xmlWriter->writeAttribute('w:author', $changed->getAuthor());
+        if ($changed->getDate() != null) {
+            $xmlWriter->writeAttribute('w:date', $changed->getDate()->format('Y-m-d\TH:i:s\Z'));
+        }
+        $xmlWriter->writeAttribute('w:id', $this->getElement()->getElementId());
+    }
+
+    /**
+     * Write ending
+     */
+    protected function writeClosingTrackChange()
+    {
+        $changed = $this->getElement()->getTrackChange();
+        if ($changed == null) {
+            return;
+        }
+
+        $xmlWriter = $this->getXmlWriter();
+
+        $xmlWriter->endElement(); // w:ins|w:del
+    }
 }
diff --git a/tests/PhpWord/Element/TrackChangeTest.php b/tests/PhpWord/Element/TrackChangeTest.php
new file mode 100644
index 00000000..3249f10b
--- /dev/null
+++ b/tests/PhpWord/Element/TrackChangeTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Element;
+
+/**
+ * Test class for PhpOffice\PhpWord\Element\TrackChange
+ *
+ * @runTestsInSeparateProcesses
+ */
+class TrackChangeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * New instance
+     */
+    public function testConstructDefault()
+    {
+        $author = 'Test User';
+        $date = new \DateTime('2000-01-01');
+        $oTrackChange = new TrackChange(TrackChange::INSERTED, $author, $date);
+
+        $oText = new Text('dummy text');
+        $oText->setTrackChange($oTrackChange);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TrackChange', $oTrackChange);
+        $this->assertEquals($author, $oTrackChange->getAuthor());
+        $this->assertEquals($date, $oTrackChange->getDate());
+        $this->assertEquals(TrackChange::INSERTED, $oTrackChange->getChangeType());
+    }
+}
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 97a8fb15..1ad2ff53 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -259,7 +259,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         Html::addHtml($section, $html, false, false);
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
-        echo $doc->printXml();
+
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:numPr/w:numId'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
 
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 4f0d50d9..f91a8479 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -19,8 +19,8 @@ namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\Comment;
-use PhpOffice\PhpWord\Element\Text;
 use PhpOffice\PhpWord\Element\TextRun;
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
@@ -415,4 +415,20 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:commentRangeEnd'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:commentReference'));
     }
+
+    public function testTrackChange()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $text = $section->addText('my dummy text');
+        $text->setChangeInfo(TrackChange::INSERTED, 'author name');
+        $text2 = $section->addText('my other text');
+        $text2->setTrackChange(new TrackChange(TrackChange::DELETED, 'another author', new \DateTime()));
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:ins/w:r'));
+        $this->assertEquals('author name', $doc->getElementAttribute('/w:document/w:body/w:p/w:ins', 'w:author'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:del/w:r/w:delText'));
+    }
 }

From 91a8dd3b221e24b9654c38576119b804f8f66634 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 10 Feb 2018 22:16:55 +0100
Subject: [PATCH 220/370] add parsing of p:br and add unit test

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 10 +++-
 tests/PhpWord/Reader/Word2007/ElementTest.php | 46 +++++++++++++++
 .../PhpWord/_includes/AbstractTestReader.php  | 59 +++++++++++++++++++
 3 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpWord/Reader/Word2007/ElementTest.php
 create mode 100644 tests/PhpWord/_includes/AbstractTestReader.php

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 3d853e8f..5ce84650 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -93,7 +93,7 @@ abstract class AbstractPart
      *
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $domNode
-     * @param mixed $parent
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      *
      * @todo Get font style for preserve text
@@ -177,7 +177,7 @@ abstract class AbstractPart
      *
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $domNode
-     * @param mixed $parent
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
      *
@@ -226,7 +226,11 @@ abstract class AbstractPart
                     $textContent = "&lt;Object: {$target}>";
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
                 }
-            } else {
+            }
+            if ($xmlReader->elementExists('w:br', $domNode)) {
+                $parent->addTextBreak();
+            }
+            if ($xmlReader->elementExists('w:t', $domNode)) {
                 // TextRun
                 $textContent = $xmlReader->getValue('w:t', $domNode);
                 $parent->addText($textContent, $fontStyle, $paragraphStyle);
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
new file mode 100644
index 00000000..67c2eb13
--- /dev/null
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use PhpOffice\PhpWord\AbstractTestReader;
+
+/**
+ * Test class for PhpOffice\PhpWord\Reader\Word2007\Element subnamespace
+ */
+class ElementTest extends AbstractTestReader
+{
+    /**
+     * Test reading of textbreak
+     */
+    public function testReadTextBreak()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:br/>
+                <w:t xml:space="preserve">test string</w:t>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextBreak', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[1]);
+        $this->assertEquals('test string', $elements[1]->getText());
+    }
+}
diff --git a/tests/PhpWord/_includes/AbstractTestReader.php b/tests/PhpWord/_includes/AbstractTestReader.php
new file mode 100644
index 00000000..f138ac76
--- /dev/null
+++ b/tests/PhpWord/_includes/AbstractTestReader.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord;
+
+use PhpOffice\PhpWord\Reader\Word2007\Document;
+
+/**
+ * Base class for Word2007 reader tests
+ */
+abstract class AbstractTestReader extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Builds a PhpWord instance based on the xml passed
+     *
+     * @param string $documentXml
+     * @return \PhpOffice\PhpWord\PhpWord
+     */
+    protected function getDocumentFromString($documentXml)
+    {
+        $phpWord = new PhpWord();
+        $file = __DIR__ . '/../_files/temp.docx';
+        $zip = new \ZipArchive();
+        $zip->open($file, \ZipArchive::CREATE);
+        $zip->addFromString('document.xml', '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>' . $documentXml . '</w:body></w:document>');
+        $zip->close();
+        $documentReader = new Document($file, 'document.xml');
+        $documentReader->read($phpWord);
+        unlink($file);
+
+        return $phpWord;
+    }
+
+    /**
+     * Returns the element at position $index in the array
+     *
+     * @param array $array
+     * @param number $index
+     * @return mixed
+     */
+    protected function get(array $array, $index = 0)
+    {
+        return $array[$index];
+    }
+}

From 874c6d6fb6083ec2902e27d4e639f0b08aa3c76d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 10 Feb 2018 22:19:04 +0100
Subject: [PATCH 221/370] update changelog

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d3f60f3..ae661e5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,11 @@ v0.15.0 (?? ??? 2018)
 - Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
 
 ### Fixed
-- fix reading of docx default style - @troosan #1238
-- fix the size unit of when parsing html images - @troosan #1254
-- fixed HTML parsing of nested lists - @troosan #1265
+- Fix reading of docx default style - @troosan #1238
+- Fix the size unit of when parsing html images - @troosan #1254
+- Fixed HTML parsing of nested lists - @troosan #1265
 - Save PNG alpha information when using remote images. @samsullivan #779
+- fix parsing of `<w:br/>` tag. @troosan #1274
 
 
 

From 377fb99fbc85683e2efcaf4e153a76b9cd558fe7 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 10 Feb 2018 23:43:15 +0100
Subject: [PATCH 222/370] Add HTML writer for Bookmarks + tests

---
 CHANGELOG.md                                 |  3 +-
 src/PhpWord/Writer/HTML/Element/Bookmark.php | 45 ++++++++++++++++++++
 src/PhpWord/Writer/HTML/Element/Link.php     |  8 ++--
 tests/PhpWord/Writer/HTML/ElementTest.php    |  2 +-
 tests/PhpWord/Writer/HTMLTest.php            |  2 +
 5 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 src/PhpWord/Writer/HTML/Element/Bookmark.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae661e5b..3b0110b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,8 @@ v0.15.0 (?? ??? 2018)
 - Fix the size unit of when parsing html images - @troosan #1254
 - Fixed HTML parsing of nested lists - @troosan #1265
 - Save PNG alpha information when using remote images. @samsullivan #779
-- fix parsing of `<w:br/>` tag. @troosan #1274
+- Fix parsing of `<w:br/>` tag. @troosan #1274
+- Bookmark are not writton as internal link in html writer @troosan #1263
 
 
 
diff --git a/src/PhpWord/Writer/HTML/Element/Bookmark.php b/src/PhpWord/Writer/HTML/Element/Bookmark.php
new file mode 100644
index 00000000..649cc7b8
--- /dev/null
+++ b/src/PhpWord/Writer/HTML/Element/Bookmark.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\HTML\Element;
+
+/**
+ * Bookmark element HTML writer
+ *
+ * @since 0.15.0
+ */
+class Bookmark extends Text
+{
+    /**
+     * Write bookmark
+     *
+     * @return string
+     */
+    public function write()
+    {
+        if (!$this->element instanceof \PhpOffice\PhpWord\Element\Bookmark) {
+            return '';
+        }
+
+        $content = '';
+        $content .= $this->writeOpening();
+        $content .= "<a name=\"{$this->element->getName()}\"/>";
+        $content .= $this->writeClosing();
+
+        return $content;
+    }
+}
diff --git a/src/PhpWord/Writer/HTML/Element/Link.php b/src/PhpWord/Writer/HTML/Element/Link.php
index bdea985a..f29880d4 100644
--- a/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/src/PhpWord/Writer/HTML/Element/Link.php
@@ -37,12 +37,12 @@ class Link extends Text
             return '';
         }
 
-        $content = '';
-        $content .= $this->writeOpening();
+        $prefix = $this->element->isInternal() ? '#' : '';
+        $content = $this->writeOpening();
         if (Settings::isOutputEscapingEnabled()) {
-            $content .= "<a href=\"{$this->escaper->escapeHtmlAttr($this->element->getSource())}\">{$this->escaper->escapeHtml($this->element->getText())}</a>";
+            $content .= "<a href=\"{$prefix}{$this->escaper->escapeHtmlAttr($this->element->getSource())}\">{$this->escaper->escapeHtml($this->element->getText())}</a>";
         } else {
-            $content .= "<a href=\"{$this->element->getSource()}\">{$this->element->getText()}</a>";
+            $content .= "<a href=\"{$prefix}{$this->element->getSource()}\">{$this->element->getText()}</a>";
         }
         $content .= $this->writeClosing();
 
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 86856d5c..fc092ba3 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -31,7 +31,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
      */
     public function testUnmatchedElements()
     {
-        $elements = array('Container', 'Footnote', 'Image', 'Link', 'ListItem', 'Table', 'Title');
+        $elements = array('Container', 'Footnote', 'Image', 'Link', 'ListItem', 'Table', 'Title', 'Bookmark');
         foreach ($elements as $element) {
             $objectClass = 'PhpOffice\\PhpWord\\Writer\\HTML\\Element\\' . $element;
             $parentWriter = new HTML();
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index bdfc44e3..f2bc7175 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -73,6 +73,7 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
         );
         $phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER, 'spaceAfter' => 20, 'spaceBefore' => 20));
         $section = $phpWord->addSection();
+        $section->addBookmark('top');
         $section->addText(htmlspecialchars('Test 1', ENT_COMPAT, 'UTF-8'), 'Font', 'Paragraph');
         $section->addTextBreak();
         $section->addText(
@@ -128,6 +129,7 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
         $cell->addFootnote();
         $cell->addEndnote();
         $cell = $table->addRow()->addCell();
+        $section->addLink('top', 'back to top', null, null, true);
 
         $writer = new HTML($phpWord);
 

From 5ff15e06a2b2e0da4716567f20b05a89aaa7d018 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 11 Feb 2018 00:17:19 +0100
Subject: [PATCH 223/370] update testing instructions

[ci skip]
---
 docs/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index cff513a3..24ba001c 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -6,6 +6,6 @@ Fixes # (issue)
 
 ### Checklist:
 
-- [ ] I have run `composer check` and no errors were reported
-- [ ] The new code is covered by unit tests
+- [ ] I have run `composer run-script check --timeout=0` and no errors were reported
+- [ ] The new code is covered by unit tests (check build/coverage for coverage report)
 - [ ] I have update the documentation to describe the changes

From e846602d1ebdab8603b8c8b7d1b69a0577d3f780 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 11 Feb 2018 13:58:26 +0100
Subject: [PATCH 224/370] fix null check

[ci skip]
---
 src/PhpWord/Element/Image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 7eff87bc..5e73d4e4 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -313,7 +313,7 @@ class Image extends AbstractElement
 
             $zip = new ZipArchive();
             if ($zip->open($zipFilename) !== false) {
-                if ($zip->locateName($imageFilename)) {
+                if ($zip->locateName($imageFilename) !== false) {
                     $isTemp = true;
                     $zip->extractTo(Settings::getTempDir(), $imageFilename);
                     $actualSource = Settings::getTempDir() . DIRECTORY_SEPARATOR . $imageFilename;
@@ -458,7 +458,7 @@ class Image extends AbstractElement
 
         $zip = new ZipArchive();
         if ($zip->open($zipFilename) !== false) {
-            if ($zip->locateName($imageFilename)) {
+            if ($zip->locateName($imageFilename) !== false) {
                 $imageContent = $zip->getFromName($imageFilename);
                 if ($imageContent !== false) {
                     file_put_contents($tempFilename, $imageContent);

From 7ddaed240f46398166855c807c5256330e048738 Mon Sep 17 00:00:00 2001
From: ale rimoldi <ale.comp_06@xox.ch>
Date: Mon, 25 Jul 2016 10:11:52 +0200
Subject: [PATCH 225/370] table->setStretch() optionally avoids the table to
 stretch to the page width (only for word output)

---
 src/PhpWord/Style/Table.php                 | 33 +++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Style/Table.php | 15 ++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index a3d454f3..aa397949 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -28,6 +28,8 @@ class Table extends Border
     const WIDTH_AUTO = 'auto'; // Automatically determined width
     const WIDTH_PERCENT = 'pct'; // Width in fiftieths (1/50) of a percent (1% = 50 unit)
     const WIDTH_TWIP = 'dxa'; // Width in twentieths (1/20) of a point (twip)
+    const STRETCH_AUTO = 'autofit'; // Automatically stretch the table to fit the page width
+    const STRETCH_FIXED = 'fixed'; // Do not stretch the table to fit the page width
 
     /**
      * Is this a first row style?
@@ -121,6 +123,11 @@ class Table extends Border
      */
     private $unit = self::WIDTH_AUTO;
 
+    /**
+     * @var string Stretch the table to the page width
+     */
+    private $stretch = self::STRETCH_AUTO;
+
     /**
      * Create new table style
      *
@@ -582,6 +589,32 @@ class Table extends Border
         return $this;
     }
 
+    /**
+     * Get stretch
+     *
+     * @return string
+     */
+    public function getStretch()
+    {
+        return $this->stretch;
+    }
+
+    /**
+     * Set stretch
+     *
+     * Stretch the table to the page width
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setStretch($value = null)
+    {
+        $enum = array(self::STRETCH_AUTO, self::STRETCH_FIXED);
+        $this->stretch = $this->setEnumVal($value, $enum, $this->stretch);
+
+        return $this;
+    }
+
     /**
      * Get table style only property by checking if it's a firstRow
      *
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 620e4fbf..2c4066f1 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -77,6 +77,7 @@ class Table extends AbstractStyle
         }
 
         $this->writeWidth($xmlWriter, $style->getWidth(), $style->getUnit());
+        $this->writeLayout($xmlWriter, $style->getStretch());
         $this->writeMargin($xmlWriter, $style);
         $this->writeBorder($xmlWriter, $style);
 
@@ -106,6 +107,20 @@ class Table extends AbstractStyle
         $xmlWriter->endElement(); // w:tblW
     }
 
+    /**
+     * Enable/Disable automatic resizing of the table
+     *
+     * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
+     * @param string $layout autofit / fixed
+     * @return void
+     */
+    private function writeLayout(XMLWriter $xmlWriter, $stretch)
+    {
+        $xmlWriter->startElement('w:tblLayout');
+        $xmlWriter->writeAttribute('w:type', $stretch);
+        $xmlWriter->endElement(); // w:tblLayout
+    }
+
     /**
      * Write margin.
      *

From 6a926e26f136a41937c8f5aa2eaef79d40cadcd8 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 14 Feb 2018 00:39:37 +0100
Subject: [PATCH 226/370] refactor attribute name to layout, add doc and tests

---
 CHANGELOG.md                                  |  1 +
 docs/styles.rst                               |  1 +
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  1 +
 src/PhpWord/Style/Table.php                   | 36 +++++++-----
 src/PhpWord/Writer/Word2007/Style/Table.php   |  7 +--
 tests/PhpWord/Element/ImageTest.php           | 21 +++++++
 tests/PhpWord/Reader/Word2007/StyleTest.php   | 46 +++++++++++++++
 tests/PhpWord/Style/TableTest.php             | 11 ++++
 .../Writer/Word2007/Style/TableTest.php       | 58 +++++++++++++++++++
 9 files changed, 165 insertions(+), 17 deletions(-)
 create mode 100644 tests/PhpWord/Reader/Word2007/StyleTest.php
 create mode 100644 tests/PhpWord/Writer/Word2007/Style/TableTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 344517c7..762bf560 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ v0.15.0 (?? ??? 2018)
 - Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
 - Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
 - Add support for Track changes @Cip @troosan #354 #1262
+- Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/styles.rst b/docs/styles.rst
index 6166f5c9..031f3759 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -103,6 +103,7 @@ Available Table style options:
 - ``border(Top|Right|Bottom|Left)Size``. Border size in twips.
 - ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in twips.
 - ``width``. Table width in percent.
+- ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
 
 Available Row style options:
 
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 9276823b..09d32dbb 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -425,6 +425,7 @@ abstract class AbstractPart
                     $styleDefs["border{$ucfSide}Color"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:color');
                     $styleDefs["border{$ucfSide}Style"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:val');
                 }
+                $styleDefs['layout'] = array(self::READ_VALUE, 'w:tblLayout', 'w:type');
                 $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
             }
         }
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index aa397949..d0ff47ed 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -28,8 +28,20 @@ class Table extends Border
     const WIDTH_AUTO = 'auto'; // Automatically determined width
     const WIDTH_PERCENT = 'pct'; // Width in fiftieths (1/50) of a percent (1% = 50 unit)
     const WIDTH_TWIP = 'dxa'; // Width in twentieths (1/20) of a point (twip)
-    const STRETCH_AUTO = 'autofit'; // Automatically stretch the table to fit the page width
-    const STRETCH_FIXED = 'fixed'; // Do not stretch the table to fit the page width
+
+    //values for http://www.datypic.com/sc/ooxml/t-w_ST_TblLayoutType.html
+    /**
+     * AutoFit Table Layout
+     *
+     * @var string
+     */
+    const LAYOUT_AUTO = 'autofit';
+    /**
+     * Fixed Width Table Layout
+     *
+     * @var string
+     */
+    const LAYOUT_FIXED = 'fixed';
 
     /**
      * Is this a first row style?
@@ -124,9 +136,9 @@ class Table extends Border
     private $unit = self::WIDTH_AUTO;
 
     /**
-     * @var string Stretch the table to the page width
+     * @var string Table Layout
      */
-    private $stretch = self::STRETCH_AUTO;
+    private $layout = self::LAYOUT_AUTO;
 
     /**
      * Create new table style
@@ -590,27 +602,25 @@ class Table extends Border
     }
 
     /**
-     * Get stretch
+     * Get layout
      *
      * @return string
      */
-    public function getStretch()
+    public function getLayout()
     {
-        return $this->stretch;
+        return $this->layout;
     }
 
     /**
-     * Set stretch
-     *
-     * Stretch the table to the page width
+     * Set layout
      *
      * @param string $value
      * @return self
      */
-    public function setStretch($value = null)
+    public function setLayout($value = null)
     {
-        $enum = array(self::STRETCH_AUTO, self::STRETCH_FIXED);
-        $this->stretch = $this->setEnumVal($value, $enum, $this->stretch);
+        $enum = array(self::LAYOUT_AUTO, self::LAYOUT_FIXED);
+        $this->layout = $this->setEnumVal($value, $enum, $this->layout);
 
         return $this;
     }
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 26df8436..e2e8f978 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -77,7 +77,7 @@ class Table extends AbstractStyle
         }
 
         $this->writeWidth($xmlWriter, $style->getWidth(), $style->getUnit());
-        $this->writeLayout($xmlWriter, $style->getStretch());
+        $this->writeLayout($xmlWriter, $style->getLayout());
         $this->writeMargin($xmlWriter, $style);
         $this->writeBorder($xmlWriter, $style);
 
@@ -112,12 +112,11 @@ class Table extends AbstractStyle
      *
      * @param \PhpOffice\Common\XMLWriter $xmlWriter
      * @param string $layout autofit / fixed
-     * @return void
      */
-    private function writeLayout(XMLWriter $xmlWriter, $stretch)
+    private function writeLayout(XMLWriter $xmlWriter, $layout)
     {
         $xmlWriter->startElement('w:tblLayout');
-        $xmlWriter->writeAttribute('w:type', $stretch);
+        $xmlWriter->writeAttribute('w:type', $layout);
         $xmlWriter->endElement(); // w:tblLayout
     }
 
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 0966ea4d..8bebce91 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -210,6 +210,27 @@ class ImageTest extends \PHPUnit\Framework\TestCase
         $this->assertNotNull($image->getImageStringData(true));
     }
 
+    /**
+     * Test construct from GD
+     */
+    public function testConstructFromGd()
+    {
+        $source = 'http://php.net/images/logos/php-icon.png';
+
+        $image = new Image($source);
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Image', $image);
+        $this->assertEquals($source, $image->getSource());
+        $this->assertEquals(md5($source), $image->getMediaId());
+        $this->assertEquals('image/png', $image->getImageType());
+        $this->assertEquals('png', $image->getImageExtension());
+        $this->assertEquals('imagecreatefrompng', $image->getImageCreateFunction());
+        $this->assertEquals('imagepng', $image->getImageFunction());
+        $this->assertTrue($image->isMemImage());
+
+        $this->assertNotNull($image->getImageStringData());
+        $this->assertNotNull($image->getImageStringData(true));
+    }
+
     /**
      * Test invalid string image
      *
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
new file mode 100644
index 00000000..ce59f4c3
--- /dev/null
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use PhpOffice\PhpWord\AbstractTestReader;
+use PhpOffice\PhpWord\Style\Table;
+
+/**
+ * Test class for PhpOffice\PhpWord\Reader\Word2007\Styles
+ */
+class StyleTest extends AbstractTestReader
+{
+    /**
+     * Test reading of table layout
+     */
+    public function testReadTableLayout()
+    {
+        $documentXml = '<w:tbl>
+            <w:tblPr>
+                <w:tblLayout w:type="fixed"/>
+            </w:tblPr>
+        </w:tbl>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
+        $this->assertEquals(Table::LAYOUT_FIXED, $elements[0]->getStyle()->getLayout());
+    }
+}
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 2d57b1b8..dafdeb31 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -172,4 +172,15 @@ class TableTest extends \PHPUnit\Framework\TestCase
             $object->getBorderColor()
         );
     }
+
+    /**
+     * Tests table layout
+     */
+    public function testTableLayout()
+    {
+        $object = new Table();
+        $this->assertEquals(Table::LAYOUT_AUTO, $object->getLayout());
+        $object->setLayout(Table::LAYOUT_FIXED);
+        $this->assertEquals(Table::LAYOUT_FIXED, $object->getLayout());
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
new file mode 100644
index 00000000..a89dd610
--- /dev/null
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Style;
+
+use PhpOffice\PhpWord\Style\Table;
+use PhpOffice\PhpWord\TestHelperDOCX;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Table
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Table
+ * @runTestsInSeparateProcesses
+ */
+class TableTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Executed before each method of the class
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Test write styles
+     */
+    public function testTableLayout()
+    {
+        $tableStyle = new Table();
+        $tableStyle->setLayout(Table::LAYOUT_FIXED);
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable($tableStyle);
+        $table->addRow();
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblLayout';
+        $this->assertTrue($doc->elementExists($path));
+        $this->assertEquals(Table::LAYOUT_FIXED, $doc->getElementAttribute($path, 'w:type'));
+    }
+}

From e7232a715b26f77d75c2055e8f9259869d83cdf8 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Fri, 16 Feb 2018 14:34:37 +0100
Subject: [PATCH 227/370] Use singular form of twip

---
 docs/elements.rst |  6 +++---
 docs/general.rst  |  2 +-
 docs/styles.rst   | 28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index 7df3b163..12d46908 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -307,8 +307,8 @@ Your TOC can only be generated if you have add at least one title (See "Titles")
 Options for ``$tocStyle``:
 
 - ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in ``\PhpOffice\PhpWord\Style\TOC``.
-- ``tabPos``. The position of the tab where the page number appears in twips.
-- ``indent``. The indent factor of the titles in twips.
+- ``tabPos``. The position of the tab where the page number appears in twip.
+- ``indent``. The indent factor of the titles in twip.
 
 Footnotes & endnotes
 --------------------
@@ -429,7 +429,7 @@ Line elements can be added to sections by using ``addLine``.
 
 Available line style attributes:
 
-- ``weight``. Line width in twips.
+- ``weight``. Line width in twip.
 - ``color``. Defines the color of stroke.
 - ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot.
 - ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval.
diff --git a/docs/general.rst b/docs/general.rst
index 09a23cee..99d8b3ba 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -255,7 +255,7 @@ The base length unit in Open Office XML is twip. Twip means "TWentieth
 of an Inch Point", i.e. 1 twip = 1/1440 inch.
 
 You can use PHPWord helper functions to convert inches, centimeters, or
-points to twips.
+points to twip.
 
 .. code-block:: php
 
diff --git a/docs/styles.rst b/docs/styles.rst
index 031f3759..8f462a8c 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -11,26 +11,26 @@ Section
 Available Section style options:
 
 - ``borderBottomColor``. Border bottom color.
-- ``borderBottomSize``. Border bottom size (in twips).
+- ``borderBottomSize``. Border bottom size (in twip).
 - ``borderLeftColor``. Border left color.
-- ``borderLeftSize``. Border left size (in twips).
+- ``borderLeftSize``. Border left size (in twip).
 - ``borderRightColor``. Border right color.
-- ``borderRightSize``. Border right size (in twips).
+- ``borderRightSize``. Border right size (in twip).
 - ``borderTopColor``. Border top color.
-- ``borderTopSize``. Border top size (in twips).
+- ``borderTopSize``. Border top size (in twip).
 - ``breakType``. Section break type (nextPage, nextColumn, continuous, evenPage, oddPage).
 - ``colsNum``. Number of columns.
 - ``colsSpace``. Spacing between columns.
 - ``footerHeight``. Spacing to bottom of footer.
 - ``gutter``. Page gutter spacing.
 - ``headerHeight``. Spacing to top of header.
-- ``marginTop``. Page margin top (in twips).
-- ``marginLeft``. Page margin left (in twips).
-- ``marginRight``. Page margin right (in twips).
-- ``marginBottom``. Page margin bottom (in twips).
+- ``marginTop``. Page margin top (in twip).
+- ``marginLeft``. Page margin left (in twip).
+- ``marginRight``. Page margin right (in twip).
+- ``marginBottom``. Page margin bottom (in twip).
 - ``orientation``. Page orientation (``portrait``, which is default, or ``landscape``).
-- ``pageSizeH``. Page height (in twips). Implicitly defined by ``orientation`` option. Any changes are discouraged.
-- ``pageSizeW``. Page width (in twips). Implicitly defined by ``orientation`` option. Any changes are discouraged.
+- ``pageSizeH``. Page height (in twip). Implicitly defined by ``orientation`` option. Any changes are discouraged.
+- ``pageSizeW``. Page width (in twip). Implicitly defined by ``orientation`` option. Any changes are discouraged.
 
 .. _font-style:
 
@@ -100,8 +100,8 @@ Available Table style options:
    See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` classes for the details.
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Size``. Border size in twips.
-- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in twips.
+- ``border(Top|Right|Bottom|Left)Size``. Border size in twip.
+- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in twip.
 - ``width``. Table width in percent.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
 
@@ -115,13 +115,13 @@ Available Cell style options:
 
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Size``. Border size in twips.
+- ``border(Top|Right|Bottom|Left)Size``. Border size in twip.
 - ``gridSpan``. Number of columns spanned.
 - ``textDirection(btLr|tbRl)``. Direction of text.
    You can use constants ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_BTLR`` and ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_TBRL``
 - ``valign``. Vertical alignment, *top*, *center*, *both*, *bottom*.
 - ``vMerge``. *restart* or *continue*.
-- ``width``. Cell width in twips.
+- ``width``. Cell width in twip.
 
 .. _image-style:
 

From ab978356c38ffda37a3d5302cce64d66721b7e37 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Fri, 16 Feb 2018 14:40:31 +0100
Subject: [PATCH 228/370] Use same markup for describing unit of measurement

---
 docs/containers.rst |  2 +-
 docs/elements.rst   |  6 +++---
 docs/styles.rst     | 28 ++++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/containers.rst b/docs/containers.rst
index 3569cc50..dc194d59 100644
--- a/docs/containers.rst
+++ b/docs/containers.rst
@@ -79,7 +79,7 @@ Below are the properties of the line numbering style.
 
 -  ``start`` Line numbering starting value
 -  ``increment`` Line number increments
--  ``distance`` Distance between text and line numbering in twip
+-  ``distance`` Distance between text and line numbering in *twip*
 -  ``restart`` Line numbering restart setting
    continuous\|newPage\|newSection
 
diff --git a/docs/elements.rst b/docs/elements.rst
index 12d46908..d13abc56 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -307,8 +307,8 @@ Your TOC can only be generated if you have add at least one title (See "Titles")
 Options for ``$tocStyle``:
 
 - ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in ``\PhpOffice\PhpWord\Style\TOC``.
-- ``tabPos``. The position of the tab where the page number appears in twip.
-- ``indent``. The indent factor of the titles in twip.
+- ``tabPos``. The position of the tab where the page number appears in *twip*.
+- ``indent``. The indent factor of the titles in *twip*.
 
 Footnotes & endnotes
 --------------------
@@ -429,7 +429,7 @@ Line elements can be added to sections by using ``addLine``.
 
 Available line style attributes:
 
-- ``weight``. Line width in twip.
+- ``weight``. Line width in *twip*.
 - ``color``. Defines the color of stroke.
 - ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot.
 - ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval.
diff --git a/docs/styles.rst b/docs/styles.rst
index 8f462a8c..9d1cc4c5 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -11,26 +11,26 @@ Section
 Available Section style options:
 
 - ``borderBottomColor``. Border bottom color.
-- ``borderBottomSize``. Border bottom size (in twip).
+- ``borderBottomSize``. Border bottom size in *twip*.
 - ``borderLeftColor``. Border left color.
-- ``borderLeftSize``. Border left size (in twip).
+- ``borderLeftSize``. Border left size in *twip*.
 - ``borderRightColor``. Border right color.
-- ``borderRightSize``. Border right size (in twip).
+- ``borderRightSize``. Border right size in *twip*.
 - ``borderTopColor``. Border top color.
-- ``borderTopSize``. Border top size (in twip).
+- ``borderTopSize``. Border top size in *twip*.
 - ``breakType``. Section break type (nextPage, nextColumn, continuous, evenPage, oddPage).
 - ``colsNum``. Number of columns.
 - ``colsSpace``. Spacing between columns.
 - ``footerHeight``. Spacing to bottom of footer.
 - ``gutter``. Page gutter spacing.
 - ``headerHeight``. Spacing to top of header.
-- ``marginTop``. Page margin top (in twip).
-- ``marginLeft``. Page margin left (in twip).
-- ``marginRight``. Page margin right (in twip).
-- ``marginBottom``. Page margin bottom (in twip).
+- ``marginTop``. Page margin top in *twip*.
+- ``marginLeft``. Page margin left in *twip*.
+- ``marginRight``. Page margin right in *twip*.
+- ``marginBottom``. Page margin bottom in *twip*.
 - ``orientation``. Page orientation (``portrait``, which is default, or ``landscape``).
-- ``pageSizeH``. Page height (in twip). Implicitly defined by ``orientation`` option. Any changes are discouraged.
-- ``pageSizeW``. Page width (in twip). Implicitly defined by ``orientation`` option. Any changes are discouraged.
+- ``pageSizeH``. Page height in *twip*. Implicitly defined by ``orientation`` option. Any changes are discouraged.
+- ``pageSizeW``. Page width in *twip*. Implicitly defined by ``orientation`` option. Any changes are discouraged.
 
 .. _font-style:
 
@@ -100,8 +100,8 @@ Available Table style options:
    See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` classes for the details.
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Size``. Border size in twip.
-- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in twip.
+- ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
+- ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in *twip*.
 - ``width``. Table width in percent.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
 
@@ -115,13 +115,13 @@ Available Cell style options:
 
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
-- ``border(Top|Right|Bottom|Left)Size``. Border size in twip.
+- ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
 - ``gridSpan``. Number of columns spanned.
 - ``textDirection(btLr|tbRl)``. Direction of text.
    You can use constants ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_BTLR`` and ``\PhpOffice\PhpWord\Style\Cell::TEXT_DIR_TBRL``
 - ``valign``. Vertical alignment, *top*, *center*, *both*, *bottom*.
 - ``vMerge``. *restart* or *continue*.
-- ``width``. Cell width in twip.
+- ``width``. Cell width in *twip*.
 
 .. _image-style:
 

From fede4f736eac05f0444eb5a6bad7875356b00c94 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Fri, 16 Feb 2018 15:45:20 +0100
Subject: [PATCH 229/370] Add missing unit of measurement descriptions

---
 docs/styles.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/styles.rst b/docs/styles.rst
index 9d1cc4c5..8e155ca2 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -70,15 +70,15 @@ Available Paragraph style options:
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
    See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
 - ``basedOn``. Parent style.
-- ``hanging``. Hanging by how much.
-- ``indent``. Indent by how much.
+- ``hanging``. Hanging in *twip*.
+- ``indent``. Indent in *twip*.
 - ``keepLines``. Keep all lines on one page, *true* or *false*.
 - ``keepNext``. Keep paragraph with next paragraph, *true* or *false*.
 - ``lineHeight``. Text line height, e.g. *1.0*, *1.5*, etc.
 - ``next``. Style for next paragraph.
 - ``pageBreakBefore``. Start paragraph on next page, *true* or *false*.
-- ``spaceBefore``. Space before paragraph.
-- ``spaceAfter``. Space after paragraph.
+- ``spaceBefore``. Space before paragraph in *twip*.
+- ``spaceAfter``. Space after paragraph in *twip*.
 - ``spacing``. Space between lines.
 - ``spacingLineRule``. Line Spacing Rule. *auto*, *exact*, *atLeast*
 - ``tabs``. Set of custom tab stops.

From d061c6dc7c2a8bb21639300a8de5ab2b0d4c357a Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Thu, 15 Feb 2018 22:45:07 +0100
Subject: [PATCH 230/370] Remove zend-stdlib dependency

---
 composer.json                     | 1 -
 src/PhpWord/TemplateProcessor.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 614865d8..bceb5998 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,6 @@
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "zendframework/zend-stdlib": "^2.2 || ^3.0",
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 5dd7b0bf..269b25e9 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -17,13 +17,13 @@
 
 namespace PhpOffice\PhpWord;
 
+use PhpOffice\Common\Text;
 use PhpOffice\PhpWord\Escaper\RegExp;
 use PhpOffice\PhpWord\Escaper\Xml;
 use PhpOffice\PhpWord\Exception\CopyFileException;
 use PhpOffice\PhpWord\Exception\CreateTemporaryFileException;
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Shared\ZipArchive;
-use Zend\Stdlib\StringUtils;
 
 class TemplateProcessor
 {
@@ -192,7 +192,7 @@ class TemplateProcessor
      */
     protected static function ensureUtf8Encoded($subject)
     {
-        if (!StringUtils::isValidUtf8($subject)) {
+        if (!Text::isUTF8($subject)) {
             $subject = utf8_encode($subject);
         }
 

From ba035185c7f50cf66e78589cd158b22e516ddb8d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Feb 2018 00:09:14 +0100
Subject: [PATCH 231/370] point next dev version to develop branch

[ci skip]
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bceb5998..d1c35b40 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.15-dev"
+            "dev-develop": "0.15-dev"
         }
     }
 }

From 04d0c02e2374624bfb408da42fb4e81bcdbfe362 Mon Sep 17 00:00:00 2001
From: dox07 <stenandr@gmail.com>
Date: Sun, 18 Feb 2018 02:10:10 +0300
Subject: [PATCH 232/370] Add support for cellSpacing for tables (#1040)

* Add cellSpacing  into table
* add word 2007 reader
* add tests
* add documentation
---
 CHANGELOG.md                                  |  3 +-
 docs/styles.rst                               |  2 +
 samples/Sample_09_Tables.php                  |  2 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  1 +
 src/PhpWord/SimpleType/TblWidth.php           | 42 +++++++++++++++++++
 src/PhpWord/Style/Table.php                   | 38 ++++++++++++++---
 src/PhpWord/Writer/Word2007/Style/Table.php   | 40 ++++++++++--------
 tests/PhpWord/Reader/Word2007/StyleTest.php   | 23 ++++++++++
 tests/PhpWord/Style/TableTest.php             | 28 +++++++++----
 .../Writer/Word2007/Style/TableTest.php       | 21 ++++++++++
 10 files changed, 168 insertions(+), 32 deletions(-)
 create mode 100644 src/PhpWord/SimpleType/TblWidth.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 762bf560..2dca8348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 v0.15.0 (?? ??? 2018)
 ----------------------
 ### Added
-- Parsing of "align" HTML attribute - @troosan #1231
+- Parsing of `align` HTML attribute - @troosan #1231
 - Parse formatting inside HTML lists - @troosan @samimussbach #1239 #945 #1215 #508
 - Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
 - Add support for Track changes @Cip @troosan #354 #1262
 - Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
+- Add support for Cell Spacing @dox07 @troosan #1040
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/styles.rst b/docs/styles.rst
index 8e155ca2..0ec0ec38 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -103,7 +103,9 @@ Available Table style options:
 - ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
 - ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in *twip*.
 - ``width``. Table width in percent.
+- ``unit``. The unit to use for the width. One of ``\PhpOffice\PhpWord\SimpleType\TblWidth``. Defaults to *auto*.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
+- ``cellSpacing`` Cell spacing in *twip*
 
 Available Row style options:
 
diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index c4be7c9e..ba41aa54 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -27,7 +27,7 @@ $section->addTextBreak(1);
 $section->addText('Fancy table', $header);
 
 $fancyTableStyleName = 'Fancy Table';
-$fancyTableStyle = array('borderSize' => 6, 'borderColor' => '006699', 'cellMargin' => 80, 'alignment' => \PhpOffice\PhpWord\SimpleType\JcTable::CENTER);
+$fancyTableStyle = array('borderSize' => 6, 'borderColor' => '006699', 'cellMargin' => 80, 'alignment' => \PhpOffice\PhpWord\SimpleType\JcTable::CENTER, 'cellSpacing' => 50);
 $fancyTableFirstRowStyle = array('borderBottomSize' => 18, 'borderBottomColor' => '0000FF', 'bgColor' => '66BBFF');
 $fancyTableCellStyle = array('valign' => 'center');
 $fancyTableCellBtlrStyle = array('valign' => 'center', 'textDirection' => \PhpOffice\PhpWord\Style\Cell::TEXT_DIR_BTLR);
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 09d32dbb..511e9081 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -426,6 +426,7 @@ abstract class AbstractPart
                     $styleDefs["border{$ucfSide}Style"] = array(self::READ_VALUE, "w:tblBorders/w:$side", 'w:val');
                 }
                 $styleDefs['layout'] = array(self::READ_VALUE, 'w:tblLayout', 'w:type');
+                $styleDefs['cellSpacing'] = array(self::READ_VALUE, 'w:tblCellSpacing', 'w:w');
                 $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
             }
         }
diff --git a/src/PhpWord/SimpleType/TblWidth.php b/src/PhpWord/SimpleType/TblWidth.php
new file mode 100644
index 00000000..3d947bce
--- /dev/null
+++ b/src/PhpWord/SimpleType/TblWidth.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\SimpleType;
+
+use PhpOffice\PhpWord\Shared\AbstractEnum;
+
+/**
+ * Table Width Units
+ *
+ * @since 0.15.0
+ *
+ * @see http://www.datypic.com/sc/ooxml/t-w_ST_TblWidth.html
+ */
+final class TblWidth extends AbstractEnum
+{
+    //No Width
+    const NIL = 'nil';
+
+    //Automatically Determined Width
+    const AUTO = 'auto';
+
+    //Width in Fiftieths of a Percent
+    const PERCENT = 'pct';
+
+    //Width in Twentieths of a Point
+    const TWIP = 'dxa';
+}
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index d0ff47ed..8aba172a 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -19,14 +19,21 @@ namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\JcTable;
+use PhpOffice\PhpWord\SimpleType\TblWidth;
 
 class Table extends Border
 {
     /**
-     * @const string Table width units http://www.schemacentral.com/sc/ooxml/t-w_ST_TblWidth.html
+     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::AUTO instead
      */
     const WIDTH_AUTO = 'auto'; // Automatically determined width
+    /**
+     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT instead
+     */
     const WIDTH_PERCENT = 'pct'; // Width in fiftieths (1/50) of a percent (1% = 50 unit)
+    /**
+     * @deprecated Use \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP instead
+     */
     const WIDTH_TWIP = 'dxa'; // Width in twentieths (1/20) of a point (twip)
 
     //values for http://www.datypic.com/sc/ooxml/t-w_ST_TblLayoutType.html
@@ -133,7 +140,12 @@ class Table extends Border
     /**
      * @var string Width unit
      */
-    private $unit = self::WIDTH_AUTO;
+    private $unit = TblWidth::AUTO;
+
+    /**
+     * @var int|float cell spacing value
+     */
+    protected $cellSpacing = null;
 
     /**
      * @var string Table Layout
@@ -152,7 +164,7 @@ class Table extends Border
         if ($firstRowStyle !== null && is_array($firstRowStyle)) {
             $this->firstRowStyle = clone $this;
             $this->firstRowStyle->isFirstRow = true;
-            unset($this->firstRowStyle->firstRowStyle, $this->firstRowStyle->borderInsideHSize, $this->firstRowStyle->borderInsideHColor, $this->firstRowStyle->borderInsideVSize, $this->firstRowStyle->borderInsideVColor, $this->firstRowStyle->cellMarginTop, $this->firstRowStyle->cellMarginLeft, $this->firstRowStyle->cellMarginRight, $this->firstRowStyle->cellMarginBottom);
+            unset($this->firstRowStyle->firstRowStyle, $this->firstRowStyle->borderInsideHSize, $this->firstRowStyle->borderInsideHColor, $this->firstRowStyle->borderInsideVSize, $this->firstRowStyle->borderInsideVColor, $this->firstRowStyle->cellMarginTop, $this->firstRowStyle->cellMarginLeft, $this->firstRowStyle->cellMarginRight, $this->firstRowStyle->cellMarginBottom, $this->firstRowStyle->cellSpacing);
             $this->firstRowStyle->setStyleByArray($firstRowStyle);
         }
 
@@ -161,6 +173,22 @@ class Table extends Border
         }
     }
 
+    /**
+     * @param float|int $cellSpacing
+     */
+    public function setCellSpacing($cellSpacing = null)
+    {
+        $this->cellSpacing = $cellSpacing;
+    }
+
+    /**
+     * @return float|int
+     */
+    public function getCellSpacing()
+    {
+        return $this->cellSpacing;
+    }
+
     /**
      * Set first row
      *
@@ -595,8 +623,8 @@ class Table extends Border
      */
     public function setUnit($value = null)
     {
-        $enum = array(self::WIDTH_AUTO, self::WIDTH_PERCENT, self::WIDTH_TWIP);
-        $this->unit = $this->setEnumVal($value, $enum, $this->unit);
+        TblWidth::validate($value);
+        $this->unit = $value;
 
         return $this;
     }
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index e2e8f978..14226212 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\SimpleType\TblWidth;
 use PhpOffice\PhpWord\Style\Table as TableStyle;
 use PhpOffice\PhpWord\Writer\Word2007\Element\TableAlignment;
 
@@ -49,7 +50,7 @@ class Table extends AbstractStyle
             $xmlWriter->writeAttribute('w:val', $style);
             $xmlWriter->endElement();
             if (null !== $this->width) {
-                $this->writeWidth($xmlWriter, $this->width, 'pct');
+                $this->writeTblWidth($xmlWriter, 'w:tblW', TblWidth::PERCENT, $this->width);
             }
             $xmlWriter->endElement();
         }
@@ -76,7 +77,8 @@ class Table extends AbstractStyle
             $xmlWriter->endElement();
         }
 
-        $this->writeWidth($xmlWriter, $style->getWidth(), $style->getUnit());
+        $this->writeTblWidth($xmlWriter, 'w:tblW', $style->getUnit(), $style->getWidth());
+        $this->writeTblWidth($xmlWriter, 'w:tblCellSpacing', TblWidth::TWIP, $style->getCellSpacing());
         $this->writeLayout($xmlWriter, $style->getLayout());
         $this->writeMargin($xmlWriter, $style);
         $this->writeBorder($xmlWriter, $style);
@@ -92,21 +94,6 @@ class Table extends AbstractStyle
         }
     }
 
-    /**
-     * Write width.
-     *
-     * @param \PhpOffice\Common\XMLWriter $xmlWriter
-     * @param int $width
-     * @param string $unit
-     */
-    private function writeWidth(XMLWriter $xmlWriter, $width, $unit)
-    {
-        $xmlWriter->startElement('w:tblW');
-        $xmlWriter->writeAttribute('w:w', $width);
-        $xmlWriter->writeAttribute('w:type', $unit);
-        $xmlWriter->endElement(); // w:tblW
-    }
-
     /**
      * Enable/Disable automatic resizing of the table
      *
@@ -159,6 +146,25 @@ class Table extends AbstractStyle
         }
     }
 
+    /**
+     * Writes a table width
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param string $elementName
+     * @param string $unit
+     * @param int|float $width
+     */
+    private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width = null)
+    {
+        if (null === $width) {
+            return;
+        }
+        $xmlWriter->startElement($elementName);
+        $xmlWriter->writeAttributeIf(null !== $width, 'w:w', $width);
+        $xmlWriter->writeAttribute('w:type', $unit);
+        $xmlWriter->endElement();
+    }
+
     /**
      * Write row style.
      *
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index ce59f4c3..4375df47 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\PhpWord\AbstractTestReader;
+use PhpOffice\PhpWord\SimpleType\TblWidth;
 use PhpOffice\PhpWord\Style\Table;
 
 /**
@@ -43,4 +44,26 @@ class StyleTest extends AbstractTestReader
         $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
         $this->assertEquals(Table::LAYOUT_FIXED, $elements[0]->getStyle()->getLayout());
     }
+
+    /**
+     * Test reading of cell spacing
+     */
+    public function testReadCellSpacing()
+    {
+        $documentXml = '<w:tbl>
+            <w:tblPr>
+                <w:tblCellSpacing w:w="10.5" w:type="dxa"/>
+            </w:tblPr>
+        </w:tbl>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
+        $this->assertEquals(TblWidth::AUTO, $elements[0]->getStyle()->getUnit());
+        /** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
+        $tableStyle = $elements[0]->getStyle();
+        $this->assertEquals(10.5, $tableStyle->getCellSpacing());
+    }
 }
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index dafdeb31..9dec422e 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Style;
 
 use PhpOffice\PhpWord\SimpleType\JcTable;
+use PhpOffice\PhpWord\SimpleType\TblWidth;
 
 /**
  * Test class for PhpOffice\PhpWord\Style\Table
@@ -38,9 +39,6 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $styleTable = array('bgColor' => 'FF0000');
         $styleFirstRow = array('borderBottomSize' => 3);
 
-        $object = new Table();
-        $this->assertNull($object->getBgColor());
-
         $object = new Table($styleTable, $styleFirstRow);
         $this->assertEquals('FF0000', $object->getBgColor());
 
@@ -49,6 +47,18 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(3, $firstRow->getBorderBottomSize());
     }
 
+    /**
+     * Test default values when passing no style
+     */
+    public function testDefaultValues()
+    {
+        $object = new Table();
+
+        $this->assertNull($object->getBgColor());
+        $this->assertEquals(Table::LAYOUT_AUTO, $object->getLayout());
+        $this->assertEquals(TblWidth::AUTO, $object->getUnit());
+    }
+
     /**
      * Test setting style with normal value
      */
@@ -77,6 +87,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
             'alignment'          => JcTable::CENTER,
             'width'              => 100,
             'unit'               => 'pct',
+            'layout'             => Table::LAYOUT_FIXED,
         );
         foreach ($attributes as $key => $value) {
             $set = "set{$key}";
@@ -174,13 +185,14 @@ class TableTest extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     * Tests table layout
+     * Tests table cell spacing
      */
-    public function testTableLayout()
+    public function testTableCellSpacing()
     {
         $object = new Table();
-        $this->assertEquals(Table::LAYOUT_AUTO, $object->getLayout());
-        $object->setLayout(Table::LAYOUT_FIXED);
-        $this->assertEquals(Table::LAYOUT_FIXED, $object->getLayout());
+        $this->assertNull($object->getCellSpacing());
+
+        $object = new Table(array('cellSpacing' => 20));
+        $this->assertEquals(20, $object->getCellSpacing());
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index a89dd610..c0a0b3ad 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -55,4 +55,25 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path));
         $this->assertEquals(Table::LAYOUT_FIXED, $doc->getElementAttribute($path, 'w:type'));
     }
+
+    /**
+     * Test write styles
+     */
+    public function testCellSpacing()
+    {
+        $tableStyle = new Table();
+        $tableStyle->setCellSpacing(10.3);
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable($tableStyle);
+        $table->addRow();
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblCellSpacing';
+        $this->assertTrue($doc->elementExists($path));
+        $this->assertEquals(10.3, $doc->getElementAttribute($path, 'w:w'));
+        $this->assertEquals(\PhpOffice\PhpWord\SimpleType\TblWidth::TWIP, $doc->getElementAttribute($path, 'w:type'));
+    }
 }

From bded91af9f9a28927263484ac98e9190c20f9c94 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Feb 2018 00:39:00 +0100
Subject: [PATCH 233/370] Footnote in listitem (#1289)

* Allow footnote to be added in ListItems
---
 CHANGELOG.md                              |  1 +
 samples/Sample_14_ListItem.php            |  2 ++
 src/PhpWord/Element/AbstractContainer.php |  2 +-
 src/PhpWord/Shared/Html.php               | 10 +++++++---
 src/PhpWord/Style/Cell.php                |  6 ++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dca8348..406122b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ v0.15.0 (?? ??? 2018)
 - Save PNG alpha information when using remote images. @samsullivan #779
 - Fix parsing of `<w:br/>` tag. @troosan #1274
 - Bookmark are not writton as internal link in html writer @troosan #1263
+- It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
 
 
 
diff --git a/samples/Sample_14_ListItem.php b/samples/Sample_14_ListItem.php
index 689ac3d3..774fd284 100644
--- a/samples/Sample_14_ListItem.php
+++ b/samples/Sample_14_ListItem.php
@@ -67,6 +67,8 @@ $listItemRun->addText(' in bold', array('bold' => true));
 $listItemRun = $section->addListItemRun();
 $listItemRun->addText('List item 2');
 $listItemRun->addText(' in italic', array('italic' => true));
+$footnote = $listItemRun->addFootnote();
+$footnote->addText('this is a footnote on a list item');
 $listItemRun = $section->addListItemRun();
 $listItemRun->addText('List item 3');
 $listItemRun->addText(' underlined', array('underline' => 'dash'));
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 4a5f83f5..507ff143 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -207,7 +207,7 @@ abstract class AbstractContainer extends AbstractElement
             'Table'         => array('Section', 'Header', 'Footer', 'Cell', 'TextBox'),
             'CheckBox'      => array('Section', 'Header', 'Footer', 'Cell', 'TextRun'),
             'TextBox'       => array('Section', 'Header', 'Footer', 'Cell'),
-            'Footnote'      => array('Section', 'TextRun', 'Cell'),
+            'Footnote'      => array('Section', 'TextRun', 'Cell', 'ListItemRun'),
             'Endnote'       => array('Section', 'TextRun', 'Cell'),
             'PreserveText'  => array('Section', 'Header', 'Footer', 'Cell'),
             'Title'         => array('Section', 'Cell'),
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 971776ff..1841616e 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -415,6 +415,10 @@ class Html
         }
     }
 
+    /**
+     * @param bool $isOrderedList
+     * @return array
+     */
     private static function getListStyle($isOrderedList)
     {
         if ($isOrderedList) {
@@ -547,13 +551,13 @@ class Html
                 case 'width':
                     if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
                         $styles['width'] = Converter::cssToTwip($matches[1]);
-                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_TWIP;
+                        $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::TWIP;
                     } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
                         $styles['width'] = $matches[1] * 50;
-                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_PERCENT;
+                        $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::PERCENT;
                     } elseif (preg_match('/([0-9]+)/', $cValue, $matches)) {
                         $styles['width'] = $matches[1];
-                        $styles['unit'] = \PhpOffice\PhpWord\Style\Table::WIDTH_AUTO;
+                        $styles['unit'] = \PhpOffice\PhpWord\SimpleType\TblWidth::AUTO;
                     }
                     break;
                 case 'border':
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index c281f998..8675ed7b 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\SimpleType\TblWidth;
+
 /**
  * Table cell style
  */
@@ -123,7 +125,7 @@ class Cell extends Border
      *
      * @var string
      */
-    private $unit = Table::WIDTH_TWIP;
+    private $unit = TblWidth::TWIP;
 
     /**
      * Get vertical align.
@@ -308,7 +310,7 @@ class Cell extends Border
      */
     public function setUnit($value)
     {
-        $this->unit = $this->setEnumVal($value, array(Table::WIDTH_AUTO, Table::WIDTH_PERCENT, Table::WIDTH_TWIP), Table::WIDTH_TWIP);
+        $this->unit = $this->setEnumVal($value, array(TblWidth::AUTO, TblWidth::PERCENT, TblWidth::TWIP), TblWidth::TWIP);
 
         return $this;
     }

From 59de019881750f9cb2bbae7f005e56c65d545b6d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Feb 2018 01:41:32 +0100
Subject: [PATCH 234/370] Fix listitem parsing (#1290)

* Word 2007 Reader: Added support for ListItemRun
* Add tests + changelog
---
 CHANGELOG.md                                  |   3 ++
 samples/resources/Sample_11_ReadWord2007.docx | Bin 63320 -> 63388 bytes
 src/PhpWord/Reader/Word2007/AbstractPart.php  |   9 ++--
 tests/PhpWord/Reader/Word2007/ElementTest.php |  40 ++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 406122b6..f6f87158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for Track changes @Cip @troosan #354 #1262
 - Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
 - Add support for Cell Spacing @dox07 @troosan #1040
+- Add parsing of formatting inside lists @atomicalnet @troosan #594
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
@@ -22,6 +23,8 @@ v0.15.0 (?? ??? 2018)
 - Bookmark are not writton as internal link in html writer @troosan #1263
 - It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
 
+### Changed
+- Remove zend-stdlib dependency @Trainmaster #1284
 
 
 v0.14.0 (29 Dec 2017)
diff --git a/samples/resources/Sample_11_ReadWord2007.docx b/samples/resources/Sample_11_ReadWord2007.docx
index 3faf6f1213f13e82466ef29200862498d2ef7014..406cf1e1ebf296f563f7a05ef4c7c6aaaffd148b 100644
GIT binary patch
delta 11671
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
Jef1Cb{{unDO-=v+

delta 11571
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

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 511e9081..1d610516 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -138,14 +138,15 @@ abstract class AbstractPart
             $parent->addPreserveText($textContent, $fontStyle, $paragraphStyle);
         } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
             // List item
-            $textContent = '';
             $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
             $levelId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:ilvl');
-            $nodes = $xmlReader->getElements('w:r', $domNode);
+            $nodes = $xmlReader->getElements('*', $domNode);
+
+            $listItemRun = $parent->addListItemRun($levelId, "PHPWordList{$numId}", $paragraphStyle);
+
             foreach ($nodes as $node) {
-                $textContent .= $xmlReader->getValue('w:t', $node);
+                $this->readRun($xmlReader, $node, $listItemRun, $docPart, $paragraphStyle);
             }
-            $parent->addListItem($textContent, $levelId, null, "PHPWordList{$numId}", $paragraphStyle);
         } elseif (!empty($headingMatches)) {
             // Heading
             $textContent = '';
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 67c2eb13..c2648b68 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -43,4 +43,44 @@ class ElementTest extends AbstractTestReader
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[1]);
         $this->assertEquals('test string', $elements[1]->getText());
     }
+
+    /**
+     * Test reading of textbreak
+     */
+    public function testReadListItemRunWithFormatting()
+    {
+        $documentXml = '<w:p>
+            <w:pPr>
+                <w:numPr>
+                    <w:ilvl w:val="0"/>
+                    <w:numId w:val="11"/>
+                </w:numPr>
+            </w:pPr>
+            <w:r>
+                <w:t>Two</w:t>
+            </w:r>
+            <w:r>
+                <w:t xml:space="preserve"> with </w:t>
+            </w:r>
+            <w:r>
+                <w:rPr>
+                    <w:b/>
+                </w:rPr>
+                <w:t>bold</w:t>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\ListItemRun', $elements[0]);
+        $this->assertEquals(0, $elements[0]->getDepth());
+
+        $listElements = $this->get($elements, 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $listElements[0]);
+        $this->assertEquals('Two', $listElements[0]->getText());
+        $this->assertEquals(' with ', $listElements[1]->getText());
+        $this->assertEquals('bold', $listElements[2]->getText());
+        $this->assertTrue($listElements[2]->getFontStyle()->getBold());
+    }
 }

From 557af99a6df894d5216dae3c58f0089779dafa05 Mon Sep 17 00:00:00 2001
From: Matt Bolt <matt@mattbolt.com>
Date: Mon, 19 Feb 2018 12:43:01 +0800
Subject: [PATCH 235/370] Fix colspan and rowspan for tables in HTML Writer

---
 src/PhpWord/Writer/HTML/Element/Table.php | 57 +++++++++++++++++++----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index c7d8670b..17ba04b5 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -40,18 +40,59 @@ class Table extends AbstractElement
         $rowCount = count($rows);
         if ($rowCount > 0) {
             $content .= '<table>' . PHP_EOL;
-            foreach ($rows as $row) {
+            for ($i = 0; $i < count($rows); $i++) {
                 /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
-                $rowStyle = $row->getStyle();
+                $rowStyle = $rows[$i]->getStyle();
                 // $height = $row->getHeight();
                 $tblHeader = $rowStyle->isTblHeader();
                 $content .= '<tr>' . PHP_EOL;
-                foreach ($row->getCells() as $cell) {
-                    $writer = new Container($this->parentWriter, $cell);
-                    $cellTag = $tblHeader ? 'th' : 'td';
-                    $content .= "<{$cellTag}>" . PHP_EOL;
-                    $content .= $writer->write();
-                    $content .= "</{$cellTag}>" . PHP_EOL;
+                $rowCells = $rows[$i]->getCells();
+                for ($j = 0; $j < count($rowCells); $j++) {
+                    $cellStyle = $rowCells[$j]->getStyle();
+                    $cellColSpan = $cellStyle->getGridSpan();
+                    $cellRowSpan = 1;
+                    $cellVMerge = $cellStyle->getVMerge();
+                    // If this is the first cell of the vertical merge, find out how man rows it spans
+                    if ($cellVMerge === 'restart') {
+                        for ($k = $i + 1; $k < count($rows); $k++) {
+                            $kRowCells = $rows[$k]->getCells();
+                            if (isset($kRowCells[$j])) {
+                                if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
+                                    $cellRowSpan++;
+                                } else {
+                                    break;
+                                }
+                            } else {
+                                break;
+                            }
+                        }
+                    }
+                    // Ignore cells that are merged vertically with previous rows
+                    if ($cellVMerge !== 'continue') {
+                        $cellTag = $tblHeader ? 'th' : 'td';
+                        $cellColSpanAttr = (is_numeric($cellColSpan) && ($cellColSpan > 1) ? " colspan=\"{$cellColSpan}\"" : "");
+                        $cellRowSpanAttr = ($cellRowSpan > 1 ? " rowspan=\"{$cellRowSpan}\"" : "");
+                        $content .= "<{$cellTag}{$cellColSpanAttr}{$cellRowSpanAttr}>" . PHP_EOL;
+                        $writer = new Container($this->parentWriter, $rowCells[$j]);
+                        $content .= $writer->write();
+                        if ($cellRowSpan > 1) {
+                            // There shouldn't be any content in the subsequent merged cells, but lets check anyway
+                            for ($k = $i + 1; $k < count($rows); $k++) {
+                                $kRowCells = $rows[$k]->getCells();
+                                if (isset($kRowCells[$j])) {
+                                    if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
+                                        $writer = new Container($this->parentWriter, $kRowCells[$j]);
+                                        $content .= $writer->write();
+                                    } else {
+                                        break;
+                                    }
+                                } else {
+                                    break;
+                                }
+                            }
+                        }
+                        $content .= "</{$cellTag}>" . PHP_EOL;
+                    }
                 }
                 $content .= '</tr>' . PHP_EOL;
             }

From a95c3f83bcc0bf99fe7c8b91e3d63f1161391794 Mon Sep 17 00:00:00 2001
From: Matt Bolt <matt@mattbolt.com>
Date: Mon, 19 Feb 2018 18:02:55 +0800
Subject: [PATCH 236/370] Fix colspan and rowspan for tables in HTML Writer.
 Syntax improved.

---
 src/PhpWord/Writer/HTML/Element/Table.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 17ba04b5..30de2397 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -40,21 +40,22 @@ class Table extends AbstractElement
         $rowCount = count($rows);
         if ($rowCount > 0) {
             $content .= '<table>' . PHP_EOL;
-            for ($i = 0; $i < count($rows); $i++) {
+            for ($i = 0; $i < $rowCount; $i++) {
                 /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
                 $rowStyle = $rows[$i]->getStyle();
                 // $height = $row->getHeight();
                 $tblHeader = $rowStyle->isTblHeader();
                 $content .= '<tr>' . PHP_EOL;
                 $rowCells = $rows[$i]->getCells();
-                for ($j = 0; $j < count($rowCells); $j++) {
+                $rowCellCount = count($rowCells);
+                for ($j = 0; $j < $rowCellCount; $j++) {
                     $cellStyle = $rowCells[$j]->getStyle();
                     $cellColSpan = $cellStyle->getGridSpan();
                     $cellRowSpan = 1;
                     $cellVMerge = $cellStyle->getVMerge();
                     // If this is the first cell of the vertical merge, find out how man rows it spans
                     if ($cellVMerge === 'restart') {
-                        for ($k = $i + 1; $k < count($rows); $k++) {
+                        for ($k = $i + 1; $k < $rowCount; $k++) {
                             $kRowCells = $rows[$k]->getCells();
                             if (isset($kRowCells[$j])) {
                                 if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {
@@ -70,14 +71,14 @@ class Table extends AbstractElement
                     // Ignore cells that are merged vertically with previous rows
                     if ($cellVMerge !== 'continue') {
                         $cellTag = $tblHeader ? 'th' : 'td';
-                        $cellColSpanAttr = (is_numeric($cellColSpan) && ($cellColSpan > 1) ? " colspan=\"{$cellColSpan}\"" : "");
-                        $cellRowSpanAttr = ($cellRowSpan > 1 ? " rowspan=\"{$cellRowSpan}\"" : "");
+                        $cellColSpanAttr = (is_numeric($cellColSpan) && ($cellColSpan > 1) ? " colspan=\"{$cellColSpan}\"" : '');
+                        $cellRowSpanAttr = ($cellRowSpan > 1 ? " rowspan=\"{$cellRowSpan}\"" : '');
                         $content .= "<{$cellTag}{$cellColSpanAttr}{$cellRowSpanAttr}>" . PHP_EOL;
                         $writer = new Container($this->parentWriter, $rowCells[$j]);
                         $content .= $writer->write();
                         if ($cellRowSpan > 1) {
                             // There shouldn't be any content in the subsequent merged cells, but lets check anyway
-                            for ($k = $i + 1; $k < count($rows); $k++) {
+                            for ($k = $i + 1; $k < $rowCount; $k++) {
                                 $kRowCells = $rows[$k]->getCells();
                                 if (isset($kRowCells[$j])) {
                                     if ($kRowCells[$j]->getStyle()->getVMerge() === 'continue') {

From f3c73f333adbbbc4c625dd599b2889889d1d29eb Mon Sep 17 00:00:00 2001
From: Samuel Laulhau <zouliloua@gmail.com>
Date: Tue, 27 Feb 2018 23:24:01 +0100
Subject: [PATCH 237/370] Fix HTML parsing when style attribute is empty
 (#1295)

---
 src/PhpWord/Shared/Html.php       |  3 ++-
 tests/PhpWord/Shared/HtmlTest.php | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 1841616e..73635807 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -486,8 +486,9 @@ class Html
     private static function parseStyle($attribute, $styles)
     {
         $properties = explode(';', trim($attribute->value, " \t\n\r\0\x0B;"));
+
         foreach ($properties as $property) {
-            list($cKey, $cValue) = explode(':', $property, 2);
+            list($cKey, $cValue) = array_pad(explode(':', $property, 2), 2, null);
             $cValue = trim($cValue);
             switch (trim($cKey)) {
                 case 'text-decoration':
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index ac68b887..8be1cc19 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -418,4 +418,14 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
         $this->assertEquals('link text', $doc->getElement('/w:document/w:body/w:p/w:hyperlink/w:r/w:t')->nodeValue);
     }
+
+    public function testParseMalformedStyleIsIgnored()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p style="">text</p>';
+        Html::addHtml($section, $html);
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertFalse($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:jc'));
+    }
 }

From 7fe32e6ac1b23ea039015f207184fd36e3f1a6bb Mon Sep 17 00:00:00 2001
From: Lenz Weber <mail@lenzw.de>
Date: Tue, 27 Feb 2018 23:27:18 +0100
Subject: [PATCH 238/370] Add support for MACROBUTTON Field (#1021)

* add functionality to use MACROBUTTON as Field, use Styles for Field, add noProof to Font Style
* code review
* refactoring + fixes + unit tests
---
 CHANGELOG.md                                  |  1 +
 samples/Sample_27_Field.php                   | 14 +++++
 src/PhpWord/Element/Field.php                 | 52 ++++++++++++++++
 src/PhpWord/Style/Font.php                    | 31 ++++++++++
 src/PhpWord/Writer/Word2007/Element/Field.php | 60 ++++++++++++++++++-
 src/PhpWord/Writer/Word2007/Style/Font.php    |  3 +
 tests/PhpWord/Writer/Word2007/ElementTest.php | 31 ++++++++++
 7 files changed, 191 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6f87158..c684a37d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
 - Add support for Cell Spacing @dox07 @troosan #1040
 - Add parsing of formatting inside lists @atomicalnet @troosan #594
+- Add support for MACROBUTTON field @phryneas @troosan #1021
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index ec9dbe25..9c37dffe 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -20,6 +20,7 @@ $section->addField('PAGE', array('format' => 'Arabic'));
 
 $section->addText('Number of pages field:');
 $section->addField('NUMPAGES', array('numformat' => '0,00', 'format' => 'Arabic'), array('PreserveFormat'));
+$section->addTextBreak();
 
 $textrun = $section->addTextRun();
 $textrun->addText('An index field is ');
@@ -43,6 +44,19 @@ $textrun = $section->addTextRun(array('alignment' => \PhpOffice\PhpWord\SimpleTy
 $textrun->addText('This is the date of lunar calendar ');
 $textrun->addField('DATE', array('dateformat' => 'd-M-yyyy H:mm:ss'), array('PreserveFormat', 'LunarCalendar'));
 $textrun->addText(' written in a textrun.');
+$section->addTextBreak();
+
+$macroText = new TextRun();
+$macroText->addText('Double click', array('bold' => true));
+$macroText->addText(' to ');
+$macroText->addText('zoom to 100%', array('italic' => true));
+
+$section->addText('A macro button with styled text:');
+$section->addField('MACROBUTTON', array('macroname' => 'Zoom100'), array(), $macroText);
+$section->addTextBreak();
+
+$section->addText('A macro button with simple text:');
+$section->addField('MACROBUTTON', array('macroname' => 'Zoom100'), array(), 'double click to zoom');
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 7b33a479..5aeffbc1 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Element;
 
+use PhpOffice\PhpWord\Style\Font;
+
 /**
  * Field element
  *
@@ -54,6 +56,9 @@ class Field extends AbstractElement
             ),
             'options' => array('PreserveFormat', 'LunarCalendar', 'SakaEraCalendar', 'LastUsedFormat'),
         ),
+        'MACROBUTTON' => array(
+            'properties' => array('macroname' => ''),
+        ),
         'XE' => array(
             'properties' => array(),
             'options'    => array('Bold', 'Italic'),
@@ -92,6 +97,13 @@ class Field extends AbstractElement
      */
     protected $options = array();
 
+    /**
+     * Font style
+     *
+     * @var \PhpOffice\PhpWord\Style\Font
+     */
+    protected $fontStyle;
+
     /**
      * Create a new Field Element
      *
@@ -203,6 +215,46 @@ class Field extends AbstractElement
         return $this->options;
     }
 
+    /**
+     * Set Text style
+     *
+     * @param \PhpOffice\PhpWord\Style\Font $style
+     * @return \PhpOffice\PhpWord\Style\Font
+     */
+    public function setFontStyle($style = null)
+    {
+        if (!$style instanceof Font) {
+            throw new \InvalidArgumentException('font style must be of type Font');
+        }
+
+        if ($style->isNoProof()) {
+            $this->fontStyle = $style;
+        } else {
+            // make a copy of the font so the original is not altered
+            $this->fontStyle = clone $style;
+            $this->fontStyle->setNoProof(true);
+        }
+
+        return $this->fontStyle;
+    }
+
+    /**
+     * Get Text style
+     *
+     * @return \PhpOffice\PhpWord\Style\Font
+     */
+    public function getFontStyle()
+    {
+        if ($this->fontStyle == null) {
+            $font = new Font();
+            $font->setNoProof(true);
+
+            return $font;
+        }
+
+        return $this->fontStyle;
+    }
+
     /**
      * Set Field text
      *
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 8bfb3ac5..03fb692c 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -236,6 +236,14 @@ class Font extends AbstractStyle
      */
     private $rtl = false;
 
+    /**
+     * noProof (disables AutoCorrect)
+     *
+     * @var bool
+     * http://www.datypic.com/sc/ooxml/e-w_noProof-1.html
+     */
+    private $noProof = false;
+
     /**
      * Languages
      * @var \PhpOffice\PhpWord\Style\Language
@@ -706,6 +714,29 @@ class Font extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get noProof (disables autocorrect)
+     *
+     * @return bool
+     */
+    public function isNoProof()
+    {
+        return $this->noProof;
+    }
+
+    /**
+     * Set noProof (disables autocorrect)
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function setNoProof($value = false)
+    {
+        $this->noProof = $value;
+
+        return $this;
+    }
+
     /**
      * Get line height
      *
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 75d4983f..336a4325 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -29,12 +29,22 @@ class Field extends Text
      */
     public function write()
     {
-        $xmlWriter = $this->getXmlWriter();
         $element = $this->getElement();
         if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
             return;
         }
 
+        $methodName = 'write' . ucfirst(strtolower($element->getType()));
+        if (method_exists($this, $methodName)) {
+            $this->$methodName($element);
+        } else {
+            $this->writeDefault($element);
+        }
+    }
+
+    private function writeDefault(\PhpOffice\PhpWord\Element\Field $element)
+    {
+        $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
 
         $xmlWriter->startElement('w:r');
@@ -104,6 +114,51 @@ class Field extends Text
         $this->endElementP(); // w:p
     }
 
+    /**
+     * Writes a macrobutton field
+     *
+     * //TODO A lot of code duplication with general method, should maybe be refactored
+     * @param \PhpOffice\PhpWord\Element\Field $element
+     */
+    protected function writeMacrobutton(\PhpOffice\PhpWord\Element\Field $element)
+    {
+        $xmlWriter = $this->getXmlWriter();
+        $this->startElementP();
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'begin');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $instruction = ' ' . $element->getType() . ' ' . $this->buildPropertiesAndOptions($element);
+        if (is_string($element->getText())) {
+            $instruction .= $element->getText() . ' ';
+        }
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:instrText');
+        $xmlWriter->writeAttribute('xml:space', 'preserve');
+        $xmlWriter->text($instruction);
+        $xmlWriter->endElement(); // w:instrText
+        $xmlWriter->endElement(); // w:r
+
+        if ($element->getText() != null) {
+            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
+                $containerWriter = new Container($xmlWriter, $element->getText(), true);
+                $containerWriter->write();
+            }
+        }
+
+        $xmlWriter->startElement('w:r');
+        $xmlWriter->startElement('w:fldChar');
+        $xmlWriter->writeAttribute('w:fldCharType', 'end');
+        $xmlWriter->endElement(); // w:fldChar
+        $xmlWriter->endElement(); // w:r
+
+        $this->endElementP(); // w:p
+    }
+
     private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
     {
         $propertiesAndOptions = '';
@@ -119,6 +174,9 @@ class Field extends Text
                 case 'dateformat':
                     $propertiesAndOptions .= '\@ "' . $propval . '" ';
                     break;
+                case 'macroname':
+                    $propertiesAndOptions .= $propval . ' ';
+                    break;
             }
         }
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index ecaad416..a13db155 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -135,6 +135,9 @@ class Font extends AbstractStyle
         $xmlWriter->writeElementIf($style->getSpacing() !== null, 'w:spacing', 'w:val', $style->getSpacing());
         $xmlWriter->writeElementIf($style->getKerning() !== null, 'w:kern', 'w:val', $style->getKerning() * 2);
 
+        // noProof
+        $xmlWriter->writeElementIf($style->isNoProof() !== false, 'w:noProof');
+
         // Background-Color
         $shading = $style->getShading();
         if (!is_null($shading)) {
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index f91a8479..887e8e58 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -322,6 +322,37 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('"\\b \\i ', $doc->getElement($element)->textContent);
     }
 
+    /**
+     * Test writing the macrobutton field
+     */
+    public function testMacroButtonField()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $macroText = new TextRun();
+        $macroText->addText('Double click', array('bold' => true));
+        $macroText->addText(' to ');
+        $macroText->addText('zoom to 100%', array('italic' => true));
+
+        $section->addField('MACROBUTTON', array('macroname' => 'Zoom100'), array(), $macroText);
+        $section->addField('MACROBUTTON', array('macroname' => 'Zoom100'), array(), 'double click to zoom');
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $element = '/w:document/w:body/w:p[1]/w:r[2]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' MACROBUTTON Zoom100 ', $doc->getElement($element)->textContent);
+
+        $element = '/w:document/w:body/w:p[1]/w:r[3]/';
+        $this->assertTrue($doc->elementExists($element . 'w:t'));
+        $this->assertEquals('Double click', $doc->getElement($element . 'w:t')->textContent);
+        $this->assertTrue($doc->elementExists($element . 'w:rPr/w:b'));
+
+        $element = '/w:document/w:body/w:p[2]/w:r[2]/w:instrText';
+        $this->assertTrue($doc->elementExists($element));
+        $this->assertEquals(' MACROBUTTON Zoom100 double click to zoom ', $doc->getElement($element)->textContent);
+    }
+
     /**
      * Test form fields
      */

From 0869bdc8f78d584b6091a1dcdc5caf507e637cca Mon Sep 17 00:00:00 2001
From: Damjan Cvetko <damjan.cvetko@gmail.com>
Date: Thu, 1 Mar 2018 01:24:59 +0100
Subject: [PATCH 239/370] Add support for reading <w:tab/> element in runs.
 Internaly encoding it as "\t".

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  6 ++++--
 tests/PhpWord/Reader/Word2007/ElementTest.php | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 1d610516..70d3d960 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -241,9 +241,11 @@ abstract class AbstractPart
             if ($xmlReader->elementExists('w:br', $domNode)) {
                 $parent->addTextBreak();
             }
-            if ($xmlReader->elementExists('w:t', $domNode)) {
+            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode)) {
                 // TextRun
-                if ($domNode->parentNode->nodeName == 'w:del') {
+                if ($xmlReader->elementExists('w:tab', $domNode)) {
+                    $textContent = "\t";
+                } elseif ($domNode->parentNode->nodeName == 'w:del') {
                     $textContent = $xmlReader->getValue('w:delText', $domNode);
                 } else {
                     $textContent = $xmlReader->getValue('w:t', $domNode);
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index c2648b68..6804b172 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -83,4 +83,22 @@ class ElementTest extends AbstractTestReader
         $this->assertEquals('bold', $listElements[2]->getText());
         $this->assertTrue($listElements[2]->getFontStyle()->getBold());
     }
+
+    /**
+     * Test reading of tab
+     */
+    public function testReadTab()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:tab/>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
+        $this->assertEquals("\t", $elements[0]->getText());
+    }
 }

From 740e66acf58394c47a991181184efc6d010f3a38 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 2 Mar 2018 07:17:26 +0100
Subject: [PATCH 240/370] randomize the tempDir more

to make sure directory is unique [ci skip]
---
 src/PhpWord/Writer/AbstractWriter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index 538d9c03..bb943d7e 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -216,7 +216,7 @@ abstract class AbstractWriter implements WriterInterface
     protected function getTempFile($filename)
     {
         // Temporary directory
-        $this->setTempDir(Settings::getTempDir() . uniqid('/PHPWordWriter_') . '/');
+        $this->setTempDir(Settings::getTempDir() . uniqid('/PHPWordWriter_', true) . '/');
 
         // Temporary file
         $this->originalFilename = $filename;

From 8a2cba22926242b6ec9433781b8878d301ae1e0e Mon Sep 17 00:00:00 2001
From: Damjan Cvetko <damjan.cvetko@gmail.com>
Date: Sun, 4 Mar 2018 17:13:06 +0100
Subject: [PATCH 241/370] Support multiple elements (w:t, w:delText, w:tab) in
 w:r.

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 18 +++++++++++-------
 tests/PhpWord/Reader/Word2007/ElementTest.php |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 70d3d960..c69f636a 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -241,14 +241,18 @@ abstract class AbstractPart
             if ($xmlReader->elementExists('w:br', $domNode)) {
                 $parent->addTextBreak();
             }
-            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode)) {
+            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode) || $xmlReader->elementExists('w:delText', $domNode)) {
                 // TextRun
-                if ($xmlReader->elementExists('w:tab', $domNode)) {
-                    $textContent = "\t";
-                } elseif ($domNode->parentNode->nodeName == 'w:del') {
-                    $textContent = $xmlReader->getValue('w:delText', $domNode);
-                } else {
-                    $textContent = $xmlReader->getValue('w:t', $domNode);
+                $textContent = '';
+                $nodes = $xmlReader->getElements('w:t|w:delText|w:tab', $domNode);
+                foreach ($nodes as $node) {
+                    if ($node->nodeName == 'w:t') {
+                        $textContent .= $node->nodeValue;
+                    } elseif ($node->nodeName == 'w:delText') {
+                        $textContent .= $node->nodeValue;
+                    } elseif ($node->nodeName == 'w:tab') {
+                        $textContent .= "\t";
+                    }
                 }
                 /** @var AbstractElement $element */
                 $element = $parent->addText($textContent, $fontStyle, $paragraphStyle);
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 6804b172..aad4a543 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -91,7 +91,9 @@ class ElementTest extends AbstractTestReader
     {
         $documentXml = '<w:p>
             <w:r>
+                <w:t>One</w:t>
                 <w:tab/>
+                <w:t>Two</w:t>
             </w:r>
         </w:p>';
 
@@ -99,6 +101,6 @@ class ElementTest extends AbstractTestReader
 
         $elements = $this->get($phpWord->getSections(), 0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
-        $this->assertEquals("\t", $elements[0]->getText());
+        $this->assertEquals("One\tTwo", $elements[0]->getText());
     }
 }

From 30b224b3d099f417507c422c1244e6174dbee4d0 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 6 Mar 2018 06:34:55 +0100
Subject: [PATCH 242/370] Word2007 parsing title formatting (#1297)

* Improve Title parsing
- Title should be able to contain TextRun
- Style 'Title' should be treated the same with as Heading
- Add tests for Heading/Title reader

* update the documentation and the changelog
* PHP 7.2 build should not fail anymore
* reduce dependencies versions
* fix parsing of footnotes and endnotes
* add method to remove an element from a section
---
 .scrutinizer.yml                              |   5 +
 .travis.yml                                   |   5 +-
 CHANGELOG.md                                  |   1 +
 docs/elements.rst                             |   3 +-
 samples/Sample_17_TitleTOC.php                |   3 +-
 src/PhpWord/Collection/AbstractCollection.php |  10 +-
 src/PhpWord/Element/AbstractContainer.php     |  37 +++-
 src/PhpWord/Element/Bookmark.php              |   2 +-
 src/PhpWord/Element/ListItem.php              |   2 +-
 src/PhpWord/Element/Title.php                 |  20 ++-
 src/PhpWord/PhpWord.php                       |  15 ++
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  61 +++++--
 src/PhpWord/Reader/Word2007/Footnotes.php     |  43 +++--
 src/PhpWord/Style.php                         |   8 +-
 src/PhpWord/Writer/Word2007/Element/Title.php |  45 +++--
 src/PhpWord/Writer/Word2007/Part/Styles.php   |  12 +-
 tests/PhpWord/Element/SectionTest.php         |  31 ++++
 tests/PhpWord/Element/TitleTest.php           |  21 +++
 tests/PhpWord/Reader/Word2007/ElementTest.php |  70 +++++++-
 tests/PhpWord/Reader/Word2007/PartTest.php    | 163 ++++++++++++++++++
 tests/PhpWord/Reader/Word2007/StyleTest.php   |   8 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php |  29 ++++
 .../Writer/Word2007/Part/DocumentTest.php     |   1 -
 .../PhpWord/_includes/AbstractTestReader.php  |  43 +++--
 24 files changed, 539 insertions(+), 99 deletions(-)
 create mode 100644 tests/PhpWord/Reader/Word2007/PartTest.php

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index c8fe57cf..291a6d60 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,3 +1,8 @@
+build:
+    nodes:
+        analysis:
+            tests:
+                override: [php-scrutinizer-run]
 filter:
     excluded_paths: [ 'vendor/*', 'tests/*', 'samples/*', 'src/PhpWord/Shared/PCLZip/*' ]
 
diff --git a/.travis.yml b/.travis.yml
index d63b7bb2..281c2630 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,9 @@ matrix:
     include:
         - php: 5.6
           env: COVERAGE=1
-    allow_failures:
-        - php: 7.2
 
 cache:
     directories:
-        - vendor
         - $HOME/.composer/cache
         - .php-cs.cache
 
@@ -38,7 +35,7 @@ before_script:
     - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
     ## Composer
     - composer self-update
-    - composer install --prefer-source
+    - travis_wait composer install --prefer-source
     ## PHPDocumentor
     - mkdir -p build/docs
     - mkdir -p build/coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c684a37d..7f527746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ v0.15.0 (?? ??? 2018)
 - Fix parsing of `<w:br/>` tag. @troosan #1274
 - Bookmark are not writton as internal link in html writer @troosan #1263
 - It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
+- Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/docs/elements.rst b/docs/elements.rst
index d13abc56..4d1b9383 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -89,6 +89,7 @@ Titles
 
 If you want to structure your document or build table of contents, you need titles or headings.
 To add a title to the document, use the ``addTitleStyle`` and ``addTitle`` method.
+If `depth` is 0, a Title will be inserted, otherwise a Heading1, Heading2, ...
 
 .. code-block:: php
 
@@ -98,7 +99,7 @@ To add a title to the document, use the ``addTitleStyle`` and ``addTitle`` metho
 - ``depth``.
 - ``$fontStyle``. See :ref:`font-style`.
 - ``$paragraphStyle``. See :ref:`paragraph-style`.
-- ``$text``. Text to be displayed in the document.
+- ``$text``. Text to be displayed in the document. This can be `string` or a `\PhpOffice\PhpWord\Element\TextRun`
 
 It's necessary to add a title style to your document because otherwise the title won't be detected as a real title.
 
diff --git a/samples/Sample_17_TitleTOC.php b/samples/Sample_17_TitleTOC.php
index f99b73ea..86e8e28c 100644
--- a/samples/Sample_17_TitleTOC.php
+++ b/samples/Sample_17_TitleTOC.php
@@ -12,13 +12,14 @@ $section = $phpWord->addSection();
 // Define styles
 $fontStyle12 = array('spaceAfter' => 60, 'size' => 12);
 $fontStyle10 = array('size' => 10);
+$phpWord->addTitleStyle(null, array('size' => 22, 'bold' => true));
 $phpWord->addTitleStyle(1, array('size' => 20, 'color' => '333333', 'bold' => true));
 $phpWord->addTitleStyle(2, array('size' => 16, 'color' => '666666'));
 $phpWord->addTitleStyle(3, array('size' => 14, 'italic' => true));
 $phpWord->addTitleStyle(4, array('size' => 12));
 
 // Add text elements
-$section->addText('Table of contents 1');
+$section->addTitle('Table of contents 1', 0);
 $section->addTextBreak(2);
 
 // Add TOC #1
diff --git a/src/PhpWord/Collection/AbstractCollection.php b/src/PhpWord/Collection/AbstractCollection.php
index 61709a50..d49967ca 100644
--- a/src/PhpWord/Collection/AbstractCollection.php
+++ b/src/PhpWord/Collection/AbstractCollection.php
@@ -27,14 +27,14 @@ abstract class AbstractCollection
     /**
      * Items
      *
-     * @var array
+     * @var \PhpOffice\PhpWord\Element\AbstractContainer[]
      */
     private $items = array();
 
     /**
      * Get items
      *
-     * @return array
+     * @return \PhpOffice\PhpWord\Element\AbstractContainer[]
      */
     public function getItems()
     {
@@ -45,7 +45,7 @@ abstract class AbstractCollection
      * Get item by index
      *
      * @param int $index
-     * @return mixed
+     * @return \PhpOffice\PhpWord\Element\AbstractContainer
      */
     public function getItem($index)
     {
@@ -60,7 +60,7 @@ abstract class AbstractCollection
      * Set item.
      *
      * @param int $index
-     * @param mixed $item
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $item
      */
     public function setItem($index, $item)
     {
@@ -72,7 +72,7 @@ abstract class AbstractCollection
     /**
      * Add new item
      *
-     * @param mixed $item
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $item
      * @return int
      */
     public function addItem($item)
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 507ff143..1cedbef0 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -54,7 +54,7 @@ abstract class AbstractContainer extends AbstractElement
     /**
      * Elements collection
      *
-     * @var array
+     * @var \PhpOffice\PhpWord\Element\AbstractElement[]
      */
     protected $elements = array();
 
@@ -164,6 +164,41 @@ abstract class AbstractContainer extends AbstractElement
         return $this->elements;
     }
 
+    /**
+     * Returns the element at the requested position
+     *
+     * @param int $index
+     * @return \PhpOffice\PhpWord\Element\AbstractElement|null
+     */
+    public function getElement($index)
+    {
+        if (array_key_exists($index, $this->elements)) {
+            return $this->elements[$index];
+        }
+
+        return null;
+    }
+
+    /**
+     * Removes the element at requested index
+     *
+     * @param int|\PhpOffice\PhpWord\Element\AbstractElement $toRemove
+     */
+    public function removeElement($toRemove)
+    {
+        if (is_int($toRemove) && array_key_exists($toRemove, $this->elements)) {
+            unset($this->elements[$toRemove]);
+        } elseif ($toRemove instanceof \PhpOffice\PhpWord\Element\AbstractElement) {
+            foreach ($this->elements as $key => $element) {
+                if ($element->getElementId() === $toRemove->getElementId()) {
+                    unset($this->elements[$key]);
+
+                    return;
+                }
+            }
+        }
+    }
+
     /**
      * Count elements
      *
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index 2eceb5ed..8d4e0af5 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -43,7 +43,7 @@ class Bookmark extends AbstractElement
      *
      * @param string $name
      */
-    public function __construct($name)
+    public function __construct($name = '')
     {
         $this->name = CommonText::toUTF8($name);
     }
diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php
index 7f665b1b..cb55c5ae 100644
--- a/src/PhpWord/Element/ListItem.php
+++ b/src/PhpWord/Element/ListItem.php
@@ -62,7 +62,7 @@ class ListItem extends AbstractElement
 
         // Version >= 0.10.0 will pass numbering style name. Older version will use old method
         if (!is_null($listStyle) && is_string($listStyle)) {
-            $this->style = new ListItemStyle($listStyle);
+            $this->style = new ListItemStyle($listStyle); // @codeCoverageIgnore
         } else {
             $this->style = $this->setNewStyle(new ListItemStyle(), $listStyle, true);
         }
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index 808af55e..ed06fa13 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -28,7 +28,7 @@ class Title extends AbstractElement
     /**
      * Title Text content
      *
-     * @var string
+     * @var string|TextRun
      */
     private $text;
 
@@ -56,15 +56,25 @@ class Title extends AbstractElement
     /**
      * Create a new Title Element
      *
-     * @param string $text
+     * @param string|TextRun $text
      * @param int $depth
      */
     public function __construct($text, $depth = 1)
     {
-        $this->text = CommonText::toUTF8($text);
+        if (isset($text)) {
+            if (is_string($text)) {
+                $this->text = CommonText::toUTF8($text);
+            } elseif ($text instanceof TextRun) {
+                $this->text = $text;
+            } else {
+                throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
+            }
+        }
+
         $this->depth = $depth;
-        if (array_key_exists("Heading_{$this->depth}", Style::getStyles())) {
-            $this->style = "Heading{$this->depth}";
+        $styleName = $depth === 0 ? 'Title' : "Heading_{$this->depth}";
+        if (array_key_exists($styleName, Style::getStyles())) {
+            $this->style = str_replace('_', '', $styleName);
         }
 
         return $this;
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index d7c2348a..54ef65ac 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -212,6 +212,21 @@ class PhpWord
         return $this->sections;
     }
 
+    /**
+     * Returns the section at the requested position
+     *
+     * @param int $index
+     * @return \PhpOffice\PhpWord\Element\Section|null
+     */
+    public function getSection($index)
+    {
+        if (array_key_exists($index, $this->sections)) {
+            return $this->sections[$index];
+        }
+
+        return null;
+    }
+
     /**
      * Create new section
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 1d610516..f8a26ddb 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 
@@ -103,12 +104,10 @@ abstract class AbstractPart
     {
         // Paragraph style
         $paragraphStyle = null;
-        $headingMatches = array();
+        $headingDepth = null;
         if ($xmlReader->elementExists('w:pPr', $domNode)) {
             $paragraphStyle = $this->readParagraphStyle($xmlReader, $domNode);
-            if (is_array($paragraphStyle) && isset($paragraphStyle['styleName'])) {
-                preg_match('/Heading(\d)/', $paragraphStyle['styleName'], $headingMatches);
-            }
+            $headingDepth = $this->getHeadingDepth($paragraphStyle);
         }
 
         // PreserveText
@@ -147,14 +146,19 @@ abstract class AbstractPart
             foreach ($nodes as $node) {
                 $this->readRun($xmlReader, $node, $listItemRun, $docPart, $paragraphStyle);
             }
-        } elseif (!empty($headingMatches)) {
-            // Heading
-            $textContent = '';
+        } elseif ($headingDepth !== null) {
+            // Heading or Title
+            $textContent = null;
             $nodes = $xmlReader->getElements('w:r', $domNode);
-            foreach ($nodes as $node) {
-                $textContent .= $xmlReader->getValue('w:t', $node);
+            if ($nodes->length === 1) {
+                $textContent = $xmlReader->getValue('w:t', $nodes->item(0));
+            } else {
+                $textContent = new TextRun($paragraphStyle);
+                foreach ($nodes as $node) {
+                    $this->readRun($xmlReader, $node, $textContent, $docPart, $paragraphStyle);
+                }
             }
-            $parent->addTitle($textContent, $headingMatches[1]);
+            $parent->addTitle($textContent, $headingDepth);
         } else {
             // Text and TextRun
             $runCount = $xmlReader->countElements('w:r', $domNode);
@@ -176,6 +180,29 @@ abstract class AbstractPart
         }
     }
 
+    /**
+     * Returns the depth of the Heading, returns 0 for a Title
+     *
+     * @param array $paragraphStyle
+     * @return number|null
+     */
+    private function getHeadingDepth(array $paragraphStyle = null)
+    {
+        if (is_array($paragraphStyle) && isset($paragraphStyle['styleName'])) {
+            if ('Title' === $paragraphStyle['styleName']) {
+                return 0;
+            }
+
+            $headingMatches = array();
+            preg_match('/Heading(\d)/', $paragraphStyle['styleName'], $headingMatches);
+            if (!empty($headingMatches)) {
+                return $headingMatches[1];
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Read w:r.
      *
@@ -212,10 +239,14 @@ abstract class AbstractPart
         } else {
             if ($xmlReader->elementExists('w:footnoteReference', $domNode)) {
                 // Footnote
-                $parent->addFootnote();
+                $wId = $xmlReader->getAttribute('w:id', $domNode, 'w:footnoteReference');
+                $footnote = $parent->addFootnote();
+                $footnote->setRelationId($wId);
             } elseif ($xmlReader->elementExists('w:endnoteReference', $domNode)) {
                 // Endnote
-                $parent->addEndnote();
+                $wId = $xmlReader->getAttribute('w:id', $domNode, 'w:endnoteReference');
+                $endnote = $parent->addEndnote();
+                $endnote->setRelationId($wId);
             } elseif ($xmlReader->elementExists('w:pict', $domNode)) {
                 // Image
                 $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
@@ -496,11 +527,9 @@ abstract class AbstractPart
                     return $possibleAttribute;
                 }
             }
-        } else {
-            return $attributes;
         }
 
-        return null;
+        return $attributes;
     }
 
     /**
@@ -578,7 +607,7 @@ abstract class AbstractPart
      */
     private function isOn($value = null)
     {
-        return $value == null || $value == '1' || $value == 'true' || $value == 'on';
+        return $value === null || $value === '1' || $value === 'true' || $value === 'on';
     }
 
     /**
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index 61988723..b69b2606 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -48,9 +48,6 @@ class Footnotes extends AbstractPart
      */
     public function read(PhpWord $phpWord)
     {
-        $getMethod = "get{$this->collection}";
-        $collection = $phpWord->$getMethod()->getItems();
-
         $xmlReader = new XMLReader();
         $xmlReader->getDomFromZip($this->docFile, $this->xmlFile);
         $nodes = $xmlReader->getElements('*');
@@ -60,17 +57,41 @@ class Footnotes extends AbstractPart
                 $type = $xmlReader->getAttribute('w:type', $node);
 
                 // Avoid w:type "separator" and "continuationSeparator"
-                // Only look for <footnote> or <endnote> without w:type attribute
-                if (is_null($type) && isset($collection[$id])) {
-                    $element = $collection[$id];
-                    $pNodes = $xmlReader->getElements('w:p/*', $node);
-                    foreach ($pNodes as $pNode) {
-                        $this->readRun($xmlReader, $pNode, $element, $this->collection);
+                // Only look for <footnote> or <endnote> without w:type attribute, or with w:type = normal
+                if ((is_null($type) || $type === 'normal')) {
+                    $element = $this->getElement($phpWord, $id);
+                    if ($element !== null) {
+                        $pNodes = $xmlReader->getElements('w:p/*', $node);
+                        foreach ($pNodes as $pNode) {
+                            $this->readRun($xmlReader, $pNode, $element, $this->collection);
+                        }
+                        $addMethod = "add{$this->element}";
+                        $phpWord->$addMethod($element);
                     }
-                    $addMethod = "add{$this->element}";
-                    $phpWord->$addMethod($element);
                 }
             }
         }
     }
+
+    /**
+     * Searches for the element with the given relationId
+     *
+     * @param PhpWord $phpWord
+     * @param int $relationId
+     * @return \PhpOffice\PhpWord\Element\AbstractContainer|null
+     */
+    private function getElement(PhpWord $phpWord, $relationId)
+    {
+        $getMethod = "get{$this->collection}";
+        $collection = $phpWord->$getMethod()->getItems();
+
+        //not found by key, looping to search by relationId
+        foreach ($collection as $collectionElement) {
+            if ($collectionElement->getRelationId() == $relationId) {
+                return $collectionElement;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 1939aaba..017b3290 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -95,7 +95,13 @@ class Style
      */
     public static function addTitleStyle($depth, $fontStyle, $paragraphStyle = null)
     {
-        return self::setStyleValues("Heading_{$depth}", new Font('title', $paragraphStyle), $fontStyle);
+        if ($depth == null) {
+            $styleName = 'Title';
+        } else {
+            $styleName = "Heading_{$depth}";
+        }
+
+        return self::setStyleValues($styleName, new Font('title', $paragraphStyle), $fontStyle);
     }
 
     /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index f204ab16..80c0904d 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -47,27 +47,36 @@ class Title extends AbstractElement
             $xmlWriter->endElement();
         }
 
-        $rId = $element->getRelationId();
-        $bookmarkRId = $element->getPhpWord()->addBookmark();
+        if ($element->getDepth() !== 0) {
+            $rId = $element->getRelationId();
+            $bookmarkRId = $element->getPhpWord()->addBookmark();
 
-        // Bookmark start for TOC
-        $xmlWriter->startElement('w:bookmarkStart');
-        $xmlWriter->writeAttribute('w:id', $bookmarkRId);
-        $xmlWriter->writeAttribute('w:name', "_Toc{$rId}");
-        $xmlWriter->endElement();
+            // Bookmark start for TOC
+            $xmlWriter->startElement('w:bookmarkStart');
+            $xmlWriter->writeAttribute('w:id', $bookmarkRId);
+            $xmlWriter->writeAttribute('w:name', "_Toc{$rId}");
+            $xmlWriter->endElement(); //w:bookmarkStart
+        }
 
         // Actual text
-        $xmlWriter->startElement('w:r');
-        $xmlWriter->startElement('w:t');
-        $this->writeText($this->getText($element->getText()));
-        $xmlWriter->endElement(); // w:t
-        $xmlWriter->endElement(); // w:r
+        $text = $element->getText();
+        if (is_string($text)) {
+            $xmlWriter->startElement('w:r');
+            $xmlWriter->startElement('w:t');
+            $this->writeText($text);
+            $xmlWriter->endElement(); // w:t
+            $xmlWriter->endElement(); // w:r
+        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+            $containerWriter = new Container($xmlWriter, $text);
+            $containerWriter->write();
+        }
 
-        // Bookmark end
-        $xmlWriter->startElement('w:bookmarkEnd');
-        $xmlWriter->writeAttribute('w:id', $bookmarkRId);
-        $xmlWriter->endElement();
-
-        $xmlWriter->endElement();
+        if ($element->getDepth() !== 0) {
+            // Bookmark end
+            $xmlWriter->startElement('w:bookmarkEnd');
+            $xmlWriter->writeAttribute('w:id', $bookmarkRId);
+            $xmlWriter->endElement(); //w:bookmarkEnd
+        }
+        $xmlWriter->endElement(); //w:p
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 1cc94806..03855f03 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -180,9 +180,15 @@ class Styles extends AbstractPart
         // Heading style
         if ($styleType == 'title') {
             $arrStyle = explode('_', $styleName);
-            $styleId = 'Heading' . $arrStyle[1];
-            $styleName = 'heading ' . $arrStyle[1];
-            $styleLink = 'Heading' . $arrStyle[1] . 'Char';
+            if (count($arrStyle) > 1) {
+                $styleId = 'Heading' . $arrStyle[1];
+                $styleName = 'heading ' . $arrStyle[1];
+                $styleLink = 'Heading' . $arrStyle[1] . 'Char';
+            } else {
+                $styleId = $styleName;
+                $styleName = strtolower($styleName);
+                $styleLink = $styleName . 'Char';
+            }
             $xmlWriter->writeAttribute('w:styleId', $styleId);
 
             $xmlWriter->startElement('w:link');
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 20f0f0f7..867f680a 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -162,4 +162,35 @@ class SectionTest extends \PHPUnit\Framework\TestCase
         $object = new Section(1);
         $object->addHeader('ODD');
     }
+
+    /**
+     * @covers \PhpOffice\PhpWord\Element\AbstractContainer::removeElement
+     */
+    public function testRemoveElementByIndex()
+    {
+        $section = new Section(1);
+        $section->addText('firstText');
+        $section->addText('secondText');
+
+        $this->assertEquals(2, $section->countElements());
+        $section->removeElement(1);
+
+        $this->assertEquals(1, $section->countElements());
+    }
+
+    /**
+     * @covers \PhpOffice\PhpWord\Element\AbstractContainer::removeElement
+     */
+    public function testRemoveElementByElement()
+    {
+        $section = new Section(1);
+        $fistText = $section->addText('firstText');
+        $secondText = $section->addText('secondText');
+
+        $this->assertEquals(2, $section->countElements());
+        $section->removeElement($fistText);
+
+        $this->assertEquals(1, $section->countElements());
+        $this->assertEquals($secondText->getElementId(), $section->getElement(1)->getElementId());
+    }
 }
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 3ea6242f..e99a80a6 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -45,4 +45,25 @@ class TitleTest extends \PHPUnit\Framework\TestCase
 
         $this->assertNull($oTitle->getStyle());
     }
+
+    /**
+     * Create new instance with TextRun
+     */
+    public function testConstructWithTextRun()
+    {
+        $oTextRun = new TextRun();
+        $oTextRun->addText('text');
+        $oTitle = new Title($oTextRun);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oTitle->getText());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testConstructWithInvalidArgument()
+    {
+        $oPageBreak = new PageBreak();
+        new Title($oPageBreak);
+    }
 }
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index c2648b68..10c1ec9a 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -36,9 +36,9 @@ class ElementTest extends AbstractTestReader
             </w:r>
         </w:p>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $elements = $phpWord->getSection(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextBreak', $elements[0]);
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[1]);
         $this->assertEquals('test string', $elements[1]->getText());
@@ -70,17 +70,73 @@ class ElementTest extends AbstractTestReader
             </w:r>
         </w:p>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
-        $this->assertInstanceOf('PhpOffice\PhpWord\Element\ListItemRun', $elements[0]);
-        $this->assertEquals(0, $elements[0]->getDepth());
+        $sections = $phpWord->getSection(0);
+        $this->assertNull($sections->getElement(999));
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\ListItemRun', $sections->getElement(0));
+        $this->assertEquals(0, $sections->getElement(0)->getDepth());
 
-        $listElements = $this->get($elements, 0)->getElements();
+        $listElements = $sections->getElement(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $listElements[0]);
         $this->assertEquals('Two', $listElements[0]->getText());
         $this->assertEquals(' with ', $listElements[1]->getText());
         $this->assertEquals('bold', $listElements[2]->getText());
         $this->assertTrue($listElements[2]->getFontStyle()->getBold());
     }
+
+    /**
+     * Test reading Title style
+     */
+    public function testReadTitleStyle()
+    {
+        $documentXml = '<w:p>
+            <w:pPr>
+                <w:pStyle w:val="Title"/>
+            </w:pPr>
+            <w:r>
+                <w:t>This is a non formatted title</w:t>
+            </w:r>
+        </w:p>
+        <w:p>
+            <w:pPr>
+                <w:pStyle w:val="Title"/>
+            </w:pPr>
+            <w:r>
+                <w:t>This is a </w:t>
+            </w:r>
+            <w:r>
+                <w:rPr>
+                    <w:b/>
+                </w:rPr>
+                <w:t>bold</w:t>
+            </w:r>
+            <w:r>
+                <w:t> title</w:t>
+            </w:r>
+        </w:p>';
+
+        $stylesXml = '<w:style w:type="paragraph" w:styleId="Title">
+            <w:name w:val="Title"/>
+            <w:link w:val="TitleChar"/>
+            <w:rPr>
+                <w:i/>
+            </w:rPr>
+        </w:style>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml, 'styles' => $stylesXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Title', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\Title $title */
+        $title = $elements[0];
+        $this->assertEquals('Title', $title->getStyle());
+        $this->assertEquals('This is a non formatted title', $title->getText());
+
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Title', $elements[1]);
+        /** @var \PhpOffice\PhpWord\Element\Title $formattedTitle */
+        $formattedTitle = $elements[1];
+        $this->assertEquals('Title', $formattedTitle->getStyle());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $formattedTitle->getText());
+    }
 }
diff --git a/tests/PhpWord/Reader/Word2007/PartTest.php b/tests/PhpWord/Reader/Word2007/PartTest.php
new file mode 100644
index 00000000..0f7ecc7c
--- /dev/null
+++ b/tests/PhpWord/Reader/Word2007/PartTest.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use PhpOffice\PhpWord\AbstractTestReader;
+
+/**
+ * Test class for PhpOffice\PhpWord\Reader\Word2007 subnamespace
+ */
+class PartTest extends AbstractTestReader
+{
+    /**
+     * Test reading Footnotes
+     */
+    public function testReadFootnote()
+    {
+        $documentXml = '<w:p>
+                <w:r>
+                    <w:t>This is a test</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rStyle w:val="FootnoteReference"/>
+                    </w:rPr>
+                    <w:footnoteReference w:id="1"/>
+                </w:r>
+            </w:p>
+            <w:p>
+                <w:r>
+                    <w:t>And another one</w:t>
+                </w:r>
+                <w:r>
+                    <w:rPr>
+                        <w:rStyle w:val="EndnoteReference"/>
+                    </w:rPr>
+                    <w:endnoteReference w:id="2"/>
+                </w:r>
+            </w:p>';
+
+        $footnotesXml = '<w:footnote w:type="separator" w:id="-1">
+                <w:p>
+                    <w:r>
+                        <w:separator/>
+                    </w:r>
+                </w:p>
+            </w:footnote>
+            <w:footnote w:id="1">
+                <w:p>
+                    <w:pPr>
+                        <w:pStyle w:val="FootnoteText"/>
+                    </w:pPr>
+                    <w:r>
+                        <w:rPr>
+                            <w:rStyle w:val="FootnoteReference"/>
+                        </w:rPr>
+                        <w:footnoteRef/>
+                    </w:r>
+                    <w:r>
+                        <w:rPr>
+                            <w:lang w:val="nl-NL"/>
+                        </w:rPr>
+                        <w:t>footnote text</w:t>
+                    </w:r>
+                </w:p>
+            </w:footnote>';
+
+        $endnotesXml = '<w:endnote w:type="separator" w:id="-1">
+                <w:p>
+                    <w:r>
+                        <w:separator/>
+                    </w:r>
+                </w:p>
+            </w:endnote>
+            <w:endnote w:type="continuationNotice" w:id="1">
+                <w:p>
+                    <w:r>
+                        <w:separator/>
+                    </w:r>
+                </w:p>
+            </w:endnote>
+            <w:endnote w:id="2">
+                <w:p>
+                    <w:pPr>
+                        <w:pStyle w:val="EndnoteText"/>
+                    </w:pPr>
+                    <w:r>
+                        <w:rPr>
+                            <w:rStyle w:val="EndnoteReference"/>
+                        </w:rPr>
+                        <w:endnoteRef/>
+                    </w:r>
+                    <w:r>
+                        <w:rPr>
+                            <w:lang w:val="nl-NL"/>
+                        </w:rPr>
+                        <w:t>This is an endnote</w:t>
+                    </w:r>
+                </w:p>
+            </w:endnote>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml, 'footnotes' => $footnotesXml, 'endnotes' => $endnotesXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\TextRun $textRun */
+        $textRun = $elements[0];
+
+        //test the text in the first paragraph
+        /** @var \PhpOffice\PhpWord\Element\Text $text */
+        $text = $elements[0]->getElement(0);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $text);
+        $this->assertEquals('This is a test', $text->getText());
+
+        //test the presence of the footnote in the document.xml
+        /** @var \PhpOffice\PhpWord\Element\Footnote $footnote */
+        $documentFootnote = $textRun->getElement(1);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Footnote', $documentFootnote);
+        $this->assertEquals(1, $documentFootnote->getRelationId());
+
+        //test the presence of the footnote in the footnote.xml
+        /** @var \PhpOffice\PhpWord\Element\Footnote $footnote */
+        $footnote = $phpWord->getFootnotes()->getItem(1);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Footnote', $footnote);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $footnote->getElement(0));
+        $this->assertEquals('footnote text', $footnote->getElement(0)->getText());
+        $this->assertEquals(1, $footnote->getRelationId());
+
+        //test the text in the second paragraph
+        /** @var \PhpOffice\PhpWord\Element\Text $text */
+        $text = $elements[1]->getElement(0);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $text);
+        $this->assertEquals('And another one', $text->getText());
+
+        //test the presence of the endnote in the document.xml
+        /** @var \PhpOffice\PhpWord\Element\Endnote $endnote */
+        $documentEndnote = $elements[1]->getElement(1);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Endnote', $documentEndnote);
+        $this->assertEquals(2, $documentEndnote->getRelationId());
+
+        //test the presence of the endnote in the endnote.xml
+        /** @var \PhpOffice\PhpWord\Element\Endnote $endnote */
+        $endnote = $phpWord->getEndnotes()->getItem(1);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Endnote', $endnote);
+        $this->assertEquals(2, $endnote->getRelationId());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $endnote->getElement(0));
+        $this->assertEquals('This is an endnote', $endnote->getElement(0)->getText());
+    }
+}
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index 4375df47..c0d5d864 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -37,9 +37,9 @@ class StyleTest extends AbstractTestReader
             </w:tblPr>
         </w:tbl>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $elements = $phpWord->getSection(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
         $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
         $this->assertEquals(Table::LAYOUT_FIXED, $elements[0]->getStyle()->getLayout());
@@ -56,9 +56,9 @@ class StyleTest extends AbstractTestReader
             </w:tblPr>
         </w:tbl>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $elements = $phpWord->getSection(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
         $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
         $this->assertEquals(TblWidth::AUTO, $elements[0]->getStyle()->getUnit());
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 887e8e58..b59e369f 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -447,6 +447,9 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:commentReference'));
     }
 
+    /**
+     * Test Track changes
+     */
     public function testTrackChange()
     {
         $phpWord = new PhpWord();
@@ -462,4 +465,30 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('author name', $doc->getElementAttribute('/w:document/w:body/w:p/w:ins', 'w:author'));
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:del/w:r/w:delText'));
     }
+
+    /**
+     * Test Title and Headings
+     */
+    public function testTitleAndHeading()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->addTitleStyle(0, array('size' => 14, 'italic' => true));
+        $phpWord->addTitleStyle(1, array('size' => 20, 'color' => '333333', 'bold' => true));
+
+        $section = $phpWord->addSection();
+        $section->addTitle('This is a title', 0);
+        $section->addTitle('Heading 1', 1);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:r/w:t'));
+        $this->assertEquals('This is a title', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->textContent);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:pStyle'));
+        $this->assertEquals('Title', $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:pStyle', 'w:val'));
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:r/w:t'));
+        $this->assertEquals('Heading 1', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->textContent);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:pPr/w:pStyle'));
+        $this->assertEquals('Heading1', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:pStyle', 'w:val'));
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 6998e717..39db6028 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -24,7 +24,6 @@ use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 use PhpOffice\PhpWord\Style\Cell;
 use PhpOffice\PhpWord\Style\Font;
-use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
diff --git a/tests/PhpWord/_includes/AbstractTestReader.php b/tests/PhpWord/_includes/AbstractTestReader.php
index f138ac76..348cab98 100644
--- a/tests/PhpWord/_includes/AbstractTestReader.php
+++ b/tests/PhpWord/_includes/AbstractTestReader.php
@@ -17,43 +17,48 @@
 
 namespace PhpOffice\PhpWord;
 
-use PhpOffice\PhpWord\Reader\Word2007\Document;
-
 /**
  * Base class for Word2007 reader tests
  */
 abstract class AbstractTestReader extends \PHPUnit\Framework\TestCase
 {
+    private $parts = array(
+        'styles'     => array('class' => 'PhpOffice\PhpWord\Reader\Word2007\Styles',      'xml' => '<w:styles xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:docDefaults><w:rPrDefault><w:rPr><w:sz w:val="24"/></w:rPr></w:rPrDefault></w:docDefaults>{toReplace}</w:styles>'),
+        'document'   => array('class' => 'PhpOffice\PhpWord\Reader\Word2007\Document',    'xml' => '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>{toReplace}</w:body></w:document>'),
+        'footnotes'  => array('class' => 'PhpOffice\PhpWord\Reader\Word2007\Footnotes',   'xml' => '<w:footnotes xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">{toReplace}</w:footnotes>'),
+        'endnotes'   => array('class' => 'PhpOffice\PhpWord\Reader\Word2007\Endnotes',    'xml' => '<w:endnotes xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">{toReplace}</w:endnotes>'),
+        'settings'   => array('class' => 'PhpOffice\PhpWord\Reader\Word2007\Settings',    'xml' => '<w:comments xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">{toReplace}</w:comments>'),
+    );
+
     /**
      * Builds a PhpWord instance based on the xml passed
      *
      * @param string $documentXml
+     * @param null|string $stylesXml
      * @return \PhpOffice\PhpWord\PhpWord
      */
-    protected function getDocumentFromString($documentXml)
+    protected function getDocumentFromString(array $partXmls = array())
     {
-        $phpWord = new PhpWord();
         $file = __DIR__ . '/../_files/temp.docx';
         $zip = new \ZipArchive();
         $zip->open($file, \ZipArchive::CREATE);
-        $zip->addFromString('document.xml', '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>' . $documentXml . '</w:body></w:document>');
+        foreach ($this->parts as $partName => $part) {
+            if (array_key_exists($partName, $partXmls)) {
+                $zip->addFromString("{$partName}.xml", str_replace('{toReplace}', $partXmls[$partName], $this->parts[$partName]['xml']));
+            }
+        }
         $zip->close();
-        $documentReader = new Document($file, 'document.xml');
-        $documentReader->read($phpWord);
+
+        $phpWord = new PhpWord();
+        foreach ($this->parts as $partName => $part) {
+            if (array_key_exists($partName, $partXmls)) {
+                $className = $this->parts[$partName]['class'];
+                $reader = new $className($file, "{$partName}.xml");
+                $reader->read($phpWord);
+            }
+        }
         unlink($file);
 
         return $phpWord;
     }
-
-    /**
-     * Returns the element at position $index in the array
-     *
-     * @param array $array
-     * @param number $index
-     * @return mixed
-     */
-    protected function get(array $array, $index = 0)
-    {
-        return $array[$index];
-    }
 }

From 250fbd49b1fcaea5412a6860bdc1b38780e8327e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 6 Mar 2018 06:35:43 +0100
Subject: [PATCH 243/370] Added support for Vertically Raised or Lowered Text
 (w:position) (#1294)

* Added support for Vertically Raised or Lowered Text (w:position). Note that only docx writing is implemented for now.
* Add tests + changelog
* add reader + tests + doc
---
 CHANGELOG.md                                  |  1 +
 docs/styles.rst                               |  1 +
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  1 +
 src/PhpWord/Style/Font.php                    | 34 +++++++++++++++++++
 src/PhpWord/Style/Frame.php                   | 31 +++++++++++++++++
 src/PhpWord/Writer/Word2007/Element/Image.php | 13 +++++++
 src/PhpWord/Writer/Word2007/Style/Font.php    |  3 ++
 tests/PhpWord/Reader/Word2007/StyleTest.php   | 24 +++++++++++++
 .../Writer/Word2007/Style/FontTest.php        | 15 ++++++++
 9 files changed, 123 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f527746..1c52179c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for fixed Table Layout @aoloe @ekopach @troosan #841 #1276
 - Add support for Cell Spacing @dox07 @troosan #1040
 - Add parsing of formatting inside lists @atomicalnet @troosan #594
+- Added support for Vertically Raised or Lowered Text (w:position) @anrikun @troosan #640
 - Add support for MACROBUTTON field @phryneas @troosan #1021
 
 ### Fixed
diff --git a/docs/styles.rst b/docs/styles.rst
index 0ec0ec38..b84f76f0 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -59,6 +59,7 @@ Available Font style options:
    See ``\PhpOffice\PhpWord\Style\Font::UNDERLINE_...`` constants for more values
 - ``lang``. Language, either a language code like *en-US*, *fr-BE*, etc. or an object (or as an array) if you need to set eastAsian or bidirectional languages
    See ``\PhpOffice\PhpWord\Style\Language`` class for some language codes.
+- ``position``. The text position, raised or lowered, in half points
 
 .. _paragraph-style:
 
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index f8a26ddb..b4610d28 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -422,6 +422,7 @@ abstract class AbstractPart
             'fgColor'             => array(self::READ_VALUE, 'w:highlight'),
             'rtl'                 => array(self::READ_TRUE,  'w:rtl'),
             'lang'                => array(self::READ_VALUE, 'w:lang'),
+            'position'            => array(self::READ_VALUE, 'w:position'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 03fb692c..3095b799 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -232,6 +232,7 @@ class Font extends AbstractStyle
 
     /**
      * Right to left languages
+     *
      * @var bool
      */
     private $rtl = false;
@@ -246,10 +247,19 @@ class Font extends AbstractStyle
 
     /**
      * Languages
+     *
      * @var \PhpOffice\PhpWord\Style\Language
      */
     private $lang;
 
+    /**
+     * Vertically Raised or Lowered Text
+     *
+     * @var int Signed Half-Point Measurement
+     * @see http://www.datypic.com/sc/ooxml/e-w_position-1.html
+     */
+    private $position;
+
     /**
      * Create new font style
      *
@@ -294,6 +304,7 @@ class Font extends AbstractStyle
                 'scale'     => $this->getScale(),
                 'spacing'   => $this->getSpacing(),
                 'kerning'   => $this->getKerning(),
+                'position'  => $this->getPosition(),
             ),
             'paragraph'     => $this->getParagraph(),
             'rtl'           => $this->isRTL(),
@@ -926,4 +937,27 @@ class Font extends AbstractStyle
     {
         return $this->getParagraph();
     }
+
+    /**
+     * Get position
+     *
+     * @return int
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set position
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setPosition($value = null)
+    {
+        $this->position = $this->setIntVal($value, null);
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index a8e1c69d..bb684409 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -171,6 +171,14 @@ class Frame extends AbstractStyle
      */
     private $wrap;
 
+    /**
+     * Vertically raised or lowered text
+     *
+     * @var int
+     * @see http://www.datypic.com/sc/ooxml/e-w_position-1.html
+     */
+    private $position;
+
     /**
      * Create a new instance
      *
@@ -538,4 +546,27 @@ class Frame extends AbstractStyle
 
         return $this;
     }
+
+    /**
+     * Get position
+     *
+     * @return int
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set position
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setPosition($value = null)
+    {
+        $this->position = $this->setIntVal($value, null);
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 7e33f75e..32a22a13 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -19,6 +19,9 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\Common\XMLWriter;
 use PhpOffice\PhpWord\Element\Image as ImageElement;
+use PhpOffice\PhpWord\Style\Font as FontStyle;
+use PhpOffice\PhpWord\Style\Frame as FrameStyle;
+use PhpOffice\PhpWord\Writer\Word2007\Style\Font as FontStyleWriter;
 use PhpOffice\PhpWord\Writer\Word2007\Style\Image as ImageStyleWriter;
 
 /**
@@ -62,6 +65,16 @@ class Image extends AbstractElement
         $this->writeCommentRangeStart();
 
         $xmlWriter->startElement('w:r');
+
+        // Write position
+        $position = $style->getPosition();
+        if ($position && $style->getWrap() == FrameStyle::WRAP_INLINE) {
+            $fontStyle = new FontStyle('text');
+            $fontStyle->setPosition($position);
+            $fontStyleWriter = new FontStyleWriter($xmlWriter, $fontStyle);
+            $fontStyleWriter->write();
+        }
+
         $xmlWriter->startElement('w:pict');
         $xmlWriter->startElement('v:shape');
         $xmlWriter->writeAttribute('type', '#_x0000_t75');
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index a13db155..5f2a84c0 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -151,6 +151,9 @@ class Font extends AbstractStyle
             $xmlWriter->writeElementIf($styleName === null && $style->isRTL(), 'w:rtl');
         }
 
+        // Position
+        $xmlWriter->writeElementIf($style->getPosition() !== null, 'w:position', 'w:val', $style->getPosition());
+
         $xmlWriter->endElement();
     }
 
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index c0d5d864..ad8f125a 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -66,4 +66,28 @@ class StyleTest extends AbstractTestReader
         $tableStyle = $elements[0]->getStyle();
         $this->assertEquals(10.5, $tableStyle->getCellSpacing());
     }
+
+    /**
+     * Test reading of position
+     */
+    public function testReadPosition()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:rPr>
+                    <w:position w:val="15"/>
+                </w:rPr>
+                <w:t xml:space="preserve">This text is lowered</w:t>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Font', $elements[0]->getFontStyle());
+        /** @var \PhpOffice\PhpWord\Style\Font $fontStyle */
+        $fontStyle = $elements[0]->getFontStyle();
+        $this->assertEquals(15, $fontStyle->getPosition());
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index d36a3037..f66cf24f 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -65,4 +65,19 @@ class FontTest extends \PHPUnit\Framework\TestCase
         $path = '/w:document/w:body/w:p/w:r/w:rPr/w:lang';
         $this->assertTrue($doc->elementExists($path, $file));
     }
+
+    /**
+     * Test writing position
+     */
+    public function testPosition()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $section->addText('This text is lowered', array('position' => -20));
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:p/w:r/w:rPr/w:position';
+        $this->assertTrue($doc->elementExists($path));
+        $this->assertEquals(-20, $doc->getElementAttribute($path, 'w:val'));
+    }
 }

From 6a6497956da91d3a9d4ab44d9df2c2ed31bfb8dd Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Tue, 6 Mar 2018 22:19:40 +0100
Subject: [PATCH 244/370] Allow to set "autoHyphenation" setting (#1282)

* Allow to set "autoHyphenation" for document
* Allow to set "consecutiveHyphenLimit" for document
* Allow to set "hyphenationZone" for document
* Allow to set "doNotHyphenateCaps" for document
* Allow to set "suppressAutoHyphens" for paragraph
* randomize the tempDir more
* Word2007 parsing title formatting (#1297)
* Improve Title parsing
- Title should be able to contain TextRun
- Style 'Title' should be treated the same with as Heading
- Add tests for Heading/Title reader
* update the documentation and the changelog
* PHP 7.2 build should not fail anymore
* fix parsing of footnotes and endnotes
* add method to remove an element from a section
* add method to allow sorting of sections
---
 CHANGELOG.md                                  |  3 +-
 docs/general.rst                              | 46 +++++++++-
 docs/styles.rst                               |  1 +
 src/PhpWord/Element/Field.php                 | 42 ---------
 src/PhpWord/Metadata/Settings.php             | 90 +++++++++++++++++++
 src/PhpWord/PhpWord.php                       | 11 +++
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 31 +++----
 src/PhpWord/Reader/Word2007/Settings.php      | 41 ++++++++-
 src/PhpWord/Shared/Html.php                   |  2 +-
 src/PhpWord/Style/Paragraph.php               | 62 +++++++++----
 src/PhpWord/Writer/ODText/Part/Content.php    | 10 +--
 src/PhpWord/Writer/Word2007/Part/Settings.php | 48 ++++++++--
 .../Writer/Word2007/Style/Paragraph.php       |  3 +
 tests/PhpWord/Element/SectionTest.php         |  4 +-
 tests/PhpWord/Metadata/SettingsTest.php       | 54 +++++++++++
 tests/PhpWord/PhpWordTest.php                 | 54 +++++++++++
 tests/PhpWord/Reader/Word2007/StyleTest.php   |  4 +-
 tests/PhpWord/Style/ParagraphTest.php         | 35 ++++----
 .../Writer/Word2007/Part/SettingsTest.php     | 64 +++++++++++++
 .../Writer/Word2007/Style/ParagraphTest.php   | 15 ++++
 20 files changed, 506 insertions(+), 114 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c52179c..cdc4d67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ v0.15.0 (?? ??? 2018)
 - Add parsing of formatting inside lists @atomicalnet @troosan #594
 - Added support for Vertically Raised or Lowered Text (w:position) @anrikun @troosan #640
 - Add support for MACROBUTTON field @phryneas @troosan #1021
+- Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
@@ -477,4 +478,4 @@ This is the first release after a long development hiatus in [CodePlex](https://
 - Basic CI with Travis - @Progi1984
 - Added PHPWord_Exception and exception when could not copy the template - @Progi1984
 - IMPROVED: Moved examples out of Classes directory - @Progi1984
-- IMPROVED: Advanced string replace in setValue for Template - @Esmeraldo [#49](http://phpword.codeplex.com/workitem/49)
\ No newline at end of file
+- IMPROVED: Advanced string replace in setValue for Template - @Esmeraldo [#49](http://phpword.codeplex.com/workitem/49)
diff --git a/docs/general.rst b/docs/general.rst
index 99d8b3ba..f40a08c3 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -217,10 +217,10 @@ The default language of the document can be change with the following.
 
     $phpWord->getSettings()->setThemeFontLang(new Language(Language::FR_BE));
 
-``Languge`` has 3 parameters, one for Latin languages, one for East Asian languages and one for Complex (Bi-Directional) languages.
+``Language`` has 3 parameters, one for Latin languages, one for East Asian languages and one for Complex (Bi-Directional) languages.
 A couple of language codes are provided in the ``PhpOffice\PhpWord\ComplexType\Language`` class but any valid code/ID can be used.
 
-In case you are generating an RTF document the Language need to be set differently.
+In case you are generating an RTF document the language need to be set differently.
 
 .. code-block:: php
 
@@ -290,3 +290,45 @@ To force an update of the fields present in the document, set updateFields to tr
 .. code-block:: php
 
     $phpWord->getSettings()->setUpdateFields(true);
+
+Hyphenation
+-----------
+Hyphenation describes the process of breaking words with hyphens. There are several options to control hyphenation.
+
+Auto hyphenation
+~~~~~~~~~~~~~~~~
+
+To automatically hyphenate text set ``autoHyphenation`` to ``true``.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setAutoHyphenation(true);
+
+Consecutive Hyphen Limit
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The maximum number of consecutive lines of text ending with a hyphen can be controlled by the ``consecutiveHyphenLimit`` option.
+There is no limit if the option is not set or the provided value is ``0``.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setConsecutiveHyphenLimit(2);
+
+Hyphenation Zone
+~~~~~~~~~~~~~~~~
+
+The hyphenation zone (in *twip*) is the allowed amount of whitespace before hyphenation is applied.
+The smaller the hyphenation zone the more words are hyphenated. Or in other words, the wider the hyphenation zone the less words are hyphenated.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setHyphenationZone(\PhpOffice\PhpWord\Shared\Converter::cmToTwip(1));
+
+Hyphenate Caps
+~~~~~~~~~~~~~~
+
+To control whether or not words in all capital letters shall be hyphenated use the `doNotHyphenateCaps` option.
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setDoNotHyphenateCaps(true);
diff --git a/docs/styles.rst b/docs/styles.rst
index b84f76f0..b4ed328d 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -82,6 +82,7 @@ Available Paragraph style options:
 - ``spaceAfter``. Space after paragraph in *twip*.
 - ``spacing``. Space between lines.
 - ``spacingLineRule``. Line Spacing Rule. *auto*, *exact*, *atLeast*
+- ``suppressAutoHyphens``. Hyphenation for paragraph, *true* or *false*.
 - ``tabs``. Set of custom tab stops.
 - ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
 - ``contextualSpacing``. Ignore Spacing Above and Below When Using Identical Styles, *true* or *false*.
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 5aeffbc1..de504965 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -17,8 +17,6 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Style\Font;
-
 /**
  * Field element
  *
@@ -215,46 +213,6 @@ class Field extends AbstractElement
         return $this->options;
     }
 
-    /**
-     * Set Text style
-     *
-     * @param \PhpOffice\PhpWord\Style\Font $style
-     * @return \PhpOffice\PhpWord\Style\Font
-     */
-    public function setFontStyle($style = null)
-    {
-        if (!$style instanceof Font) {
-            throw new \InvalidArgumentException('font style must be of type Font');
-        }
-
-        if ($style->isNoProof()) {
-            $this->fontStyle = $style;
-        } else {
-            // make a copy of the font so the original is not altered
-            $this->fontStyle = clone $style;
-            $this->fontStyle->setNoProof(true);
-        }
-
-        return $this->fontStyle;
-    }
-
-    /**
-     * Get Text style
-     *
-     * @return \PhpOffice\PhpWord\Style\Font
-     */
-    public function getFontStyle()
-    {
-        if ($this->fontStyle == null) {
-            $font = new Font();
-            $font->setNoProof(true);
-
-            return $font;
-        }
-
-        return $this->fontStyle;
-    }
-
     /**
      * Set Field text
      *
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 728cc823..8ab58609 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -130,6 +130,32 @@ class Settings
      */
     private $decimalSymbol = '.';
 
+    /**
+     * Automatically hyphenate document contents when displayed
+     *
+     * @var bool|null
+     */
+    private $autoHyphenation;
+
+    /**
+     * Maximum number of consecutively hyphenated lines
+     *
+     * @var int|null
+     */
+    private $consecutiveHyphenLimit;
+
+    /**
+     * The allowed amount of whitespace before hyphenation is applied
+     * @var float|null
+     */
+    private $hyphenationZone;
+
+    /**
+     * Do not hyphenate words in all capital letters
+     * @var bool|null
+     */
+    private $doNotHyphenateCaps;
+
     /**
      * @return Protection
      */
@@ -387,4 +413,68 @@ class Settings
     {
         $this->decimalSymbol = $decimalSymbol;
     }
+
+    /**
+     * @return bool|null
+     */
+    public function hasAutoHyphenation()
+    {
+        return $this->autoHyphenation;
+    }
+
+    /**
+     * @param bool $autoHyphenation
+     */
+    public function setAutoHyphenation($autoHyphenation)
+    {
+        $this->autoHyphenation = (bool) $autoHyphenation;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getConsecutiveHyphenLimit()
+    {
+        return $this->consecutiveHyphenLimit;
+    }
+
+    /**
+     * @param int $consecutiveHyphenLimit
+     */
+    public function setConsecutiveHyphenLimit($consecutiveHyphenLimit)
+    {
+        $this->consecutiveHyphenLimit = (int) $consecutiveHyphenLimit;
+    }
+
+    /**
+     * @return float|null
+     */
+    public function getHyphenationZone()
+    {
+        return $this->hyphenationZone;
+    }
+
+    /**
+     * @param float $hyphenationZone Measurement unit is twip
+     */
+    public function setHyphenationZone($hyphenationZone)
+    {
+        $this->hyphenationZone = $hyphenationZone;
+    }
+
+    /**
+     * @return null|bool
+     */
+    public function hasDoNotHyphenateCaps()
+    {
+        return $this->doNotHyphenateCaps;
+    }
+
+    /**
+     * @param bool $doNotHyphenateCaps
+     */
+    public function setDoNotHyphenateCaps($doNotHyphenateCaps)
+    {
+        $this->doNotHyphenateCaps = (bool) $doNotHyphenateCaps;
+    }
 }
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 54ef65ac..ff23f6ef 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -242,6 +242,17 @@ class PhpWord
         return $section;
     }
 
+    /**
+     * Sorts the sections using the callable passed
+     *
+     * @see http://php.net/manual/en/function.usort.php for usage
+     * @param callable $sorter
+     */
+    public function sortSections($sorter)
+    {
+        usort($this->sections, $sorter);
+    }
+
     /**
      * Get default font name
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index b4610d28..2cbfba37 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -364,20 +364,21 @@ abstract class AbstractPart
 
         $styleNode = $xmlReader->getElement('w:pPr', $domNode);
         $styleDefs = array(
-            'styleName'         => array(self::READ_VALUE, array('w:pStyle', 'w:name')),
-            'alignment'         => array(self::READ_VALUE, 'w:jc'),
-            'basedOn'           => array(self::READ_VALUE, 'w:basedOn'),
-            'next'              => array(self::READ_VALUE, 'w:next'),
-            'indent'            => array(self::READ_VALUE, 'w:ind', 'w:left'),
-            'hanging'           => array(self::READ_VALUE, 'w:ind', 'w:hanging'),
-            'spaceAfter'        => array(self::READ_VALUE, 'w:spacing', 'w:after'),
-            'spaceBefore'       => array(self::READ_VALUE, 'w:spacing', 'w:before'),
-            'widowControl'      => array(self::READ_FALSE, 'w:widowControl'),
-            'keepNext'          => array(self::READ_TRUE,  'w:keepNext'),
-            'keepLines'         => array(self::READ_TRUE,  'w:keepLines'),
-            'pageBreakBefore'   => array(self::READ_TRUE,  'w:pageBreakBefore'),
-            'contextualSpacing' => array(self::READ_TRUE,  'w:contextualSpacing'),
-            'bidi'              => array(self::READ_TRUE,  'w:bidi'),
+            'styleName'           => array(self::READ_VALUE, array('w:pStyle', 'w:name')),
+            'alignment'           => array(self::READ_VALUE, 'w:jc'),
+            'basedOn'             => array(self::READ_VALUE, 'w:basedOn'),
+            'next'                => array(self::READ_VALUE, 'w:next'),
+            'indent'              => array(self::READ_VALUE, 'w:ind', 'w:left'),
+            'hanging'             => array(self::READ_VALUE, 'w:ind', 'w:hanging'),
+            'spaceAfter'          => array(self::READ_VALUE, 'w:spacing', 'w:after'),
+            'spaceBefore'         => array(self::READ_VALUE, 'w:spacing', 'w:before'),
+            'widowControl'        => array(self::READ_FALSE, 'w:widowControl'),
+            'keepNext'            => array(self::READ_TRUE,  'w:keepNext'),
+            'keepLines'           => array(self::READ_TRUE,  'w:keepLines'),
+            'pageBreakBefore'     => array(self::READ_TRUE,  'w:pageBreakBefore'),
+            'contextualSpacing'   => array(self::READ_TRUE,  'w:contextualSpacing'),
+            'bidi'                => array(self::READ_TRUE,  'w:bidi'),
+            'suppressAutoHyphens' => array(self::READ_TRUE,  'w:suppressAutoHyphens'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
@@ -578,7 +579,7 @@ abstract class AbstractPart
      *
      * @param string $method
      * @ignoreScrutinizerPatch
-     * @param mixed $attributeValue
+     * @param string|null $attributeValue
      * @param mixed $expected
      * @return mixed
      */
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 581a546d..ee057fe6 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -29,7 +29,18 @@ use PhpOffice\PhpWord\Style\Language;
  */
 class Settings extends AbstractPart
 {
-    private static $booleanProperties = array('hideSpellingErrors', 'hideGrammaticalErrors', 'trackRevisions', 'doNotTrackMoves', 'doNotTrackFormatting', 'evenAndOddHeaders');
+    private static $booleanProperties = array(
+        'mirrorMargins',
+        'hideSpellingErrors',
+        'hideGrammaticalErrors',
+        'trackRevisions',
+        'doNotTrackMoves',
+        'doNotTrackFormatting',
+        'evenAndOddHeaders',
+        'updateFields',
+        'autoHyphenation',
+        'doNotHyphenateCaps',
+    );
 
     /**
      * Read settings.xml.
@@ -157,4 +168,32 @@ class Settings extends AbstractPart
         $revisionView->setInkAnnotations(filter_var($xmlReader->getAttribute('w:inkAnnotations', $node), FILTER_VALIDATE_BOOLEAN));
         $phpWord->getSettings()->setRevisionView($revisionView);
     }
+
+    /**
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMElement $node
+     */
+    protected function setConsecutiveHyphenLimit(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    {
+        $value = $xmlReader->getAttribute('w:val', $node);
+
+        if ($value !== null) {
+            $phpWord->getSettings()->setConsecutiveHyphenLimit($value);
+        }
+    }
+
+    /**
+     * @param XMLReader $xmlReader
+     * @param PhpWord $phpWord
+     * @param \DOMElement $node
+     */
+    protected function setHyphenationZone(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
+    {
+        $value = $xmlReader->getAttribute('w:val', $node);
+
+        if ($value !== null) {
+            $phpWord->getSettings()->setHyphenationZone($value);
+        }
+    }
 }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 73635807..2c7cf1b5 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -252,7 +252,7 @@ class Html
         $styles['font'] = self::recursiveParseStylesInHierarchy($node, $styles['font']);
 
         //alignment applies on paragraph, not on font. Let's copy it there
-        if (isset($styles['font']['alignment'])) {
+        if (isset($styles['font']['alignment']) && is_array($styles['paragraph'])) {
             $styles['paragraph']['alignment'] = $styles['font']['alignment'];
         }
 
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 7e40d9e4..53a9b958 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -180,6 +180,13 @@ class Paragraph extends Border
      */
     private $textAlignment;
 
+    /**
+     * Suppress hyphenation for paragraph
+     *
+     * @var bool
+     */
+    private $suppressAutoHyphens = false;
+
     /**
      * Set Style value
      *
@@ -212,27 +219,28 @@ class Paragraph extends Border
     public function getStyleValues()
     {
         $styles = array(
-            'name'              => $this->getStyleName(),
-            'basedOn'           => $this->getBasedOn(),
-            'next'              => $this->getNext(),
-            'alignment'         => $this->getAlignment(),
-            'indentation'       => $this->getIndentation(),
-            'spacing'           => $this->getSpace(),
-            'pagination'        => array(
-                'widowControl'  => $this->hasWidowControl(),
-                'keepNext'      => $this->isKeepNext(),
-                'keepLines'     => $this->isKeepLines(),
-                'pageBreak'     => $this->hasPageBreakBefore(),
+            'name'                => $this->getStyleName(),
+            'basedOn'             => $this->getBasedOn(),
+            'next'                => $this->getNext(),
+            'alignment'           => $this->getAlignment(),
+            'indentation'         => $this->getIndentation(),
+            'spacing'             => $this->getSpace(),
+            'pagination'          => array(
+                'widowControl'    => $this->hasWidowControl(),
+                'keepNext'        => $this->isKeepNext(),
+                'keepLines'       => $this->isKeepLines(),
+                'pageBreak'       => $this->hasPageBreakBefore(),
             ),
-            'numbering'         => array(
-                'style'         => $this->getNumStyle(),
-                'level'         => $this->getNumLevel(),
+            'numbering'           => array(
+                'style'           => $this->getNumStyle(),
+                'level'           => $this->getNumLevel(),
             ),
-            'tabs'              => $this->getTabs(),
-            'shading'           => $this->getShading(),
-            'contextualSpacing' => $this->hasContextualSpacing(),
-            'bidi'              => $this->isBidi(),
-            'textAlignment'     => $this->getTextAlignment(),
+            'tabs'                => $this->getTabs(),
+            'shading'             => $this->getShading(),
+            'contextualSpacing'   => $this->hasContextualSpacing(),
+            'bidi'                => $this->isBidi(),
+            'textAlignment'       => $this->getTextAlignment(),
+            'suppressAutoHyphens' => $this->hasSuppressAutoHyphens(),
         );
 
         return $styles;
@@ -848,4 +856,20 @@ class Paragraph extends Border
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function hasSuppressAutoHyphens()
+    {
+        return $this->suppressAutoHyphens;
+    }
+
+    /**
+     * @param bool $suppressAutoHyphens
+     */
+    public function setSuppressAutoHyphens($suppressAutoHyphens)
+    {
+        $this->suppressAutoHyphens = (bool) $suppressAutoHyphens;
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index 19d3e54a..f91ad544 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -222,8 +222,8 @@ class Content extends AbstractPart
      * Table style can be null or string of the style name
      *
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $container
-     * @param int &$paragraphStyleCount
-     * @param int &$fontStyleCount
+     * @param int $paragraphStyleCount
+     * @param int $fontStyleCount
      * @todo Simplify the logic
      */
     private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyleCount)
@@ -254,9 +254,9 @@ class Content extends AbstractPart
     /**
      * Get style of individual element
      *
-     * @param \PhpOffice\PhpWord\Element\Text &$element
-     * @param int &$paragraphStyleCount
-     * @param int &$fontStyleCount
+     * @param \PhpOffice\PhpWord\Element\Text $element
+     * @param int $paragraphStyleCount
+     * @param int $fontStyleCount
      */
     private function getElementStyle(&$element, &$paragraphStyleCount, &$fontStyleCount)
     {
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index e56e2612..463ce082 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -149,12 +149,16 @@ class Settings extends AbstractPart
         $this->setOnOffValue('w:doNotTrackFormatting', $documentSettings->hasDoNotTrackFormatting());
         $this->setOnOffValue('w:evenAndOddHeaders', $documentSettings->hasEvenAndOddHeaders());
         $this->setOnOffValue('w:updateFields', $documentSettings->hasUpdateFields());
+        $this->setOnOffValue('w:autoHyphenation', $documentSettings->hasAutoHyphenation());
+        $this->setOnOffValue('w:doNotHyphenateCaps', $documentSettings->hasDoNotHyphenateCaps());
 
         $this->setThemeFontLang($documentSettings->getThemeFontLang());
         $this->setRevisionView($documentSettings->getRevisionView());
         $this->setDocumentProtection($documentSettings->getDocumentProtection());
         $this->setProofState($documentSettings->getProofState());
         $this->setZoom($documentSettings->getZoom());
+        $this->setConsecutiveHyphenLimit($documentSettings->getConsecutiveHyphenLimit());
+        $this->setHyphenationZone($documentSettings->getHyphenationZone());
         $this->setCompatibility();
     }
 
@@ -162,16 +166,18 @@ class Settings extends AbstractPart
      * Adds a boolean attribute to the settings array
      *
      * @param string $settingName
-     * @param bool $booleanValue
+     * @param bool|null $booleanValue
      */
     private function setOnOffValue($settingName, $booleanValue)
     {
-        if ($booleanValue !== null && is_bool($booleanValue)) {
-            if ($booleanValue) {
-                $this->settings[$settingName] = array('@attributes' => array());
-            } else {
-                $this->settings[$settingName] = array('@attributes' => array('w:val' => 'false'));
-            }
+        if (!is_bool($booleanValue)) {
+            return;
+        }
+
+        if ($booleanValue) {
+            $this->settings[$settingName] = array('@attributes' => array());
+        } else {
+            $this->settings[$settingName] = array('@attributes' => array('w:val' => 'false'));
         }
     }
 
@@ -278,6 +284,34 @@ class Settings extends AbstractPart
         }
     }
 
+    /**
+     * @param int|null $consecutiveHyphenLimit
+     */
+    private function setConsecutiveHyphenLimit($consecutiveHyphenLimit)
+    {
+        if ($consecutiveHyphenLimit === null) {
+            return;
+        }
+
+        $this->settings['w:consecutiveHyphenLimit'] = array(
+            '@attributes' => array('w:val' => $consecutiveHyphenLimit),
+        );
+    }
+
+    /**
+     * @param float|null $hyphenationZone
+     */
+    private function setHyphenationZone($hyphenationZone)
+    {
+        if ($hyphenationZone === null) {
+            return;
+        }
+
+        $this->settings['w:hyphenationZone'] = array(
+            '@attributes' => array('w:val' => $hyphenationZone),
+        );
+    }
+
     /**
      * Get compatibility setting.
      */
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 8915fb4c..eeccc5c8 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -112,6 +112,9 @@ class Paragraph extends AbstractStyle
         //Paragraph textAlignment
         $xmlWriter->writeElementIf($styles['textAlignment'] !== null, 'w:textAlignment', 'w:val', $styles['textAlignment']);
 
+        // Hyphenation
+        $xmlWriter->writeElementIf($styles['suppressAutoHyphens'] === true, 'w:suppressAutoHyphens');
+
         // Child style: alignment, indentation, spacing, and shading
         $this->writeChildStyle($xmlWriter, 'Indentation', $styles['indentation']);
         $this->writeChildStyle($xmlWriter, 'Spacing', $styles['spacing']);
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 867f680a..37096e2d 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -184,11 +184,11 @@ class SectionTest extends \PHPUnit\Framework\TestCase
     public function testRemoveElementByElement()
     {
         $section = new Section(1);
-        $fistText = $section->addText('firstText');
+        $firstText = $section->addText('firstText');
         $secondText = $section->addText('secondText');
 
         $this->assertEquals(2, $section->countElements());
-        $section->removeElement($fistText);
+        $section->removeElement($firstText);
 
         $this->assertEquals(1, $section->countElements());
         $this->assertEquals($secondText->getElementId(), $section->getElement(1)->getElementId());
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 50863561..07dc8962 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -172,4 +172,58 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $oSettings->setUpdateFields(true);
         $this->assertTrue($oSettings->hasUpdateFields());
     }
+
+    public function testAutoHyphenation()
+    {
+        $oSettings = new Settings();
+        $oSettings->setAutoHyphenation(true);
+        $this->assertTrue($oSettings->hasAutoHyphenation());
+    }
+
+    public function testDefaultAutoHyphenation()
+    {
+        $oSettings = new Settings();
+        $this->assertNull($oSettings->hasAutoHyphenation());
+    }
+
+    public function testConsecutiveHyphenLimit()
+    {
+        $consecutiveHypenLimit = 2;
+        $oSettings = new Settings();
+        $oSettings->setConsecutiveHyphenLimit($consecutiveHypenLimit);
+        $this->assertSame($consecutiveHypenLimit, $oSettings->getConsecutiveHyphenLimit());
+    }
+
+    public function testDefaultConsecutiveHyphenLimit()
+    {
+        $oSettings = new Settings();
+        $this->assertNull($oSettings->getConsecutiveHyphenLimit());
+    }
+
+    public function testHyphenationZone()
+    {
+        $hyphenationZoneInTwip = 100;
+        $oSettings = new Settings();
+        $oSettings->setHyphenationZone($hyphenationZoneInTwip);
+        $this->assertSame($hyphenationZoneInTwip, $oSettings->getHyphenationZone());
+    }
+
+    public function testDefaultHyphenationZone()
+    {
+        $oSettings = new Settings();
+        $this->assertNull($oSettings->getHyphenationZone());
+    }
+
+    public function testDoNotHyphenateCaps()
+    {
+        $oSettings = new Settings();
+        $oSettings->setDoNotHyphenateCaps(true);
+        $this->assertTrue($oSettings->hasDoNotHyphenateCaps());
+    }
+
+    public function testDefaultDoNotHyphenateCaps()
+    {
+        $oSettings = new Settings();
+        $this->assertNull($oSettings->hasDoNotHyphenateCaps());
+    }
 }
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index f8a22459..3b1b5a36 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -171,4 +171,58 @@ class PhpWordTest extends \PHPUnit\Framework\TestCase
         $phpWord = new PhpWord();
         $phpWord->undefinedMethod();
     }
+
+    /**
+     * @covers \PhpOffice\PhpWord\PhpWord::getSection
+     */
+    public function testGetNotExistingSection()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->getSection(0);
+
+        $this->assertNull($section);
+    }
+
+    /**
+     * @covers \PhpOffice\PhpWord\PhpWord::getSection
+     */
+    public function testGetSection()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->addSection();
+        $section = $phpWord->getSection(0);
+
+        $this->assertNotNull($section);
+    }
+
+    /**
+     * @covers \PhpOffice\PhpWord\PhpWord::sortSections
+     */
+    public function testSortSections()
+    {
+        $phpWord = new PhpWord();
+        $section1 = $phpWord->addSection();
+        $section1->addText('test1');
+        $section2 = $phpWord->addSection();
+        $section2->addText('test2');
+        $section2->addText('test3');
+
+        $this->assertEquals(1, $phpWord->getSection(0)->countElements());
+        $this->assertEquals(2, $phpWord->getSection(1)->countElements());
+
+        $phpWord->sortSections(function ($a, $b) {
+            $numElementsInA = $a->countElements();
+            $numElementsInB = $b->countElements();
+            if ($numElementsInA === $numElementsInB) {
+                return 0;
+            } elseif ($numElementsInA > $numElementsInB) {
+                return -1;
+            }
+
+            return 1;
+        });
+
+        $this->assertEquals(2, $phpWord->getSection(0)->countElements());
+        $this->assertEquals(1, $phpWord->getSection(1)->countElements());
+    }
 }
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index ad8f125a..93e4a1f0 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -81,9 +81,9 @@ class StyleTest extends AbstractTestReader
             </w:r>
         </w:p>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $elements = $phpWord->getSection(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
         $this->assertInstanceOf('PhpOffice\PhpWord\Style\Font', $elements[0]->getFontStyle());
         /** @var \PhpOffice\PhpWord\Style\Font $fontStyle */
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index e961f36a..adf0ed4d 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -67,23 +67,24 @@ class ParagraphTest extends \PHPUnit\Framework\TestCase
         $object = new Paragraph();
 
         $attributes = array(
-            'spaceAfter'        => 240,
-            'spaceBefore'       => 240,
-            'indent'            => 1,
-            'hanging'           => 1,
-            'spacing'           => 120,
-            'spacingLineRule'   => LineSpacingRule::AT_LEAST,
-            'basedOn'           => 'Normal',
-            'next'              => 'Normal',
-            'numStyle'          => 'numStyle',
-            'numLevel'          => 1,
-            'widowControl'      => false,
-            'keepNext'          => true,
-            'keepLines'         => true,
-            'pageBreakBefore'   => true,
-            'contextualSpacing' => true,
-            'textAlignment'     => 'auto',
-            'bidi'              => true,
+            'spaceAfter'          => 240,
+            'spaceBefore'         => 240,
+            'indent'              => 1,
+            'hanging'             => 1,
+            'spacing'             => 120,
+            'spacingLineRule'     => LineSpacingRule::AT_LEAST,
+            'basedOn'             => 'Normal',
+            'next'                => 'Normal',
+            'numStyle'            => 'numStyle',
+            'numLevel'            => 1,
+            'widowControl'        => false,
+            'keepNext'            => true,
+            'keepLines'           => true,
+            'pageBreakBefore'     => true,
+            'contextualSpacing'   => true,
+            'textAlignment'       => 'auto',
+            'bidi'                => true,
+            'suppressAutoHyphens' => true,
         );
         foreach ($attributes as $key => $value) {
             $get = $this->findGetter($key, $value, $object);
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 50b444b8..a45253a2 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -330,4 +330,68 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $element = $doc->getElement($path, $file);
         $this->assertNotEquals('false', $element->getAttribute('w:val'));
     }
+
+    public function testAutoHyphenation()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setAutoHyphenation(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:autoHyphenation';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
+
+    public function testConsecutiveHyphenLimit()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setConsecutiveHyphenLimit(2);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:consecutiveHyphenLimit';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertSame('2', $element->getAttribute('w:val'));
+    }
+
+    public function testHyphenationZone()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setHyphenationZone(100);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:hyphenationZone';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertSame('100', $element->getAttribute('w:val'));
+    }
+
+    public function testDoNotHyphenateCaps()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setDoNotHyphenateCaps(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:doNotHyphenateCaps';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
index 9bc2756b..1e5e1d13 100644
--- a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
@@ -17,6 +17,7 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
+use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
@@ -49,4 +50,18 @@ class ParagraphTest extends \PHPUnit\Framework\TestCase
         $path = '/w:document/w:body/w:p/w:pPr/w:numPr/w:ilvl';
         $this->assertTrue($doc->elementExists($path));
     }
+
+    public function testSuppressAutoHyphens()
+    {
+        $paragraphStyle = new ParagraphStyle();
+        $paragraphStyle->setSuppressAutoHyphens(true);
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $section->addText('test', null, $paragraphStyle);
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:p/w:pPr/w:suppressAutoHyphens';
+        $this->assertTrue($doc->elementExists($path));
+    }
 }

From f41c542ba07e02718718a2958b9cfcb427dfb8a0 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Thu, 15 Feb 2018 20:08:48 +0100
Subject: [PATCH 245/370] Enforce valid value for on/off type

---
 src/PhpWord/Writer/Word2007/Part/Settings.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 463ce082..118c0da0 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -174,11 +174,8 @@ class Settings extends AbstractPart
             return;
         }
 
-        if ($booleanValue) {
-            $this->settings[$settingName] = array('@attributes' => array());
-        } else {
-            $this->settings[$settingName] = array('@attributes' => array('w:val' => 'false'));
-        }
+        $value = $booleanValue ? 'true' : 'false';
+        $this->settings[$settingName] = array('@attributes' => array('w:val' => $value));
     }
 
     /**

From edc3aa3cce59172b138e08475e1732624a2812cd Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Thu, 15 Feb 2018 20:08:59 +0100
Subject: [PATCH 246/370] Improve assertions

---
 .../Writer/Word2007/Part/SettingsTest.php        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index a45253a2..41583e37 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -174,7 +174,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
         $element = $doc->getElement($path, $file);
 
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     /**
@@ -193,7 +193,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     /**
@@ -247,7 +247,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     /**
@@ -290,7 +290,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     /**
@@ -309,7 +309,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     /**
@@ -328,7 +328,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     public function testAutoHyphenation()
@@ -344,7 +344,7 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
     public function testConsecutiveHyphenLimit()
@@ -392,6 +392,6 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($path, $file));
 
         $element = $doc->getElement($path, $file);
-        $this->assertNotEquals('false', $element->getAttribute('w:val'));
+        $this->assertSame('true', $element->getAttribute('w:val'));
     }
 }

From 9ffbd98cc66d87d28cd3b80cbf9915461b5b81d4 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Thu, 15 Feb 2018 20:12:56 +0100
Subject: [PATCH 247/370] Add missing tests

---
 .../Writer/Word2007/Part/SettingsTest.php     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 41583e37..a8c01da0 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -196,6 +196,22 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertSame('true', $element->getAttribute('w:val'));
     }
 
+    public function testUpdateFields()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setUpdateFields(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:updateFields';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertSame('true', $element->getAttribute('w:val'));
+    }
+
     /**
      * Test zoom percentage
      */
@@ -274,6 +290,38 @@ class SettingsTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('true', $element->getAttribute('w:comments'));
     }
 
+    public function testHideSpellingErrors()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setHideSpellingErrors(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:hideSpellingErrors';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertSame('true', $element->getAttribute('w:val'));
+    }
+
+    public function testHideGrammaticalErrors()
+    {
+        $phpWord = new PhpWord();
+        $phpWord->getSettings()->setHideGrammaticalErrors(true);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+
+        $file = 'word/settings.xml';
+
+        $path = '/w:settings/w:hideGrammaticalErrors';
+        $this->assertTrue($doc->elementExists($path, $file));
+
+        $element = $doc->getElement($path, $file);
+        $this->assertSame('true', $element->getAttribute('w:val'));
+    }
+
     /**
      * Test track Revisions
      */

From d8f4a28b94ade126a66bed836050246af2cb7ee8 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Wed, 7 Mar 2018 20:04:19 +0100
Subject: [PATCH 248/370] Make Composer scripts compatible with Windows

Windows does not like the "./" syntax
---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index d1c35b40..742e4bc8 100644
--- a/composer.json
+++ b/composer.json
@@ -36,19 +36,19 @@
     ],
     "scripts": {
         "test": [
-            "./vendor/bin/phpunit --color=always"
+            "phpunit --color=always"
         ],
         "test-no-coverage": [
-            "./vendor/bin/phpunit --color=always --no-coverage"
+            "phpunit --color=always --no-coverage"
         ],
         "check": [
-            "./vendor/bin/php-cs-fixer fix --ansi --dry-run --diff",
-            "./vendor/bin/phpcs --report-width=200 --report-summary  --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
-            "./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
+            "php-cs-fixer fix --ansi --dry-run --diff",
+            "phpcs --report-width=200 --report-summary  --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
+            "phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
             "@test"
         ],
         "fix": [
-            "./vendor/bin/php-cs-fixer fix --ansi"
+            "php-cs-fixer fix --ansi"
         ]
     },
     "scripts-descriptions": {

From eb6900969ffbce2838c1b35d1e25c9d31fc29752 Mon Sep 17 00:00:00 2001
From: Francisco Lucas Sens <francisco.lucas.sens@gmail.com>
Date: Thu, 8 Mar 2018 16:15:31 -0300
Subject: [PATCH 249/370] Added new constant to Brazilian portuguese language

---
 src/PhpWord/Style/Language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index e09421e0..c8152f50 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -59,6 +59,9 @@ final class Language extends AbstractStyle
     const HI_IN = 'hi-IN';
     const HI_IN_ID = 1081;
 
+    const PT_BR = 'pt-BR';
+    const PT_BR_ID = 1046;
+
     /**
      * Language ID, used for RTF document generation
      *

From f9a05547f717e9c95fa2054f12d9f3fa6a56c4dd Mon Sep 17 00:00:00 2001
From: Henri MEDOT <anrikun@hotmail.com>
Date: Thu, 8 Mar 2018 23:46:22 +0100
Subject: [PATCH 250/370] Added support for Floating Table Positioning (tblpPr)
 (#639)

Added support for Floating Table Positioning (tblpPr)
---
 CHANGELOG.md                                  |   1 +
 docs/elements.rst                             |   1 +
 docs/styles.rst                               |  14 +
 samples/Sample_09_Tables.php                  |  12 +
 samples/Sample_26_Html.php                    |   3 +
 src/PhpWord/Reader/Word2007/AbstractPart.php  |  30 ++
 src/PhpWord/Style/Table.php                   |  30 ++
 src/PhpWord/Style/TablePosition.php           | 410 ++++++++++++++++++
 src/PhpWord/Writer/Word2007/Style/Table.php   |   5 +
 .../Writer/Word2007/Style/TablePosition.php   |  65 +++
 tests/PhpWord/Reader/Word2007/StyleTest.php   |  35 +-
 tests/PhpWord/Style/TablePositionTest.php     |  65 +++
 tests/PhpWord/Style/TableTest.php             |  13 +
 .../Writer/Word2007/Style/TableTest.php       |  42 ++
 14 files changed, 725 insertions(+), 1 deletion(-)
 create mode 100644 src/PhpWord/Style/TablePosition.php
 create mode 100644 src/PhpWord/Writer/Word2007/Style/TablePosition.php
 create mode 100644 tests/PhpWord/Style/TablePositionTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdc4d67c..0c83ac35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ v0.15.0 (?? ??? 2018)
 - Added support for Vertically Raised or Lowered Text (w:position) @anrikun @troosan #640
 - Add support for MACROBUTTON field @phryneas @troosan #1021
 - Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
+- Added support for Floating Table Positioning (tblpPr) @anrikun #639
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/elements.rst b/docs/elements.rst
index 4d1b9383..4c5ad03b 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -482,6 +482,7 @@ Track changes can be set on text elements. There are 2 ways to set the change in
 Either by calling the `setChangeInfo()`, or by setting the `TrackChange` instance on the element with `setTrackChange()`.
 
 .. code-block:: php
+
     $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
     // New portrait section
diff --git a/docs/styles.rst b/docs/styles.rst
index b4ed328d..98088e78 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -108,6 +108,20 @@ Available Table style options:
 - ``unit``. The unit to use for the width. One of ``\PhpOffice\PhpWord\SimpleType\TblWidth``. Defaults to *auto*.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
 - ``cellSpacing`` Cell spacing in *twip*
+- ``position`` Floating Table Positioning, see below for options
+
+Floating Table Positioning options:
+
+- ``leftFromText`` Distance From Left of Table to Text in *twip*
+- ``rightFromText`` Distance From Right of Table to Text in *twip*
+- ``topFromText`` Distance From Top of Table to Text in *twip*
+- ``bottomFromText`` Distance From Top of Table to Text in *twip*
+- ``vertAnchor`` Table Vertical Anchor, one of ``\PhpOffice\PhpWord\Style\TablePosition::VANCHOR_*``
+- ``horzAnchor`` Table Horizontal Anchor, one of ``\PhpOffice\PhpWord\Style\TablePosition::HANCHOR_*``
+- ``tblpXSpec`` Relative Horizontal Alignment From Anchor, one of ``\PhpOffice\PhpWord\Style\TablePosition::XALIGN_*``
+- ``tblpX`` Absolute Horizontal Distance From Anchorin *twip*
+- ``tblpYSpec`` Relative Vertical Alignment From Anchor, one of ``\PhpOffice\PhpWord\Style\TablePosition::YALIGN_*``
+- ``tblpY`` Absolute Vertical Distance From Anchorin *twip*
 
 Available Row style options:
 
diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index ba41aa54..e458a5ee 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -1,4 +1,7 @@
 <?php
+use PhpOffice\PhpWord\Shared\Converter;
+use PhpOffice\PhpWord\Style\TablePosition;
+
 include_once 'Sample_Header.php';
 
 // New Word Document
@@ -139,6 +142,15 @@ $cell->addText('This cell contains nested table.');
 $innerCell = $cell->addTable(array('alignment' => \PhpOffice\PhpWord\SimpleType\JcTable::CENTER))->addRow()->addCell();
 $innerCell->addText('Inside nested table');
 
+// 6. Table with floating position
+
+$section->addTextBreak(2);
+$section->addText('Table with floating positioning.', $header);
+
+$table = $section->addTable(array('borderSize' => 6, 'borderColor' => '999999', 'position' => array('vertAnchor' => TablePosition::VANCHOR_TEXT, 'bottomFromText' => Converter::cmToTwip(1))));
+$cell = $table->addRow()->addCell();
+$cell->addText('This is a single cell.');
+
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index f6086357..31e5984f 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -4,6 +4,7 @@ include_once 'Sample_Header.php';
 // New Word Document
 echo date('H:i:s') , ' Create new PhpWord object' , EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
+$phpWord->addParagraphStyle('Heading2', array('alignment' => 'center'));
 
 $section = $phpWord->addSection();
 $html = '<h1>Adding element via HTML</h1>';
@@ -17,6 +18,8 @@ $html .= '<p lang="he-IL" style="text-align: right; direction: rtl">היי, זה
 $html .= '<p style="margin-top: 240pt;">Unordered (bulleted) list:</p>';
 $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
 
+$html .= '<h2 style="align: center">centered title</h2>';
+
 $html .= '<p style="margin-top: 240pt;">Ordered (numbered) list:</p>';
 $html .= '<ol>
                 <li><p style="font-weight: bold;">List 1 item 1</p></li>
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 2cbfba37..7ba53ad1 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -462,12 +462,42 @@ abstract class AbstractPart
                 $styleDefs['layout'] = array(self::READ_VALUE, 'w:tblLayout', 'w:type');
                 $styleDefs['cellSpacing'] = array(self::READ_VALUE, 'w:tblCellSpacing', 'w:w');
                 $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
+
+                $tablePositionNode = $xmlReader->getElement('w:tblpPr', $styleNode);
+                if ($tablePositionNode !== null) {
+                    $style['position'] = $this->readTablePosition($xmlReader, $tablePositionNode);
+                }
             }
         }
 
         return $style;
     }
 
+    /**
+     * Read w:tblpPr
+     *
+     * @param \PhpOffice\Common\XMLReader $xmlReader
+     * @param \DOMElement $domNode
+     * @return array
+     */
+    private function readTablePosition(XMLReader $xmlReader, \DOMElement $domNode)
+    {
+        $styleDefs = array(
+            'leftFromText'   => array(self::READ_VALUE, '.', 'w:leftFromText'),
+            'rightFromText'  => array(self::READ_VALUE, '.', 'w:rightFromText'),
+            'topFromText'    => array(self::READ_VALUE, '.', 'w:topFromText'),
+            'bottomFromText' => array(self::READ_VALUE, '.', 'w:bottomFromText'),
+            'vertAnchor'     => array(self::READ_VALUE, '.', 'w:vertAnchor'),
+            'horzAnchor'     => array(self::READ_VALUE, '.', 'w:horzAnchor'),
+            'tblpXSpec'      => array(self::READ_VALUE, '.', 'w:tblpXSpec'),
+            'tblpX'          => array(self::READ_VALUE, '.', 'w:tblpX'),
+            'tblpYSpec'      => array(self::READ_VALUE, '.', 'w:tblpYSpec'),
+            'tblpY'          => array(self::READ_VALUE, '.', 'w:tblpY'),
+        );
+
+        return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
+    }
+
     /**
      * Read w:tcPr
      *
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 8aba172a..92a24dde 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -152,6 +152,13 @@ class Table extends Border
      */
     private $layout = self::LAYOUT_AUTO;
 
+    /**
+     * Position
+     *
+     * @var \PhpOffice\PhpWord\Style\TablePosition
+     */
+    private $position;
+
     /**
      * Create new table style
      *
@@ -694,4 +701,27 @@ class Table extends Border
 
         return $this;
     }
+
+    /**
+     * Get position
+     *
+     * @return \PhpOffice\PhpWord\Style\TablePosition
+     */
+    public function getPosition()
+    {
+        return $this->position;
+    }
+
+    /**
+     * Set position
+     *
+     * @param mixed $value
+     * @return self
+     */
+    public function setPosition($value = null)
+    {
+        $this->setObjectVal($value, 'TablePosition', $this->position);
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Style/TablePosition.php b/src/PhpWord/Style/TablePosition.php
new file mode 100644
index 00000000..7cb0a0be
--- /dev/null
+++ b/src/PhpWord/Style/TablePosition.php
@@ -0,0 +1,410 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * TablePosition style
+ *
+ * @see http://www.datypic.com/sc/ooxml/e-w_tblpPr-1.html
+ */
+class TablePosition extends AbstractStyle
+{
+    /**
+     * Vertical anchor constants
+     *
+     * @const string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_VAnchor.html
+     */
+    const VANCHOR_TEXT = 'text'; // Relative to vertical text extents
+    const VANCHOR_MARGIN = 'margin'; // Relative to margin
+    const VANCHOR_PAGE = 'page'; // Relative to page
+
+    /**
+     * Horizontal anchor constants
+     *
+     * @const string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_HAnchor.html
+     */
+    const HANCHOR_TEXT = 'text'; // Relative to text extents
+    const HANCHOR_MARGIN = 'margin'; // Relative to margin
+    const HANCHOR_PAGE = 'page'; // Relative to page
+
+    /**
+     * Horizontal alignment constants
+     *
+     * @const string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_XAlign.html
+     */
+    const XALIGN_LEFT = 'left'; // Left aligned horizontally
+    const XALIGN_CENTER = 'center'; // Centered horizontally
+    const XALIGN_RIGHT = 'right'; // Right aligned horizontally
+    const XALIGN_INSIDE = 'inside'; // Inside
+    const XALIGN_OUTSIDE = 'outside'; // Outside
+
+    /**
+     * Vertical alignment constants
+     *
+     * @const string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_YAlign.html
+     */
+    const YALIGN_INLINE = 'inline'; // In line with text
+    const YALIGN_TOP = 'top'; // Top
+    const YALIGN_CENTER = 'center'; // Centered vertically
+    const YALIGN_BOTTOM = 'bottom'; // Bottom
+    const YALIGN_INSIDE = 'inside'; // Inside Anchor Extents
+    const YALIGN_OUTSIDE = 'outside'; // Centered vertically
+
+    /**
+     * Distance from left of table to text
+     *
+     * @var int
+     */
+    private $leftFromText;
+
+    /**
+     * Distance from right of table to text
+     *
+     * @var int
+     */
+    private $rightFromText;
+
+    /**
+     * Distance from top of table to text
+     *
+     * @var int
+     */
+    private $topFromText;
+
+    /**
+     * Distance from bottom of table to text
+     *
+     * @var int
+     */
+    private $bottomFromText;
+
+    /**
+     * Table vertical anchor
+     *
+     * @var string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_VAnchor.html
+     */
+    private $vertAnchor;
+
+    /**
+     * Table horizontal anchor
+     *
+     * @var string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_HAnchor.html
+     */
+    private $horzAnchor;
+
+    /**
+     * Relative horizontal alignment from anchor
+     *
+     * @var string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_XAlign.html
+     */
+    private $tblpXSpec;
+
+    /**
+     * Absolute horizontal distance from anchor
+     *
+     * @var int
+     */
+    private $tblpX;
+
+    /**
+     * Relative vertical alignment from anchor
+     *
+     * @var string
+     * @see http://www.datypic.com/sc/ooxml/t-w_ST_YAlign.html
+     */
+    private $tblpYSpec;
+
+    /**
+     * Absolute vertical distance from anchor
+     *
+     * @var int
+     */
+    private $tblpY;
+
+    /**
+     * Create a new instance
+     *
+     * @param array $style
+     */
+    public function __construct($style = array())
+    {
+        $this->setStyleByArray($style);
+    }
+
+    /**
+     * Get distance from left of table to text
+     *
+     * @return int
+     */
+    public function getLeftFromText()
+    {
+        return $this->leftFromText;
+    }
+
+    /**
+     * Set distance from left of table to text
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setLeftFromText($value = null)
+    {
+        $this->leftFromText = $this->setNumericVal($value, $this->leftFromText);
+
+        return $this;
+    }
+
+    /**
+     * Get distance from right of table to text
+     *
+     * @return int
+     */
+    public function getRightFromText()
+    {
+        return $this->rightFromText;
+    }
+
+    /**
+     * Set distance from right of table to text
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setRightFromText($value = null)
+    {
+        $this->rightFromText = $this->setNumericVal($value, $this->rightFromText);
+
+        return $this;
+    }
+
+    /**
+     * Get distance from top of table to text
+     *
+     * @return int
+     */
+    public function getTopFromText()
+    {
+        return $this->topFromText;
+    }
+
+    /**
+     * Set distance from top of table to text
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setTopFromText($value = null)
+    {
+        $this->topFromText = $this->setNumericVal($value, $this->topFromText);
+
+        return $this;
+    }
+
+    /**
+     * Get distance from bottom of table to text
+     *
+     * @return int
+     */
+    public function getBottomFromText()
+    {
+        return $this->bottomFromText;
+    }
+
+    /**
+     * Set distance from bottom of table to text
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setBottomFromText($value = null)
+    {
+        $this->bottomFromText = $this->setNumericVal($value, $this->bottomFromText);
+
+        return $this;
+    }
+
+    /**
+     * Get table vertical anchor
+     *
+     * @return string
+     */
+    public function getVertAnchor()
+    {
+        return $this->vertAnchor;
+    }
+
+    /**
+     * Set table vertical anchor
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setVertAnchor($value = null)
+    {
+        $enum = array(
+          self::VANCHOR_TEXT,
+          self::VANCHOR_MARGIN,
+          self::VANCHOR_PAGE,
+        );
+        $this->vertAnchor = $this->setEnumVal($value, $enum, $this->vertAnchor);
+
+        return $this;
+    }
+
+    /**
+     * Get table horizontal anchor
+     *
+     * @return string
+     */
+    public function getHorzAnchor()
+    {
+        return $this->horzAnchor;
+    }
+
+    /**
+     * Set table horizontal anchor
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setHorzAnchor($value = null)
+    {
+        $enum = array(
+          self::HANCHOR_TEXT,
+          self::HANCHOR_MARGIN,
+          self::HANCHOR_PAGE,
+        );
+        $this->horzAnchor = $this->setEnumVal($value, $enum, $this->horzAnchor);
+
+        return $this;
+    }
+
+    /**
+     * Get relative horizontal alignment from anchor
+     *
+     * @return string
+     */
+    public function getTblpXSpec()
+    {
+        return $this->tblpXSpec;
+    }
+
+    /**
+     * Set relative horizontal alignment from anchor
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setTblpXSpec($value = null)
+    {
+        $enum = array(
+            self::XALIGN_LEFT,
+            self::XALIGN_CENTER,
+            self::XALIGN_RIGHT,
+            self::XALIGN_INSIDE,
+            self::XALIGN_OUTSIDE,
+        );
+        $this->tblpXSpec = $this->setEnumVal($value, $enum, $this->tblpXSpec);
+
+        return $this;
+    }
+
+    /**
+     * Get absolute horizontal distance from anchor
+     *
+     * @return int
+     */
+    public function getTblpX()
+    {
+        return $this->tblpX;
+    }
+
+    /**
+     * Set absolute horizontal distance from anchor
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setTblpX($value = null)
+    {
+        $this->tblpX = $this->setNumericVal($value, $this->tblpX);
+
+        return $this;
+    }
+
+    /**
+     * Get relative vertical alignment from anchor
+     *
+     * @return string
+     */
+    public function getTblpYSpec()
+    {
+        return $this->tblpYSpec;
+    }
+
+    /**
+     * Set relative vertical alignment from anchor
+     *
+     * @param string $value
+     * @return self
+     */
+    public function setTblpYSpec($value = null)
+    {
+        $enum = array(
+            self::YALIGN_INLINE,
+            self::YALIGN_TOP,
+            self::YALIGN_CENTER,
+            self::YALIGN_BOTTOM,
+            self::YALIGN_INSIDE,
+            self::YALIGN_OUTSIDE,
+        );
+        $this->tblpYSpec = $this->setEnumVal($value, $enum, $this->tblpYSpec);
+
+        return $this;
+    }
+
+    /**
+     * Get absolute vertical distance from anchor
+     *
+     * @return int
+     */
+    public function getTblpY()
+    {
+        return $this->tblpY;
+    }
+
+    /**
+     * Set absolute vertical distance from anchor
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setTblpY($value = null)
+    {
+        $this->tblpY = $this->setNumericVal($value, $this->tblpY);
+
+        return $this;
+    }
+}
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 14226212..058e60e2 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -80,6 +80,11 @@ class Table extends AbstractStyle
         $this->writeTblWidth($xmlWriter, 'w:tblW', $style->getUnit(), $style->getWidth());
         $this->writeTblWidth($xmlWriter, 'w:tblCellSpacing', TblWidth::TWIP, $style->getCellSpacing());
         $this->writeLayout($xmlWriter, $style->getLayout());
+
+        // Position
+        $styleWriter = new TablePosition($xmlWriter, $style->getPosition());
+        $styleWriter->write();
+
         $this->writeMargin($xmlWriter, $style);
         $this->writeBorder($xmlWriter, $style);
 
diff --git a/src/PhpWord/Writer/Word2007/Style/TablePosition.php b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
new file mode 100644
index 00000000..14fa6a0d
--- /dev/null
+++ b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Style;
+
+/**
+ * TablePosition style writer
+ */
+class TablePosition extends AbstractStyle
+{
+    /**
+     * Write style.
+     */
+    public function write()
+    {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\TablePosition) {
+            return;
+        }
+
+        $values = array();
+        $properties = array(
+          'leftFromText',
+          'rightFromText',
+          'topFromText',
+          'bottomFromText',
+          'vertAnchor',
+          'horzAnchor',
+          'tblpXSpec',
+          'tblpX',
+          'tblpYSpec',
+          'tblpY',
+        );
+        foreach ($properties as $property) {
+            $method = 'get' . $property;
+            if (method_exists($style, $method)) {
+                $values[$property] = $style->$method();
+            }
+        }
+        $values = array_filter($values);
+
+        if ($values) {
+            $xmlWriter = $this->getXmlWriter();
+            $xmlWriter->startElement('w:tblpPr');
+            foreach ($values as $property => $value) {
+                $xmlWriter->writeAttribute('w:' . $property, $value);
+            }
+            $xmlWriter->endElement();
+        }
+    }
+}
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index 93e4a1f0..3b04b677 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -20,6 +20,7 @@ namespace PhpOffice\PhpWord\Reader\Word2007;
 use PhpOffice\PhpWord\AbstractTestReader;
 use PhpOffice\PhpWord\SimpleType\TblWidth;
 use PhpOffice\PhpWord\Style\Table;
+use PhpOffice\PhpWord\Style\TablePosition;
 
 /**
  * Test class for PhpOffice\PhpWord\Reader\Word2007\Styles
@@ -61,12 +62,44 @@ class StyleTest extends AbstractTestReader
         $elements = $phpWord->getSection(0)->getElements();
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
         $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
-        $this->assertEquals(TblWidth::AUTO, $elements[0]->getStyle()->getUnit());
         /** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
         $tableStyle = $elements[0]->getStyle();
+        $this->assertEquals(TblWidth::AUTO, $tableStyle->getUnit());
         $this->assertEquals(10.5, $tableStyle->getCellSpacing());
     }
 
+    /**
+     * Test reading of table position
+     */
+    public function testReadTablePosition()
+    {
+        $documentXml = '<w:tbl>
+            <w:tblPr>
+                <w:tblpPr w:leftFromText="10" w:rightFromText="20" w:topFromText="30" w:bottomFromText="40" w:vertAnchor="page" w:horzAnchor="margin" w:tblpXSpec="center" w:tblpX="50" w:tblpYSpec="top" w:tblpY="60"/>
+            </w:tblPr>
+        </w:tbl>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
+        $this->assertNotNull($elements[0]->getStyle()->getPosition());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\TablePosition', $elements[0]->getStyle()->getPosition());
+        /** @var \PhpOffice\PhpWord\Style\TablePosition $tableStyle */
+        $tableStyle = $elements[0]->getStyle()->getPosition();
+        $this->assertEquals(10, $tableStyle->getLeftFromText());
+        $this->assertEquals(20, $tableStyle->getRightFromText());
+        $this->assertEquals(30, $tableStyle->getTopFromText());
+        $this->assertEquals(40, $tableStyle->getBottomFromText());
+        $this->assertEquals(TablePosition::VANCHOR_PAGE, $tableStyle->getVertAnchor());
+        $this->assertEquals(TablePosition::HANCHOR_MARGIN, $tableStyle->getHorzAnchor());
+        $this->assertEquals(TablePosition::XALIGN_CENTER, $tableStyle->getTblpXSpec());
+        $this->assertEquals(50, $tableStyle->getTblpX());
+        $this->assertEquals(TablePosition::YALIGN_TOP, $tableStyle->getTblpYSpec());
+        $this->assertEquals(60, $tableStyle->getTblpY());
+    }
+
     /**
      * Test reading of position
      */
diff --git a/tests/PhpWord/Style/TablePositionTest.php b/tests/PhpWord/Style/TablePositionTest.php
new file mode 100644
index 00000000..77b22e4e
--- /dev/null
+++ b/tests/PhpWord/Style/TablePositionTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * Test class for PhpOffice\PhpWord\Style\Table
+ *
+ * @runTestsInSeparateProcesses
+ */
+class TablePositionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test class construction
+     */
+    public function testConstruct()
+    {
+        $styleTable = array('vertAnchor' => TablePosition::VANCHOR_PAGE, 'bottomFromText' => 20);
+
+        $object = new TablePosition($styleTable);
+        $this->assertEquals(TablePosition::VANCHOR_PAGE, $object->getVertAnchor());
+        $this->assertEquals(20, $object->getBottomFromText());
+    }
+
+    /**
+     * Test setting style with normal value
+     */
+    public function testSetGetNormal()
+    {
+        $object = new TablePosition();
+
+        $attributes = array(
+            'leftFromText'   => 4,
+            'rightFromText'  => 4,
+            'topFromText'    => 4,
+            'bottomFromText' => 4,
+            'vertAnchor'     => TablePosition::VANCHOR_PAGE,
+            'horzAnchor'     => TablePosition::HANCHOR_TEXT,
+            'tblpXSpec'      => TablePosition::XALIGN_CENTER,
+            'tblpX'          => 5,
+            'tblpYSpec'      => TablePosition::YALIGN_OUTSIDE,
+            'tblpY'          => 6,
+        );
+        foreach ($attributes as $key => $value) {
+            $set = "set{$key}";
+            $get = "get{$key}";
+            $object->$set($value);
+            $this->assertEquals($value, $object->$get());
+        }
+    }
+}
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 9dec422e..1ee718df 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -195,4 +195,17 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $object = new Table(array('cellSpacing' => 20));
         $this->assertEquals(20, $object->getCellSpacing());
     }
+
+    /**
+     * Tests table floating position
+     */
+    public function testTablePosition()
+    {
+        $object = new Table();
+        $this->assertNull($object->getPosition());
+
+        $object->setPosition(array('vertAnchor' => TablePosition::VANCHOR_PAGE));
+        $this->assertNotNull($object->getPosition());
+        $this->assertEquals(TablePosition::VANCHOR_PAGE, $object->getPosition()->getVertAnchor());
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index c0a0b3ad..2b67507a 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
 use PhpOffice\PhpWord\Style\Table;
+use PhpOffice\PhpWord\Style\TablePosition;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
@@ -76,4 +77,45 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(10.3, $doc->getElementAttribute($path, 'w:w'));
         $this->assertEquals(\PhpOffice\PhpWord\SimpleType\TblWidth::TWIP, $doc->getElementAttribute($path, 'w:type'));
     }
+
+    /**
+     * Test write table position
+     */
+    public function testTablePosition()
+    {
+        $tablePosition = array(
+            'leftFromText'   => 10,
+            'rightFromText'  => 20,
+            'topFromText'    => 30,
+            'bottomFromText' => 40,
+            'vertAnchor'     => TablePosition::VANCHOR_PAGE,
+            'horzAnchor'     => TablePosition::HANCHOR_MARGIN,
+            'tblpXSpec'      => TablePosition::XALIGN_CENTER,
+            'tblpX'          => 50,
+            'tblpYSpec'      => TablePosition::YALIGN_TOP,
+            'tblpY'          => 60,
+        );
+        $tableStyle = new Table();
+        $tableStyle->setPosition($tablePosition);
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable($tableStyle);
+        $table->addRow();
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblpPr';
+        $this->assertTrue($doc->elementExists($path));
+        $this->assertEquals(10, $doc->getElementAttribute($path, 'w:leftFromText'));
+        $this->assertEquals(20, $doc->getElementAttribute($path, 'w:rightFromText'));
+        $this->assertEquals(30, $doc->getElementAttribute($path, 'w:topFromText'));
+        $this->assertEquals(40, $doc->getElementAttribute($path, 'w:bottomFromText'));
+        $this->assertEquals(TablePosition::VANCHOR_PAGE, $doc->getElementAttribute($path, 'w:vertAnchor'));
+        $this->assertEquals(TablePosition::HANCHOR_MARGIN, $doc->getElementAttribute($path, 'w:horzAnchor'));
+        $this->assertEquals(TablePosition::XALIGN_CENTER, $doc->getElementAttribute($path, 'w:tblpXSpec'));
+        $this->assertEquals(50, $doc->getElementAttribute($path, 'w:tblpX'));
+        $this->assertEquals(TablePosition::YALIGN_TOP, $doc->getElementAttribute($path, 'w:tblpYSpec'));
+        $this->assertEquals(60, $doc->getElementAttribute($path, 'w:tblpY'));
+    }
 }

From 77f2b16bc1b7ddfed894b8f6129be3456fa78326 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 8 Mar 2018 23:52:25 +0100
Subject: [PATCH 251/370] update copyright to 2018

---
 bootstrap.php                                                 | 2 +-
 src/PhpWord/Collection/AbstractCollection.php                 | 2 +-
 src/PhpWord/Collection/Bookmarks.php                          | 2 +-
 src/PhpWord/Collection/Charts.php                             | 2 +-
 src/PhpWord/Collection/Comments.php                           | 2 +-
 src/PhpWord/Collection/Endnotes.php                           | 2 +-
 src/PhpWord/Collection/Footnotes.php                          | 2 +-
 src/PhpWord/Collection/Titles.php                             | 2 +-
 src/PhpWord/ComplexType/FootnoteProperties.php                | 2 +-
 src/PhpWord/ComplexType/ProofState.php                        | 2 +-
 src/PhpWord/ComplexType/TrackChangesView.php                  | 2 +-
 src/PhpWord/Element/AbstractContainer.php                     | 2 +-
 src/PhpWord/Element/AbstractElement.php                       | 2 +-
 src/PhpWord/Element/Bookmark.php                              | 2 +-
 src/PhpWord/Element/Cell.php                                  | 2 +-
 src/PhpWord/Element/Chart.php                                 | 2 +-
 src/PhpWord/Element/CheckBox.php                              | 2 +-
 src/PhpWord/Element/Comment.php                               | 2 +-
 src/PhpWord/Element/Endnote.php                               | 2 +-
 src/PhpWord/Element/Field.php                                 | 2 +-
 src/PhpWord/Element/Footer.php                                | 2 +-
 src/PhpWord/Element/Footnote.php                              | 2 +-
 src/PhpWord/Element/FormField.php                             | 2 +-
 src/PhpWord/Element/Header.php                                | 2 +-
 src/PhpWord/Element/Image.php                                 | 2 +-
 src/PhpWord/Element/Line.php                                  | 2 +-
 src/PhpWord/Element/Link.php                                  | 2 +-
 src/PhpWord/Element/ListItem.php                              | 2 +-
 src/PhpWord/Element/ListItemRun.php                           | 2 +-
 src/PhpWord/Element/OLEObject.php                             | 2 +-
 src/PhpWord/Element/PageBreak.php                             | 2 +-
 src/PhpWord/Element/PreserveText.php                          | 2 +-
 src/PhpWord/Element/Row.php                                   | 2 +-
 src/PhpWord/Element/SDT.php                                   | 2 +-
 src/PhpWord/Element/Section.php                               | 2 +-
 src/PhpWord/Element/Shape.php                                 | 2 +-
 src/PhpWord/Element/TOC.php                                   | 2 +-
 src/PhpWord/Element/Table.php                                 | 2 +-
 src/PhpWord/Element/Text.php                                  | 2 +-
 src/PhpWord/Element/TextBox.php                               | 2 +-
 src/PhpWord/Element/TextBreak.php                             | 2 +-
 src/PhpWord/Element/TextRun.php                               | 2 +-
 src/PhpWord/Element/Title.php                                 | 2 +-
 src/PhpWord/Element/TrackChange.php                           | 2 +-
 src/PhpWord/Escaper/AbstractEscaper.php                       | 2 +-
 src/PhpWord/Escaper/EscaperInterface.php                      | 2 +-
 src/PhpWord/Escaper/RegExp.php                                | 2 +-
 src/PhpWord/Escaper/Rtf.php                                   | 2 +-
 src/PhpWord/Escaper/Xml.php                                   | 2 +-
 src/PhpWord/Exception/CopyFileException.php                   | 2 +-
 src/PhpWord/Exception/CreateTemporaryFileException.php        | 2 +-
 src/PhpWord/Exception/Exception.php                           | 2 +-
 src/PhpWord/Exception/InvalidImageException.php               | 2 +-
 src/PhpWord/Exception/InvalidObjectException.php              | 2 +-
 src/PhpWord/Exception/InvalidStyleException.php               | 2 +-
 src/PhpWord/Exception/UnsupportedImageTypeException.php       | 2 +-
 src/PhpWord/IOFactory.php                                     | 2 +-
 src/PhpWord/Media.php                                         | 2 +-
 src/PhpWord/Metadata/Compatibility.php                        | 2 +-
 src/PhpWord/Metadata/DocInfo.php                              | 2 +-
 src/PhpWord/Metadata/Protection.php                           | 2 +-
 src/PhpWord/Metadata/Settings.php                             | 2 +-
 src/PhpWord/PhpWord.php                                       | 2 +-
 src/PhpWord/Reader/AbstractReader.php                         | 2 +-
 src/PhpWord/Reader/HTML.php                                   | 2 +-
 src/PhpWord/Reader/MsDoc.php                                  | 2 +-
 src/PhpWord/Reader/ODText.php                                 | 2 +-
 src/PhpWord/Reader/ODText/AbstractPart.php                    | 2 +-
 src/PhpWord/Reader/ODText/Content.php                         | 2 +-
 src/PhpWord/Reader/ODText/Meta.php                            | 2 +-
 src/PhpWord/Reader/RTF.php                                    | 2 +-
 src/PhpWord/Reader/RTF/Document.php                           | 2 +-
 src/PhpWord/Reader/ReaderInterface.php                        | 2 +-
 src/PhpWord/Reader/Word2007.php                               | 2 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php                  | 2 +-
 src/PhpWord/Reader/Word2007/DocPropsApp.php                   | 2 +-
 src/PhpWord/Reader/Word2007/DocPropsCore.php                  | 2 +-
 src/PhpWord/Reader/Word2007/DocPropsCustom.php                | 2 +-
 src/PhpWord/Reader/Word2007/Document.php                      | 2 +-
 src/PhpWord/Reader/Word2007/Endnotes.php                      | 2 +-
 src/PhpWord/Reader/Word2007/Footnotes.php                     | 2 +-
 src/PhpWord/Reader/Word2007/Numbering.php                     | 2 +-
 src/PhpWord/Reader/Word2007/Settings.php                      | 2 +-
 src/PhpWord/Reader/Word2007/Styles.php                        | 2 +-
 src/PhpWord/Settings.php                                      | 2 +-
 src/PhpWord/Shared/AbstractEnum.php                           | 2 +-
 src/PhpWord/Shared/Converter.php                              | 2 +-
 src/PhpWord/Shared/Html.php                                   | 2 +-
 src/PhpWord/Shared/Microsoft/PasswordEncoder.php              | 2 +-
 src/PhpWord/Shared/OLERead.php                                | 2 +-
 src/PhpWord/Shared/ZipArchive.php                             | 2 +-
 src/PhpWord/SimpleType/DocProtect.php                         | 2 +-
 src/PhpWord/SimpleType/Jc.php                                 | 2 +-
 src/PhpWord/SimpleType/JcTable.php                            | 2 +-
 src/PhpWord/SimpleType/LineSpacingRule.php                    | 2 +-
 src/PhpWord/SimpleType/NumberFormat.php                       | 2 +-
 src/PhpWord/SimpleType/TblWidth.php                           | 2 +-
 src/PhpWord/SimpleType/TextAlignment.php                      | 2 +-
 src/PhpWord/SimpleType/Zoom.php                               | 2 +-
 src/PhpWord/Style.php                                         | 2 +-
 src/PhpWord/Style/AbstractStyle.php                           | 2 +-
 src/PhpWord/Style/Border.php                                  | 2 +-
 src/PhpWord/Style/Cell.php                                    | 2 +-
 src/PhpWord/Style/Chart.php                                   | 2 +-
 src/PhpWord/Style/Extrusion.php                               | 2 +-
 src/PhpWord/Style/Fill.php                                    | 2 +-
 src/PhpWord/Style/Font.php                                    | 2 +-
 src/PhpWord/Style/Frame.php                                   | 2 +-
 src/PhpWord/Style/Image.php                                   | 2 +-
 src/PhpWord/Style/Indentation.php                             | 2 +-
 src/PhpWord/Style/Language.php                                | 2 +-
 src/PhpWord/Style/Line.php                                    | 2 +-
 src/PhpWord/Style/LineNumbering.php                           | 2 +-
 src/PhpWord/Style/ListItem.php                                | 2 +-
 src/PhpWord/Style/Numbering.php                               | 2 +-
 src/PhpWord/Style/NumberingLevel.php                          | 2 +-
 src/PhpWord/Style/Outline.php                                 | 2 +-
 src/PhpWord/Style/Paper.php                                   | 2 +-
 src/PhpWord/Style/Paragraph.php                               | 2 +-
 src/PhpWord/Style/Row.php                                     | 2 +-
 src/PhpWord/Style/Section.php                                 | 2 +-
 src/PhpWord/Style/Shading.php                                 | 2 +-
 src/PhpWord/Style/Shadow.php                                  | 2 +-
 src/PhpWord/Style/Shape.php                                   | 2 +-
 src/PhpWord/Style/Spacing.php                                 | 2 +-
 src/PhpWord/Style/TOC.php                                     | 2 +-
 src/PhpWord/Style/Tab.php                                     | 2 +-
 src/PhpWord/Style/Table.php                                   | 2 +-
 src/PhpWord/Style/TablePosition.php                           | 2 +-
 src/PhpWord/Style/TextBox.php                                 | 2 +-
 src/PhpWord/Template.php                                      | 2 +-
 src/PhpWord/TemplateProcessor.php                             | 2 +-
 src/PhpWord/Writer/AbstractWriter.php                         | 2 +-
 src/PhpWord/Writer/HTML.php                                   | 2 +-
 src/PhpWord/Writer/HTML/Element/AbstractElement.php           | 2 +-
 src/PhpWord/Writer/HTML/Element/Bookmark.php                  | 2 +-
 src/PhpWord/Writer/HTML/Element/Container.php                 | 2 +-
 src/PhpWord/Writer/HTML/Element/Endnote.php                   | 2 +-
 src/PhpWord/Writer/HTML/Element/Footnote.php                  | 2 +-
 src/PhpWord/Writer/HTML/Element/Image.php                     | 2 +-
 src/PhpWord/Writer/HTML/Element/Link.php                      | 2 +-
 src/PhpWord/Writer/HTML/Element/ListItem.php                  | 2 +-
 src/PhpWord/Writer/HTML/Element/PageBreak.php                 | 2 +-
 src/PhpWord/Writer/HTML/Element/Table.php                     | 2 +-
 src/PhpWord/Writer/HTML/Element/Text.php                      | 2 +-
 src/PhpWord/Writer/HTML/Element/TextBreak.php                 | 2 +-
 src/PhpWord/Writer/HTML/Element/TextRun.php                   | 2 +-
 src/PhpWord/Writer/HTML/Element/Title.php                     | 2 +-
 src/PhpWord/Writer/HTML/Part/AbstractPart.php                 | 2 +-
 src/PhpWord/Writer/HTML/Part/Body.php                         | 2 +-
 src/PhpWord/Writer/HTML/Part/Head.php                         | 2 +-
 src/PhpWord/Writer/HTML/Style/AbstractStyle.php               | 2 +-
 src/PhpWord/Writer/HTML/Style/Font.php                        | 2 +-
 src/PhpWord/Writer/HTML/Style/Generic.php                     | 2 +-
 src/PhpWord/Writer/HTML/Style/Image.php                       | 2 +-
 src/PhpWord/Writer/HTML/Style/Paragraph.php                   | 2 +-
 src/PhpWord/Writer/ODText.php                                 | 2 +-
 src/PhpWord/Writer/ODText/Element/AbstractElement.php         | 2 +-
 src/PhpWord/Writer/ODText/Element/Container.php               | 2 +-
 src/PhpWord/Writer/ODText/Element/Image.php                   | 2 +-
 src/PhpWord/Writer/ODText/Element/Link.php                    | 2 +-
 src/PhpWord/Writer/ODText/Element/PageBreak.php               | 2 +-
 src/PhpWord/Writer/ODText/Element/Table.php                   | 2 +-
 src/PhpWord/Writer/ODText/Element/Text.php                    | 2 +-
 src/PhpWord/Writer/ODText/Element/TextBreak.php               | 2 +-
 src/PhpWord/Writer/ODText/Element/TextRun.php                 | 2 +-
 src/PhpWord/Writer/ODText/Element/Title.php                   | 2 +-
 src/PhpWord/Writer/ODText/Part/AbstractPart.php               | 2 +-
 src/PhpWord/Writer/ODText/Part/Content.php                    | 2 +-
 src/PhpWord/Writer/ODText/Part/Manifest.php                   | 2 +-
 src/PhpWord/Writer/ODText/Part/Meta.php                       | 2 +-
 src/PhpWord/Writer/ODText/Part/Mimetype.php                   | 2 +-
 src/PhpWord/Writer/ODText/Part/Styles.php                     | 2 +-
 src/PhpWord/Writer/ODText/Style/AbstractStyle.php             | 2 +-
 src/PhpWord/Writer/ODText/Style/Font.php                      | 2 +-
 src/PhpWord/Writer/ODText/Style/Image.php                     | 2 +-
 src/PhpWord/Writer/ODText/Style/Paragraph.php                 | 2 +-
 src/PhpWord/Writer/ODText/Style/Section.php                   | 2 +-
 src/PhpWord/Writer/ODText/Style/Table.php                     | 2 +-
 src/PhpWord/Writer/PDF.php                                    | 2 +-
 src/PhpWord/Writer/PDF/AbstractRenderer.php                   | 2 +-
 src/PhpWord/Writer/PDF/DomPDF.php                             | 2 +-
 src/PhpWord/Writer/PDF/MPDF.php                               | 2 +-
 src/PhpWord/Writer/PDF/TCPDF.php                              | 2 +-
 src/PhpWord/Writer/RTF.php                                    | 2 +-
 src/PhpWord/Writer/RTF/Element/AbstractElement.php            | 2 +-
 src/PhpWord/Writer/RTF/Element/Container.php                  | 2 +-
 src/PhpWord/Writer/RTF/Element/Image.php                      | 2 +-
 src/PhpWord/Writer/RTF/Element/Link.php                       | 2 +-
 src/PhpWord/Writer/RTF/Element/ListItem.php                   | 2 +-
 src/PhpWord/Writer/RTF/Element/PageBreak.php                  | 2 +-
 src/PhpWord/Writer/RTF/Element/Table.php                      | 2 +-
 src/PhpWord/Writer/RTF/Element/Text.php                       | 2 +-
 src/PhpWord/Writer/RTF/Element/TextBreak.php                  | 2 +-
 src/PhpWord/Writer/RTF/Element/TextRun.php                    | 2 +-
 src/PhpWord/Writer/RTF/Element/Title.php                      | 2 +-
 src/PhpWord/Writer/RTF/Part/AbstractPart.php                  | 2 +-
 src/PhpWord/Writer/RTF/Part/Document.php                      | 2 +-
 src/PhpWord/Writer/RTF/Part/Header.php                        | 2 +-
 src/PhpWord/Writer/RTF/Style/AbstractStyle.php                | 2 +-
 src/PhpWord/Writer/RTF/Style/Border.php                       | 2 +-
 src/PhpWord/Writer/RTF/Style/Font.php                         | 2 +-
 src/PhpWord/Writer/RTF/Style/Paragraph.php                    | 2 +-
 src/PhpWord/Writer/RTF/Style/Section.php                      | 2 +-
 src/PhpWord/Writer/Word2007.php                               | 2 +-
 src/PhpWord/Writer/Word2007/Element/AbstractElement.php       | 2 +-
 src/PhpWord/Writer/Word2007/Element/Bookmark.php              | 2 +-
 src/PhpWord/Writer/Word2007/Element/Chart.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Element/CheckBox.php              | 2 +-
 src/PhpWord/Writer/Word2007/Element/Container.php             | 2 +-
 src/PhpWord/Writer/Word2007/Element/Endnote.php               | 2 +-
 src/PhpWord/Writer/Word2007/Element/Field.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Element/Footnote.php              | 2 +-
 src/PhpWord/Writer/Word2007/Element/FormField.php             | 2 +-
 src/PhpWord/Writer/Word2007/Element/Image.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Element/Line.php                  | 2 +-
 src/PhpWord/Writer/Word2007/Element/Link.php                  | 2 +-
 src/PhpWord/Writer/Word2007/Element/ListItem.php              | 2 +-
 src/PhpWord/Writer/Word2007/Element/ListItemRun.php           | 2 +-
 src/PhpWord/Writer/Word2007/Element/OLEObject.php             | 2 +-
 src/PhpWord/Writer/Word2007/Element/PageBreak.php             | 2 +-
 src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php    | 2 +-
 src/PhpWord/Writer/Word2007/Element/PreserveText.php          | 2 +-
 src/PhpWord/Writer/Word2007/Element/SDT.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Element/Shape.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Element/TOC.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Element/Table.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Element/TableAlignment.php        | 2 +-
 src/PhpWord/Writer/Word2007/Element/Text.php                  | 2 +-
 src/PhpWord/Writer/Word2007/Element/TextBox.php               | 2 +-
 src/PhpWord/Writer/Word2007/Element/TextBreak.php             | 2 +-
 src/PhpWord/Writer/Word2007/Element/TextRun.php               | 2 +-
 src/PhpWord/Writer/Word2007/Element/Title.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/AbstractPart.php             | 2 +-
 src/PhpWord/Writer/Word2007/Part/Chart.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Part/Comments.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/ContentTypes.php             | 2 +-
 src/PhpWord/Writer/Word2007/Part/DocPropsApp.php              | 2 +-
 src/PhpWord/Writer/Word2007/Part/DocPropsCore.php             | 2 +-
 src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php           | 2 +-
 src/PhpWord/Writer/Word2007/Part/Document.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/Endnotes.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/FontTable.php                | 2 +-
 src/PhpWord/Writer/Word2007/Part/Footer.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Part/Footnotes.php                | 2 +-
 src/PhpWord/Writer/Word2007/Part/Header.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Part/Numbering.php                | 2 +-
 src/PhpWord/Writer/Word2007/Part/Rels.php                     | 2 +-
 src/PhpWord/Writer/Word2007/Part/RelsDocument.php             | 2 +-
 src/PhpWord/Writer/Word2007/Part/RelsPart.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/Settings.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Part/Styles.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Part/Theme.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Part/WebSettings.php              | 2 +-
 src/PhpWord/Writer/Word2007/Style/AbstractStyle.php           | 2 +-
 src/PhpWord/Writer/Word2007/Style/Cell.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Style/Extrusion.php               | 2 +-
 src/PhpWord/Writer/Word2007/Style/Fill.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Style/Font.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Style/Frame.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Style/Image.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Style/Indentation.php             | 2 +-
 src/PhpWord/Writer/Word2007/Style/Line.php                    | 2 +-
 src/PhpWord/Writer/Word2007/Style/LineNumbering.php           | 2 +-
 src/PhpWord/Writer/Word2007/Style/MarginBorder.php            | 2 +-
 src/PhpWord/Writer/Word2007/Style/Outline.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Style/Paragraph.php               | 2 +-
 src/PhpWord/Writer/Word2007/Style/Row.php                     | 2 +-
 src/PhpWord/Writer/Word2007/Style/Section.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Style/Shading.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Style/Shadow.php                  | 2 +-
 src/PhpWord/Writer/Word2007/Style/Shape.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Style/Spacing.php                 | 2 +-
 src/PhpWord/Writer/Word2007/Style/Tab.php                     | 2 +-
 src/PhpWord/Writer/Word2007/Style/Table.php                   | 2 +-
 src/PhpWord/Writer/Word2007/Style/TablePosition.php           | 2 +-
 src/PhpWord/Writer/Word2007/Style/TextBox.php                 | 2 +-
 src/PhpWord/Writer/WriterInterface.php                        | 2 +-
 tests/PhpWord/Collection/CollectionTest.php                   | 2 +-
 tests/PhpWord/ComplexType/FootnotePropertiesTest.php          | 2 +-
 tests/PhpWord/ComplexType/ProofStateTest.php                  | 2 +-
 tests/PhpWord/Element/AbstractElementTest.php                 | 2 +-
 tests/PhpWord/Element/BookmarkTest.php                        | 2 +-
 tests/PhpWord/Element/CellTest.php                            | 2 +-
 tests/PhpWord/Element/CheckBoxTest.php                        | 2 +-
 tests/PhpWord/Element/CommentTest.php                         | 2 +-
 tests/PhpWord/Element/FieldTest.php                           | 2 +-
 tests/PhpWord/Element/FooterTest.php                          | 2 +-
 tests/PhpWord/Element/FootnoteTest.php                        | 2 +-
 tests/PhpWord/Element/HeaderTest.php                          | 2 +-
 tests/PhpWord/Element/ImageTest.php                           | 2 +-
 tests/PhpWord/Element/LineTest.php                            | 2 +-
 tests/PhpWord/Element/LinkTest.php                            | 2 +-
 tests/PhpWord/Element/ListItemRunTest.php                     | 2 +-
 tests/PhpWord/Element/ListItemTest.php                        | 2 +-
 tests/PhpWord/Element/ObjectTest.php                          | 2 +-
 tests/PhpWord/Element/PageBreakTest.php                       | 2 +-
 tests/PhpWord/Element/PreserveTextTest.php                    | 2 +-
 tests/PhpWord/Element/RowTest.php                             | 2 +-
 tests/PhpWord/Element/SDTTest.php                             | 2 +-
 tests/PhpWord/Element/SectionTest.php                         | 2 +-
 tests/PhpWord/Element/TOCTest.php                             | 2 +-
 tests/PhpWord/Element/TableTest.php                           | 2 +-
 tests/PhpWord/Element/TextBoxTest.php                         | 2 +-
 tests/PhpWord/Element/TextBreakTest.php                       | 2 +-
 tests/PhpWord/Element/TextRunTest.php                         | 2 +-
 tests/PhpWord/Element/TextTest.php                            | 2 +-
 tests/PhpWord/Element/TitleTest.php                           | 2 +-
 tests/PhpWord/Element/TrackChangeTest.php                     | 2 +-
 tests/PhpWord/Exception/CopyFileExceptionTest.php             | 2 +-
 tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php  | 2 +-
 tests/PhpWord/Exception/ExceptionTest.php                     | 2 +-
 tests/PhpWord/Exception/InvalidImageExceptionTest.php         | 2 +-
 tests/PhpWord/Exception/InvalidStyleExceptionTest.php         | 2 +-
 tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php | 2 +-
 tests/PhpWord/IOFactoryTest.php                               | 2 +-
 tests/PhpWord/MediaTest.php                                   | 2 +-
 tests/PhpWord/Metadata/DocInfoTest.php                        | 2 +-
 tests/PhpWord/Metadata/SettingsTest.php                       | 2 +-
 tests/PhpWord/PhpWordTest.php                                 | 2 +-
 tests/PhpWord/Reader/HTMLTest.php                             | 2 +-
 tests/PhpWord/Reader/MsDocTest.php                            | 2 +-
 tests/PhpWord/Reader/ODTextTest.php                           | 2 +-
 tests/PhpWord/Reader/RTFTest.php                              | 2 +-
 tests/PhpWord/Reader/Word2007/ElementTest.php                 | 2 +-
 tests/PhpWord/Reader/Word2007/PartTest.php                    | 2 +-
 tests/PhpWord/Reader/Word2007/StyleTest.php                   | 2 +-
 tests/PhpWord/Reader/Word2007Test.php                         | 2 +-
 tests/PhpWord/SettingsTest.php                                | 2 +-
 tests/PhpWord/Shared/ConverterTest.php                        | 2 +-
 tests/PhpWord/Shared/HtmlTest.php                             | 2 +-
 tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php        | 2 +-
 tests/PhpWord/Shared/ZipArchiveTest.php                       | 2 +-
 tests/PhpWord/Style/AbstractStyleTest.php                     | 2 +-
 tests/PhpWord/Style/CellTest.php                              | 2 +-
 tests/PhpWord/Style/FontTest.php                              | 2 +-
 tests/PhpWord/Style/ImageTest.php                             | 2 +-
 tests/PhpWord/Style/IndentationTest.php                       | 2 +-
 tests/PhpWord/Style/LanguageTest.php                          | 2 +-
 tests/PhpWord/Style/LineNumberingTest.php                     | 2 +-
 tests/PhpWord/Style/LineTest.php                              | 2 +-
 tests/PhpWord/Style/ListItemTest.php                          | 2 +-
 tests/PhpWord/Style/NumberingLevelTest.php                    | 2 +-
 tests/PhpWord/Style/NumberingTest.php                         | 2 +-
 tests/PhpWord/Style/PaperTest.php                             | 2 +-
 tests/PhpWord/Style/ParagraphTest.php                         | 2 +-
 tests/PhpWord/Style/RowTest.php                               | 2 +-
 tests/PhpWord/Style/SectionTest.php                           | 2 +-
 tests/PhpWord/Style/ShadingTest.php                           | 2 +-
 tests/PhpWord/Style/SpacingTest.php                           | 2 +-
 tests/PhpWord/Style/TOCTest.php                               | 2 +-
 tests/PhpWord/Style/TabTest.php                               | 2 +-
 tests/PhpWord/Style/TableTest.php                             | 2 +-
 tests/PhpWord/Style/TextBoxTest.php                           | 2 +-
 tests/PhpWord/StyleTest.php                                   | 2 +-
 tests/PhpWord/TemplateProcessorTest.php                       | 2 +-
 tests/PhpWord/Writer/HTML/ElementTest.php                     | 2 +-
 tests/PhpWord/Writer/HTML/PartTest.php                        | 2 +-
 tests/PhpWord/Writer/HTML/StyleTest.php                       | 2 +-
 tests/PhpWord/Writer/HTMLTest.php                             | 2 +-
 tests/PhpWord/Writer/ODText/ElementTest.php                   | 2 +-
 tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php         | 2 +-
 tests/PhpWord/Writer/ODText/Part/ContentTest.php              | 2 +-
 tests/PhpWord/Writer/ODText/StyleTest.php                     | 2 +-
 tests/PhpWord/Writer/ODTextTest.php                           | 2 +-
 tests/PhpWord/Writer/PDF/DomPDFTest.php                       | 2 +-
 tests/PhpWord/Writer/PDF/MPDFTest.php                         | 2 +-
 tests/PhpWord/Writer/PDF/TCPDFTest.php                        | 2 +-
 tests/PhpWord/Writer/PDFTest.php                              | 2 +-
 tests/PhpWord/Writer/RTF/ElementTest.php                      | 2 +-
 tests/PhpWord/Writer/RTF/StyleTest.php                        | 2 +-
 tests/PhpWord/Writer/RTFTest.php                              | 2 +-
 tests/PhpWord/Writer/Word2007/ElementTest.php                 | 2 +-
 tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php       | 2 +-
 tests/PhpWord/Writer/Word2007/Part/CommentsTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/DocumentTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/FooterTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php          | 2 +-
 tests/PhpWord/Writer/Word2007/Part/HeaderTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/Part/NumberingTest.php          | 2 +-
 tests/PhpWord/Writer/Word2007/Part/SettingsTest.php           | 2 +-
 tests/PhpWord/Writer/Word2007/Part/StylesTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/PartTest.php                    | 2 +-
 tests/PhpWord/Writer/Word2007/Style/FontTest.php              | 2 +-
 tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php         | 2 +-
 tests/PhpWord/Writer/Word2007/Style/TableTest.php             | 2 +-
 tests/PhpWord/Writer/Word2007/StyleTest.php                   | 2 +-
 tests/PhpWord/Writer/Word2007Test.php                         | 2 +-
 tests/PhpWord/_includes/AbstractTestReader.php                | 2 +-
 tests/PhpWord/_includes/TestHelperDOCX.php                    | 2 +-
 tests/PhpWord/_includes/XmlDocument.php                       | 2 +-
 tests/bootstrap.php                                           | 2 +-
 392 files changed, 392 insertions(+), 392 deletions(-)

diff --git a/bootstrap.php b/bootstrap.php
index 362e8b74..740e3d04 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/AbstractCollection.php b/src/PhpWord/Collection/AbstractCollection.php
index d49967ca..899ec287 100644
--- a/src/PhpWord/Collection/AbstractCollection.php
+++ b/src/PhpWord/Collection/AbstractCollection.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Bookmarks.php b/src/PhpWord/Collection/Bookmarks.php
index 7210fb03..b5ffd5f4 100644
--- a/src/PhpWord/Collection/Bookmarks.php
+++ b/src/PhpWord/Collection/Bookmarks.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Charts.php b/src/PhpWord/Collection/Charts.php
index 56d92c94..aa807d1e 100644
--- a/src/PhpWord/Collection/Charts.php
+++ b/src/PhpWord/Collection/Charts.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Comments.php b/src/PhpWord/Collection/Comments.php
index f2fe82d9..b6c02d39 100644
--- a/src/PhpWord/Collection/Comments.php
+++ b/src/PhpWord/Collection/Comments.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Endnotes.php b/src/PhpWord/Collection/Endnotes.php
index 52a56d31..db01b408 100644
--- a/src/PhpWord/Collection/Endnotes.php
+++ b/src/PhpWord/Collection/Endnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Footnotes.php b/src/PhpWord/Collection/Footnotes.php
index 63989f53..a0a31ca4 100644
--- a/src/PhpWord/Collection/Footnotes.php
+++ b/src/PhpWord/Collection/Footnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Collection/Titles.php b/src/PhpWord/Collection/Titles.php
index 9e4f12cd..1ea58ec0 100644
--- a/src/PhpWord/Collection/Titles.php
+++ b/src/PhpWord/Collection/Titles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
index 8cb3a869..e42c9f9d 100644
--- a/src/PhpWord/ComplexType/FootnoteProperties.php
+++ b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
index 6a915da1..4f8dafe3 100644
--- a/src/PhpWord/ComplexType/ProofState.php
+++ b/src/PhpWord/ComplexType/ProofState.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/ComplexType/TrackChangesView.php b/src/PhpWord/ComplexType/TrackChangesView.php
index 3fc16298..92ea05ea 100644
--- a/src/PhpWord/ComplexType/TrackChangesView.php
+++ b/src/PhpWord/ComplexType/TrackChangesView.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index 1cedbef0..ec990720 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index e1b705e0..5ff85b8f 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Bookmark.php b/src/PhpWord/Element/Bookmark.php
index 8d4e0af5..16b020d7 100644
--- a/src/PhpWord/Element/Bookmark.php
+++ b/src/PhpWord/Element/Bookmark.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Cell.php b/src/PhpWord/Element/Cell.php
index b5250cd6..68f5df62 100644
--- a/src/PhpWord/Element/Cell.php
+++ b/src/PhpWord/Element/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Chart.php b/src/PhpWord/Element/Chart.php
index c340da40..755f45e1 100644
--- a/src/PhpWord/Element/Chart.php
+++ b/src/PhpWord/Element/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/CheckBox.php b/src/PhpWord/Element/CheckBox.php
index e0a94fdf..f3e87176 100644
--- a/src/PhpWord/Element/CheckBox.php
+++ b/src/PhpWord/Element/CheckBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
index 205ff598..96ad15ef 100644
--- a/src/PhpWord/Element/Comment.php
+++ b/src/PhpWord/Element/Comment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php
index b6e94fba..b9627195 100644
--- a/src/PhpWord/Element/Endnote.php
+++ b/src/PhpWord/Element/Endnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index de504965..5171e9a6 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php
index 08ff525a..0290d7c1 100644
--- a/src/PhpWord/Element/Footer.php
+++ b/src/PhpWord/Element/Footer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php
index e9a1bfc2..90aabccc 100644
--- a/src/PhpWord/Element/Footnote.php
+++ b/src/PhpWord/Element/Footnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/FormField.php b/src/PhpWord/Element/FormField.php
index 598d61dc..f937df59 100644
--- a/src/PhpWord/Element/FormField.php
+++ b/src/PhpWord/Element/FormField.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Header.php b/src/PhpWord/Element/Header.php
index ee820877..8a01946e 100644
--- a/src/PhpWord/Element/Header.php
+++ b/src/PhpWord/Element/Header.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 5e73d4e4..03637067 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Line.php b/src/PhpWord/Element/Line.php
index eba66473..7e40b940 100644
--- a/src/PhpWord/Element/Line.php
+++ b/src/PhpWord/Element/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Link.php b/src/PhpWord/Element/Link.php
index 4637120a..2bec32dd 100644
--- a/src/PhpWord/Element/Link.php
+++ b/src/PhpWord/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php
index cb55c5ae..8b064c47 100644
--- a/src/PhpWord/Element/ListItem.php
+++ b/src/PhpWord/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/ListItemRun.php b/src/PhpWord/Element/ListItemRun.php
index e311dc24..6e48a690 100644
--- a/src/PhpWord/Element/ListItemRun.php
+++ b/src/PhpWord/Element/ListItemRun.php
@@ -11,7 +11,7 @@
 * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
 *
 * @see         https://github.com/PHPOffice/PHPWord
-* @copyright   2010-2017 PHPWord contributors
+* @copyright   2010-2018 PHPWord contributors
 * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
 
diff --git a/src/PhpWord/Element/OLEObject.php b/src/PhpWord/Element/OLEObject.php
index 5da94c3a..c0c7f217 100644
--- a/src/PhpWord/Element/OLEObject.php
+++ b/src/PhpWord/Element/OLEObject.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/PageBreak.php b/src/PhpWord/Element/PageBreak.php
index e41e807b..1e2ada80 100644
--- a/src/PhpWord/Element/PageBreak.php
+++ b/src/PhpWord/Element/PageBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index ad20d7a3..1ce2dcdd 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Row.php b/src/PhpWord/Element/Row.php
index 2e89b354..da4dfe5d 100644
--- a/src/PhpWord/Element/Row.php
+++ b/src/PhpWord/Element/Row.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/SDT.php b/src/PhpWord/Element/SDT.php
index 86f445cc..a866d1bd 100644
--- a/src/PhpWord/Element/SDT.php
+++ b/src/PhpWord/Element/SDT.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 06acf1f9..d612fc01 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Shape.php b/src/PhpWord/Element/Shape.php
index b553a4ac..d143c9b6 100644
--- a/src/PhpWord/Element/Shape.php
+++ b/src/PhpWord/Element/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TOC.php b/src/PhpWord/Element/TOC.php
index e3ca0a08..c51d0e6b 100644
--- a/src/PhpWord/Element/TOC.php
+++ b/src/PhpWord/Element/TOC.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 3a045031..10c4db69 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Text.php b/src/PhpWord/Element/Text.php
index 4de12176..f4d7f081 100644
--- a/src/PhpWord/Element/Text.php
+++ b/src/PhpWord/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TextBox.php b/src/PhpWord/Element/TextBox.php
index 8058d0c9..b9f274d6 100644
--- a/src/PhpWord/Element/TextBox.php
+++ b/src/PhpWord/Element/TextBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TextBreak.php b/src/PhpWord/Element/TextBreak.php
index 4cf65f35..385fec5a 100644
--- a/src/PhpWord/Element/TextBreak.php
+++ b/src/PhpWord/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TextRun.php b/src/PhpWord/Element/TextRun.php
index 6d9ae9f4..9af55d46 100644
--- a/src/PhpWord/Element/TextRun.php
+++ b/src/PhpWord/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index ed06fa13..569cea92 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index dde616cc..410ffb7c 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
index 8207e2c6..1575c069 100644
--- a/src/PhpWord/Escaper/AbstractEscaper.php
+++ b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
index 1ef35c1b..deb2cfbc 100644
--- a/src/PhpWord/Escaper/EscaperInterface.php
+++ b/src/PhpWord/Escaper/EscaperInterface.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
index 2f4e12ec..f69aad82 100644
--- a/src/PhpWord/Escaper/RegExp.php
+++ b/src/PhpWord/Escaper/RegExp.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
index 35f91ada..b8e0b216 100644
--- a/src/PhpWord/Escaper/Rtf.php
+++ b/src/PhpWord/Escaper/Rtf.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
index 81cedaa9..a769c5e1 100644
--- a/src/PhpWord/Escaper/Xml.php
+++ b/src/PhpWord/Escaper/Xml.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/CopyFileException.php b/src/PhpWord/Exception/CopyFileException.php
index a5c1da6a..d1c3bd01 100644
--- a/src/PhpWord/Exception/CopyFileException.php
+++ b/src/PhpWord/Exception/CopyFileException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/CreateTemporaryFileException.php b/src/PhpWord/Exception/CreateTemporaryFileException.php
index fafc8dac..c8a06429 100644
--- a/src/PhpWord/Exception/CreateTemporaryFileException.php
+++ b/src/PhpWord/Exception/CreateTemporaryFileException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/Exception.php b/src/PhpWord/Exception/Exception.php
index b94ed1be..d874625c 100644
--- a/src/PhpWord/Exception/Exception.php
+++ b/src/PhpWord/Exception/Exception.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidImageException.php b/src/PhpWord/Exception/InvalidImageException.php
index 0a7b8fed..07c96681 100644
--- a/src/PhpWord/Exception/InvalidImageException.php
+++ b/src/PhpWord/Exception/InvalidImageException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidObjectException.php b/src/PhpWord/Exception/InvalidObjectException.php
index 54015506..d8fef961 100644
--- a/src/PhpWord/Exception/InvalidObjectException.php
+++ b/src/PhpWord/Exception/InvalidObjectException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/InvalidStyleException.php b/src/PhpWord/Exception/InvalidStyleException.php
index e697f6cf..58c1961d 100644
--- a/src/PhpWord/Exception/InvalidStyleException.php
+++ b/src/PhpWord/Exception/InvalidStyleException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Exception/UnsupportedImageTypeException.php b/src/PhpWord/Exception/UnsupportedImageTypeException.php
index 73b41d04..ee270653 100644
--- a/src/PhpWord/Exception/UnsupportedImageTypeException.php
+++ b/src/PhpWord/Exception/UnsupportedImageTypeException.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/IOFactory.php b/src/PhpWord/IOFactory.php
index eed1f163..3929f485 100644
--- a/src/PhpWord/IOFactory.php
+++ b/src/PhpWord/IOFactory.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php
index d9879010..cc1b2903 100644
--- a/src/PhpWord/Media.php
+++ b/src/PhpWord/Media.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Metadata/Compatibility.php b/src/PhpWord/Metadata/Compatibility.php
index 69f6f98a..bf0363aa 100644
--- a/src/PhpWord/Metadata/Compatibility.php
+++ b/src/PhpWord/Metadata/Compatibility.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
index 09714f9e..27ef89ae 100644
--- a/src/PhpWord/Metadata/DocInfo.php
+++ b/src/PhpWord/Metadata/DocInfo.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 39ebc3de..584ed83e 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
index 8ab58609..b1552e02 100644
--- a/src/PhpWord/Metadata/Settings.php
+++ b/src/PhpWord/Metadata/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index ff23f6ef..6b6fd9ff 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
 */
 
diff --git a/src/PhpWord/Reader/AbstractReader.php b/src/PhpWord/Reader/AbstractReader.php
index f59a9556..7db285f7 100644
--- a/src/PhpWord/Reader/AbstractReader.php
+++ b/src/PhpWord/Reader/AbstractReader.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/HTML.php b/src/PhpWord/Reader/HTML.php
index 4e8b5e82..db9f2089 100644
--- a/src/PhpWord/Reader/HTML.php
+++ b/src/PhpWord/Reader/HTML.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index c134377a..d4945229 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ODText.php b/src/PhpWord/Reader/ODText.php
index 5a22b4ba..0b58dc50 100644
--- a/src/PhpWord/Reader/ODText.php
+++ b/src/PhpWord/Reader/ODText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php
index bdac3b6f..ff664e01 100644
--- a/src/PhpWord/Reader/ODText/AbstractPart.php
+++ b/src/PhpWord/Reader/ODText/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ODText/Content.php b/src/PhpWord/Reader/ODText/Content.php
index 7a7a0468..9dfd6453 100644
--- a/src/PhpWord/Reader/ODText/Content.php
+++ b/src/PhpWord/Reader/ODText/Content.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ODText/Meta.php b/src/PhpWord/Reader/ODText/Meta.php
index 98832d17..8801a543 100644
--- a/src/PhpWord/Reader/ODText/Meta.php
+++ b/src/PhpWord/Reader/ODText/Meta.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/RTF.php b/src/PhpWord/Reader/RTF.php
index 2d09a04d..620252ff 100644
--- a/src/PhpWord/Reader/RTF.php
+++ b/src/PhpWord/Reader/RTF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/RTF/Document.php b/src/PhpWord/Reader/RTF/Document.php
index be16d707..b9509d71 100644
--- a/src/PhpWord/Reader/RTF/Document.php
+++ b/src/PhpWord/Reader/RTF/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/ReaderInterface.php b/src/PhpWord/Reader/ReaderInterface.php
index 3b2e357b..4024cdb3 100644
--- a/src/PhpWord/Reader/ReaderInterface.php
+++ b/src/PhpWord/Reader/ReaderInterface.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index 6c2178ad..deed3ce3 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 7ba53ad1..342d9d11 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/DocPropsApp.php b/src/PhpWord/Reader/Word2007/DocPropsApp.php
index df34c9c3..decc5103 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsApp.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsApp.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php
index f82c6b4b..36eecebe 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCore.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCore.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
index a3d6b90b..a6835aac 100644
--- a/src/PhpWord/Reader/Word2007/DocPropsCustom.php
+++ b/src/PhpWord/Reader/Word2007/DocPropsCustom.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php
index ff094bcc..4e37541b 100644
--- a/src/PhpWord/Reader/Word2007/Document.php
+++ b/src/PhpWord/Reader/Word2007/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Endnotes.php b/src/PhpWord/Reader/Word2007/Endnotes.php
index 0f46cb2f..aa8b65d7 100644
--- a/src/PhpWord/Reader/Word2007/Endnotes.php
+++ b/src/PhpWord/Reader/Word2007/Endnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index b69b2606..634f4739 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Numbering.php b/src/PhpWord/Reader/Word2007/Numbering.php
index c2a81dd5..3f57cbf8 100644
--- a/src/PhpWord/Reader/Word2007/Numbering.php
+++ b/src/PhpWord/Reader/Word2007/Numbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index ee057fe6..5cfe5453 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
index 8719641e..f343ad92 100644
--- a/src/PhpWord/Reader/Word2007/Styles.php
+++ b/src/PhpWord/Reader/Word2007/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index 22b8ba1f..8de1a8df 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Shared/AbstractEnum.php b/src/PhpWord/Shared/AbstractEnum.php
index 442d8251..f2375d87 100644
--- a/src/PhpWord/Shared/AbstractEnum.php
+++ b/src/PhpWord/Shared/AbstractEnum.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Shared/Converter.php b/src/PhpWord/Shared/Converter.php
index 56687c98..c53f0030 100644
--- a/src/PhpWord/Shared/Converter.php
+++ b/src/PhpWord/Shared/Converter.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 2c7cf1b5..15f3b605 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
index 1c7b4c6c..fc0c7ecd 100644
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Shared/OLERead.php b/src/PhpWord/Shared/OLERead.php
index bcdda0c3..2e6a899e 100644
--- a/src/PhpWord/Shared/OLERead.php
+++ b/src/PhpWord/Shared/OLERead.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 namespace PhpOffice\PhpWord\Shared;
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index 3d8d0a41..2783e17e 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/DocProtect.php b/src/PhpWord/SimpleType/DocProtect.php
index cffa0003..e386913d 100644
--- a/src/PhpWord/SimpleType/DocProtect.php
+++ b/src/PhpWord/SimpleType/DocProtect.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/Jc.php b/src/PhpWord/SimpleType/Jc.php
index 5d0ee33b..e55f824d 100644
--- a/src/PhpWord/SimpleType/Jc.php
+++ b/src/PhpWord/SimpleType/Jc.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/JcTable.php b/src/PhpWord/SimpleType/JcTable.php
index 71e07397..924a4f20 100644
--- a/src/PhpWord/SimpleType/JcTable.php
+++ b/src/PhpWord/SimpleType/JcTable.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/LineSpacingRule.php b/src/PhpWord/SimpleType/LineSpacingRule.php
index f2cc5e63..8fd8340c 100644
--- a/src/PhpWord/SimpleType/LineSpacingRule.php
+++ b/src/PhpWord/SimpleType/LineSpacingRule.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/NumberFormat.php b/src/PhpWord/SimpleType/NumberFormat.php
index 480d8539..83da66fa 100644
--- a/src/PhpWord/SimpleType/NumberFormat.php
+++ b/src/PhpWord/SimpleType/NumberFormat.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/TblWidth.php b/src/PhpWord/SimpleType/TblWidth.php
index 3d947bce..7fd753de 100644
--- a/src/PhpWord/SimpleType/TblWidth.php
+++ b/src/PhpWord/SimpleType/TblWidth.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/TextAlignment.php b/src/PhpWord/SimpleType/TextAlignment.php
index de36b108..838b0c5e 100644
--- a/src/PhpWord/SimpleType/TextAlignment.php
+++ b/src/PhpWord/SimpleType/TextAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/SimpleType/Zoom.php b/src/PhpWord/SimpleType/Zoom.php
index 111e4ea1..02c38fdb 100644
--- a/src/PhpWord/SimpleType/Zoom.php
+++ b/src/PhpWord/SimpleType/Zoom.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 017b3290..47242621 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php
index 76ebd591..8edbe80b 100644
--- a/src/PhpWord/Style/AbstractStyle.php
+++ b/src/PhpWord/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
index ab6aef18..d032d07f 100644
--- a/src/PhpWord/Style/Border.php
+++ b/src/PhpWord/Style/Border.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Cell.php b/src/PhpWord/Style/Cell.php
index 8675ed7b..e609e190 100644
--- a/src/PhpWord/Style/Cell.php
+++ b/src/PhpWord/Style/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 694fcddc..58271fef 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Extrusion.php b/src/PhpWord/Style/Extrusion.php
index 11c03eda..4c860bcd 100644
--- a/src/PhpWord/Style/Extrusion.php
+++ b/src/PhpWord/Style/Extrusion.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Fill.php b/src/PhpWord/Style/Fill.php
index 9b473009..360bcf3f 100644
--- a/src/PhpWord/Style/Fill.php
+++ b/src/PhpWord/Style/Fill.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index 3095b799..c58cee49 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index bb684409..b9263049 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Image.php b/src/PhpWord/Style/Image.php
index e0b97215..70aafe12 100644
--- a/src/PhpWord/Style/Image.php
+++ b/src/PhpWord/Style/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Indentation.php b/src/PhpWord/Style/Indentation.php
index 9621714c..e422395c 100644
--- a/src/PhpWord/Style/Indentation.php
+++ b/src/PhpWord/Style/Indentation.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index e09421e0..91f948f5 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Line.php b/src/PhpWord/Style/Line.php
index 16d15950..a9952eec 100644
--- a/src/PhpWord/Style/Line.php
+++ b/src/PhpWord/Style/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/LineNumbering.php b/src/PhpWord/Style/LineNumbering.php
index b5f3c263..451252d8 100644
--- a/src/PhpWord/Style/LineNumbering.php
+++ b/src/PhpWord/Style/LineNumbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php
index 444341dc..306ecff3 100644
--- a/src/PhpWord/Style/ListItem.php
+++ b/src/PhpWord/Style/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Numbering.php b/src/PhpWord/Style/Numbering.php
index 80ed5dca..f7855cfa 100644
--- a/src/PhpWord/Style/Numbering.php
+++ b/src/PhpWord/Style/Numbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php
index 33c151e4..e9b32f01 100644
--- a/src/PhpWord/Style/NumberingLevel.php
+++ b/src/PhpWord/Style/NumberingLevel.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Outline.php b/src/PhpWord/Style/Outline.php
index fb7e028a..a04ad974 100644
--- a/src/PhpWord/Style/Outline.php
+++ b/src/PhpWord/Style/Outline.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Paper.php b/src/PhpWord/Style/Paper.php
index 09e4769e..3c93ed8f 100644
--- a/src/PhpWord/Style/Paper.php
+++ b/src/PhpWord/Style/Paper.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Paragraph.php b/src/PhpWord/Style/Paragraph.php
index 53a9b958..ac587686 100644
--- a/src/PhpWord/Style/Paragraph.php
+++ b/src/PhpWord/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Row.php b/src/PhpWord/Style/Row.php
index b56c6f5f..ad801af6 100644
--- a/src/PhpWord/Style/Row.php
+++ b/src/PhpWord/Style/Row.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
index 476846f5..162e08e0 100644
--- a/src/PhpWord/Style/Section.php
+++ b/src/PhpWord/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Shading.php b/src/PhpWord/Style/Shading.php
index eeb055b2..154df26c 100644
--- a/src/PhpWord/Style/Shading.php
+++ b/src/PhpWord/Style/Shading.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Shadow.php b/src/PhpWord/Style/Shadow.php
index 71d1e3e0..1379a320 100644
--- a/src/PhpWord/Style/Shadow.php
+++ b/src/PhpWord/Style/Shadow.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Shape.php b/src/PhpWord/Style/Shape.php
index fc84241d..0c3f8179 100644
--- a/src/PhpWord/Style/Shape.php
+++ b/src/PhpWord/Style/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Spacing.php b/src/PhpWord/Style/Spacing.php
index 489eb5d7..9bfb2282 100644
--- a/src/PhpWord/Style/Spacing.php
+++ b/src/PhpWord/Style/Spacing.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/TOC.php b/src/PhpWord/Style/TOC.php
index 938e6de1..2efd54a4 100644
--- a/src/PhpWord/Style/TOC.php
+++ b/src/PhpWord/Style/TOC.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Tab.php b/src/PhpWord/Style/Tab.php
index 09e49e02..d3cf5bd7 100644
--- a/src/PhpWord/Style/Tab.php
+++ b/src/PhpWord/Style/Tab.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index 92a24dde..feb028da 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/TablePosition.php b/src/PhpWord/Style/TablePosition.php
index 7cb0a0be..d4b70831 100644
--- a/src/PhpWord/Style/TablePosition.php
+++ b/src/PhpWord/Style/TablePosition.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Style/TextBox.php b/src/PhpWord/Style/TextBox.php
index 91adc0af..e9c0f0c0 100644
--- a/src/PhpWord/Style/TextBox.php
+++ b/src/PhpWord/Style/TextBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Template.php b/src/PhpWord/Template.php
index a4769927..c42696f0 100644
--- a/src/PhpWord/Template.php
+++ b/src/PhpWord/Template.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 269b25e9..72446ae7 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php
index bb943d7e..7e0d511a 100644
--- a/src/PhpWord/Writer/AbstractWriter.php
+++ b/src/PhpWord/Writer/AbstractWriter.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML.php b/src/PhpWord/Writer/HTML.php
index 9b098dd8..7f55b9d3 100644
--- a/src/PhpWord/Writer/HTML.php
+++ b/src/PhpWord/Writer/HTML.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/AbstractElement.php b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
index 47f0f93c..dc5ccfaa 100644
--- a/src/PhpWord/Writer/HTML/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/HTML/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Bookmark.php b/src/PhpWord/Writer/HTML/Element/Bookmark.php
index 649cc7b8..082bd760 100644
--- a/src/PhpWord/Writer/HTML/Element/Bookmark.php
+++ b/src/PhpWord/Writer/HTML/Element/Bookmark.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Container.php b/src/PhpWord/Writer/HTML/Element/Container.php
index 677b6173..006b5889 100644
--- a/src/PhpWord/Writer/HTML/Element/Container.php
+++ b/src/PhpWord/Writer/HTML/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Endnote.php b/src/PhpWord/Writer/HTML/Element/Endnote.php
index c4a3e436..2252dc3a 100644
--- a/src/PhpWord/Writer/HTML/Element/Endnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Endnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Footnote.php b/src/PhpWord/Writer/HTML/Element/Footnote.php
index 60b246f8..ed14db1e 100644
--- a/src/PhpWord/Writer/HTML/Element/Footnote.php
+++ b/src/PhpWord/Writer/HTML/Element/Footnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Image.php b/src/PhpWord/Writer/HTML/Element/Image.php
index 3e516b53..7c22a166 100644
--- a/src/PhpWord/Writer/HTML/Element/Image.php
+++ b/src/PhpWord/Writer/HTML/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Link.php b/src/PhpWord/Writer/HTML/Element/Link.php
index f29880d4..f6dae5cd 100644
--- a/src/PhpWord/Writer/HTML/Element/Link.php
+++ b/src/PhpWord/Writer/HTML/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/ListItem.php b/src/PhpWord/Writer/HTML/Element/ListItem.php
index 02b25eb9..384b3ef1 100644
--- a/src/PhpWord/Writer/HTML/Element/ListItem.php
+++ b/src/PhpWord/Writer/HTML/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/PageBreak.php b/src/PhpWord/Writer/HTML/Element/PageBreak.php
index 5cab2724..f9998e37 100644
--- a/src/PhpWord/Writer/HTML/Element/PageBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/PageBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index c7d8670b..95f7c1fa 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Text.php b/src/PhpWord/Writer/HTML/Element/Text.php
index 9f8f7773..04d76a83 100644
--- a/src/PhpWord/Writer/HTML/Element/Text.php
+++ b/src/PhpWord/Writer/HTML/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/TextBreak.php b/src/PhpWord/Writer/HTML/Element/TextBreak.php
index 93ab924a..6ff092db 100644
--- a/src/PhpWord/Writer/HTML/Element/TextBreak.php
+++ b/src/PhpWord/Writer/HTML/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/TextRun.php b/src/PhpWord/Writer/HTML/Element/TextRun.php
index d7461539..b2deaf25 100644
--- a/src/PhpWord/Writer/HTML/Element/TextRun.php
+++ b/src/PhpWord/Writer/HTML/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index ee8f271b..3a802018 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Part/AbstractPart.php b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
index 7b6e0c3e..2d86f399 100644
--- a/src/PhpWord/Writer/HTML/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/HTML/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Part/Body.php b/src/PhpWord/Writer/HTML/Part/Body.php
index eea17350..a029f965 100644
--- a/src/PhpWord/Writer/HTML/Part/Body.php
+++ b/src/PhpWord/Writer/HTML/Part/Body.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Part/Head.php b/src/PhpWord/Writer/HTML/Part/Head.php
index f4d63014..1107becf 100644
--- a/src/PhpWord/Writer/HTML/Part/Head.php
+++ b/src/PhpWord/Writer/HTML/Part/Head.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
index fa27c085..cfb54cb8 100644
--- a/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/HTML/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
index 8daa8823..1aeaa347 100644
--- a/src/PhpWord/Writer/HTML/Style/Font.php
+++ b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Generic.php b/src/PhpWord/Writer/HTML/Style/Generic.php
index 73830707..ee5d0896 100644
--- a/src/PhpWord/Writer/HTML/Style/Generic.php
+++ b/src/PhpWord/Writer/HTML/Style/Generic.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Image.php b/src/PhpWord/Writer/HTML/Style/Image.php
index 178b1434..93747b46 100644
--- a/src/PhpWord/Writer/HTML/Style/Image.php
+++ b/src/PhpWord/Writer/HTML/Style/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
index 57e44e85..863ef93b 100644
--- a/src/PhpWord/Writer/HTML/Style/Paragraph.php
+++ b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText.php b/src/PhpWord/Writer/ODText.php
index 7158874c..efd0d6a9 100644
--- a/src/PhpWord/Writer/ODText.php
+++ b/src/PhpWord/Writer/ODText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/AbstractElement.php b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
index 481995ff..9c9fc1c4 100644
--- a/src/PhpWord/Writer/ODText/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/ODText/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Container.php b/src/PhpWord/Writer/ODText/Element/Container.php
index 112e71e8..6ba8124f 100644
--- a/src/PhpWord/Writer/ODText/Element/Container.php
+++ b/src/PhpWord/Writer/ODText/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Image.php b/src/PhpWord/Writer/ODText/Element/Image.php
index 2c0b4727..add45e10 100644
--- a/src/PhpWord/Writer/ODText/Element/Image.php
+++ b/src/PhpWord/Writer/ODText/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Link.php b/src/PhpWord/Writer/ODText/Element/Link.php
index 34d72c1a..d6fec507 100644
--- a/src/PhpWord/Writer/ODText/Element/Link.php
+++ b/src/PhpWord/Writer/ODText/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/PageBreak.php b/src/PhpWord/Writer/ODText/Element/PageBreak.php
index 6eee6cfc..ecf47607 100644
--- a/src/PhpWord/Writer/ODText/Element/PageBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/PageBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index cdc2a0e3..8a21ee1b 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Text.php b/src/PhpWord/Writer/ODText/Element/Text.php
index f9259fc5..7dcd28a0 100644
--- a/src/PhpWord/Writer/ODText/Element/Text.php
+++ b/src/PhpWord/Writer/ODText/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/TextBreak.php b/src/PhpWord/Writer/ODText/Element/TextBreak.php
index f7642e3b..80cd1387 100644
--- a/src/PhpWord/Writer/ODText/Element/TextBreak.php
+++ b/src/PhpWord/Writer/ODText/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/TextRun.php b/src/PhpWord/Writer/ODText/Element/TextRun.php
index f5c855fe..78e5a8ad 100644
--- a/src/PhpWord/Writer/ODText/Element/TextRun.php
+++ b/src/PhpWord/Writer/ODText/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index 769d293f..343949a2 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/AbstractPart.php b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
index 74412fd4..f2844de6 100644
--- a/src/PhpWord/Writer/ODText/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/ODText/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index f91ad544..a50eea7b 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Manifest.php b/src/PhpWord/Writer/ODText/Part/Manifest.php
index d916ccdf..f952b4c0 100644
--- a/src/PhpWord/Writer/ODText/Part/Manifest.php
+++ b/src/PhpWord/Writer/ODText/Part/Manifest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Meta.php b/src/PhpWord/Writer/ODText/Part/Meta.php
index f592c5f0..f38ad01d 100644
--- a/src/PhpWord/Writer/ODText/Part/Meta.php
+++ b/src/PhpWord/Writer/ODText/Part/Meta.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Mimetype.php b/src/PhpWord/Writer/ODText/Part/Mimetype.php
index 6e45b848..552f5440 100644
--- a/src/PhpWord/Writer/ODText/Part/Mimetype.php
+++ b/src/PhpWord/Writer/ODText/Part/Mimetype.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Part/Styles.php b/src/PhpWord/Writer/ODText/Part/Styles.php
index e49fa25e..e7635e98 100644
--- a/src/PhpWord/Writer/ODText/Part/Styles.php
+++ b/src/PhpWord/Writer/ODText/Part/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
index 26b9905b..f7679ab2 100644
--- a/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/ODText/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Font.php b/src/PhpWord/Writer/ODText/Style/Font.php
index 50de32ad..7c7d20dd 100644
--- a/src/PhpWord/Writer/ODText/Style/Font.php
+++ b/src/PhpWord/Writer/ODText/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Image.php b/src/PhpWord/Writer/ODText/Style/Image.php
index b85d4d70..13005a7f 100644
--- a/src/PhpWord/Writer/ODText/Style/Image.php
+++ b/src/PhpWord/Writer/ODText/Style/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
index 14a811a5..223d02f0 100644
--- a/src/PhpWord/Writer/ODText/Style/Paragraph.php
+++ b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Section.php b/src/PhpWord/Writer/ODText/Style/Section.php
index bef023e9..92d88911 100644
--- a/src/PhpWord/Writer/ODText/Style/Section.php
+++ b/src/PhpWord/Writer/ODText/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index 7d66899a..249321cf 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/PDF.php b/src/PhpWord/Writer/PDF.php
index 45fe8f35..64dcc789 100644
--- a/src/PhpWord/Writer/PDF.php
+++ b/src/PhpWord/Writer/PDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/PDF/AbstractRenderer.php b/src/PhpWord/Writer/PDF/AbstractRenderer.php
index 7b668e0b..5f9e3b3a 100644
--- a/src/PhpWord/Writer/PDF/AbstractRenderer.php
+++ b/src/PhpWord/Writer/PDF/AbstractRenderer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/PDF/DomPDF.php b/src/PhpWord/Writer/PDF/DomPDF.php
index be282d20..5fa8f75d 100644
--- a/src/PhpWord/Writer/PDF/DomPDF.php
+++ b/src/PhpWord/Writer/PDF/DomPDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/PDF/MPDF.php b/src/PhpWord/Writer/PDF/MPDF.php
index b6980a9d..e63f5dfd 100644
--- a/src/PhpWord/Writer/PDF/MPDF.php
+++ b/src/PhpWord/Writer/PDF/MPDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index 85e3614c..badab046 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PhpWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF.php b/src/PhpWord/Writer/RTF.php
index 7756253a..0604e8b5 100644
--- a/src/PhpWord/Writer/RTF.php
+++ b/src/PhpWord/Writer/RTF.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/AbstractElement.php b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
index 1013ee36..cf1aa391 100644
--- a/src/PhpWord/Writer/RTF/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/RTF/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Container.php b/src/PhpWord/Writer/RTF/Element/Container.php
index 4850c8bf..58c19256 100644
--- a/src/PhpWord/Writer/RTF/Element/Container.php
+++ b/src/PhpWord/Writer/RTF/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Image.php b/src/PhpWord/Writer/RTF/Element/Image.php
index fb96baff..f1e72700 100644
--- a/src/PhpWord/Writer/RTF/Element/Image.php
+++ b/src/PhpWord/Writer/RTF/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Link.php b/src/PhpWord/Writer/RTF/Element/Link.php
index 91a75720..25954ed8 100644
--- a/src/PhpWord/Writer/RTF/Element/Link.php
+++ b/src/PhpWord/Writer/RTF/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/ListItem.php b/src/PhpWord/Writer/RTF/Element/ListItem.php
index e628bffd..29e7f660 100644
--- a/src/PhpWord/Writer/RTF/Element/ListItem.php
+++ b/src/PhpWord/Writer/RTF/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/PageBreak.php b/src/PhpWord/Writer/RTF/Element/PageBreak.php
index 0adbe06e..6b08c9cc 100644
--- a/src/PhpWord/Writer/RTF/Element/PageBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/PageBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Table.php b/src/PhpWord/Writer/RTF/Element/Table.php
index d0bc0845..8154aa7c 100644
--- a/src/PhpWord/Writer/RTF/Element/Table.php
+++ b/src/PhpWord/Writer/RTF/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Text.php b/src/PhpWord/Writer/RTF/Element/Text.php
index 2fac0520..f80e7935 100644
--- a/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/src/PhpWord/Writer/RTF/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/TextBreak.php b/src/PhpWord/Writer/RTF/Element/TextBreak.php
index 2009fcff..4aab2767 100644
--- a/src/PhpWord/Writer/RTF/Element/TextBreak.php
+++ b/src/PhpWord/Writer/RTF/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/TextRun.php b/src/PhpWord/Writer/RTF/Element/TextRun.php
index d4e56765..bfd161f0 100644
--- a/src/PhpWord/Writer/RTF/Element/TextRun.php
+++ b/src/PhpWord/Writer/RTF/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Element/Title.php b/src/PhpWord/Writer/RTF/Element/Title.php
index 18bad9fd..a9940ca9 100644
--- a/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/src/PhpWord/Writer/RTF/Element/Title.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Part/AbstractPart.php b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
index 7569a105..8171b0d2 100644
--- a/src/PhpWord/Writer/RTF/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/RTF/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Part/Document.php b/src/PhpWord/Writer/RTF/Part/Document.php
index 465872ea..d4bfadb4 100644
--- a/src/PhpWord/Writer/RTF/Part/Document.php
+++ b/src/PhpWord/Writer/RTF/Part/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Part/Header.php b/src/PhpWord/Writer/RTF/Part/Header.php
index 73f1351f..01439bc6 100644
--- a/src/PhpWord/Writer/RTF/Part/Header.php
+++ b/src/PhpWord/Writer/RTF/Part/Header.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
index 80523610..57aa6bb9 100644
--- a/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/RTF/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/Border.php b/src/PhpWord/Writer/RTF/Style/Border.php
index 0ba9f602..08dcf018 100644
--- a/src/PhpWord/Writer/RTF/Style/Border.php
+++ b/src/PhpWord/Writer/RTF/Style/Border.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/Font.php b/src/PhpWord/Writer/RTF/Style/Font.php
index 3338368a..8c729425 100644
--- a/src/PhpWord/Writer/RTF/Style/Font.php
+++ b/src/PhpWord/Writer/RTF/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index 61b61fd7..3b8690cd 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index 8f073716..5c34fa86 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007.php b/src/PhpWord/Writer/Word2007.php
index fcef982f..eee215be 100644
--- a/src/PhpWord/Writer/Word2007.php
+++ b/src/PhpWord/Writer/Word2007.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
index 8c9f0bb7..63f45a76 100644
--- a/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
+++ b/src/PhpWord/Writer/Word2007/Element/AbstractElement.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Bookmark.php b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
index 4b0b78a7..04eaacf3 100644
--- a/src/PhpWord/Writer/Word2007/Element/Bookmark.php
+++ b/src/PhpWord/Writer/Word2007/Element/Bookmark.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Chart.php b/src/PhpWord/Writer/Word2007/Element/Chart.php
index 591799ab..f88ca2d2 100644
--- a/src/PhpWord/Writer/Word2007/Element/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Element/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/CheckBox.php b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
index ab888f67..05692a07 100644
--- a/src/PhpWord/Writer/Word2007/Element/CheckBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/CheckBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Container.php b/src/PhpWord/Writer/Word2007/Element/Container.php
index b6d1145c..892da051 100644
--- a/src/PhpWord/Writer/Word2007/Element/Container.php
+++ b/src/PhpWord/Writer/Word2007/Element/Container.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Endnote.php b/src/PhpWord/Writer/Word2007/Element/Endnote.php
index ebfe35c1..9a2eb3ff 100644
--- a/src/PhpWord/Writer/Word2007/Element/Endnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Endnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index 336a4325..cf3fbd66 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Footnote.php b/src/PhpWord/Writer/Word2007/Element/Footnote.php
index 65ef40c7..56a5332f 100644
--- a/src/PhpWord/Writer/Word2007/Element/Footnote.php
+++ b/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/FormField.php b/src/PhpWord/Writer/Word2007/Element/FormField.php
index c77ca378..b59cf58f 100644
--- a/src/PhpWord/Writer/Word2007/Element/FormField.php
+++ b/src/PhpWord/Writer/Word2007/Element/FormField.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 32a22a13..3614ec18 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Line.php b/src/PhpWord/Writer/Word2007/Element/Line.php
index 9b1a160d..a114be60 100644
--- a/src/PhpWord/Writer/Word2007/Element/Line.php
+++ b/src/PhpWord/Writer/Word2007/Element/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Link.php b/src/PhpWord/Writer/Word2007/Element/Link.php
index dc708a61..f0adf851 100644
--- a/src/PhpWord/Writer/Word2007/Element/Link.php
+++ b/src/PhpWord/Writer/Word2007/Element/Link.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItem.php b/src/PhpWord/Writer/Word2007/Element/ListItem.php
index c1aa0ce3..ef738e10 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItem.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItem.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
index e6ed2b46..765d2ee0 100644
--- a/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/ListItemRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/OLEObject.php b/src/PhpWord/Writer/Word2007/Element/OLEObject.php
index 50891d97..c55ff6cd 100644
--- a/src/PhpWord/Writer/Word2007/Element/OLEObject.php
+++ b/src/PhpWord/Writer/Word2007/Element/OLEObject.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/PageBreak.php b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
index 04ff29d4..0801e4d3 100644
--- a/src/PhpWord/Writer/Word2007/Element/PageBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/PageBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
index 0dafa4a0..5563f607 100644
--- a/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/ParagraphAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/PreserveText.php b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
index 13887866..94ce6ede 100644
--- a/src/PhpWord/Writer/Word2007/Element/PreserveText.php
+++ b/src/PhpWord/Writer/Word2007/Element/PreserveText.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/SDT.php b/src/PhpWord/Writer/Word2007/Element/SDT.php
index 6a202564..21020a0f 100644
--- a/src/PhpWord/Writer/Word2007/Element/SDT.php
+++ b/src/PhpWord/Writer/Word2007/Element/SDT.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Shape.php b/src/PhpWord/Writer/Word2007/Element/Shape.php
index 9f111293..250d5c1d 100644
--- a/src/PhpWord/Writer/Word2007/Element/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Element/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/TOC.php b/src/PhpWord/Writer/Word2007/Element/TOC.php
index 36ed7f88..94437cbf 100644
--- a/src/PhpWord/Writer/Word2007/Element/TOC.php
+++ b/src/PhpWord/Writer/Word2007/Element/TOC.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index c0590772..25a48ab2 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
index 44450fd6..f44e9ebe 100644
--- a/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
+++ b/src/PhpWord/Writer/Word2007/Element/TableAlignment.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Text.php b/src/PhpWord/Writer/Word2007/Element/Text.php
index 130b912b..f421c1af 100644
--- a/src/PhpWord/Writer/Word2007/Element/Text.php
+++ b/src/PhpWord/Writer/Word2007/Element/Text.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBox.php b/src/PhpWord/Writer/Word2007/Element/TextBox.php
index 3780c698..9dd4bc3e 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/TextBreak.php b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
index 161a528e..7b3d9997 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextBreak.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextBreak.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/TextRun.php b/src/PhpWord/Writer/Word2007/Element/TextRun.php
index 9fd70b13..e46ad3f5 100644
--- a/src/PhpWord/Writer/Word2007/Element/TextRun.php
+++ b/src/PhpWord/Writer/Word2007/Element/TextRun.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 80c0904d..858ecfef 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
index 038eb21d..ce4e41cb 100644
--- a/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/AbstractPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index c3703f9f..3db542c5 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Comments.php b/src/PhpWord/Writer/Word2007/Part/Comments.php
index 2b8f9267..33c9f59e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Comments.php
+++ b/src/PhpWord/Writer/Word2007/Part/Comments.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
index 9be988d3..28a2d294 100644
--- a/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
+++ b/src/PhpWord/Writer/Word2007/Part/ContentTypes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
index dbd55187..3452d864 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsApp.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
index fdabee36..caefbd86 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCore.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
index 8ee2f028..478075d3 100644
--- a/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
+++ b/src/PhpWord/Writer/Word2007/Part/DocPropsCustom.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Document.php b/src/PhpWord/Writer/Word2007/Part/Document.php
index 72e4fcd8..986b4985 100644
--- a/src/PhpWord/Writer/Word2007/Part/Document.php
+++ b/src/PhpWord/Writer/Word2007/Part/Document.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Endnotes.php b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
index 289119db..ce3a46bf 100644
--- a/src/PhpWord/Writer/Word2007/Part/Endnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Endnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/FontTable.php b/src/PhpWord/Writer/Word2007/Part/FontTable.php
index 065a318e..1161a951 100644
--- a/src/PhpWord/Writer/Word2007/Part/FontTable.php
+++ b/src/PhpWord/Writer/Word2007/Part/FontTable.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Footer.php b/src/PhpWord/Writer/Word2007/Part/Footer.php
index cfc9dd40..97b47790 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footer.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footer.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
index c9e3bcac..59bf1830 100644
--- a/src/PhpWord/Writer/Word2007/Part/Footnotes.php
+++ b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Header.php b/src/PhpWord/Writer/Word2007/Part/Header.php
index 5853d92f..b58df1f9 100644
--- a/src/PhpWord/Writer/Word2007/Part/Header.php
+++ b/src/PhpWord/Writer/Word2007/Part/Header.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Numbering.php b/src/PhpWord/Writer/Word2007/Part/Numbering.php
index 6233a6b7..61e5cc23 100644
--- a/src/PhpWord/Writer/Word2007/Part/Numbering.php
+++ b/src/PhpWord/Writer/Word2007/Part/Numbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Rels.php b/src/PhpWord/Writer/Word2007/Part/Rels.php
index 154c7e89..661a4fa8 100644
--- a/src/PhpWord/Writer/Word2007/Part/Rels.php
+++ b/src/PhpWord/Writer/Word2007/Part/Rels.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
index 505aa223..2a0c5e11 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsDocument.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/RelsPart.php b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
index e639c041..ac61a0c2 100644
--- a/src/PhpWord/Writer/Word2007/Part/RelsPart.php
+++ b/src/PhpWord/Writer/Word2007/Part/RelsPart.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 118c0da0..42d3a5d5 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Styles.php b/src/PhpWord/Writer/Word2007/Part/Styles.php
index 03855f03..d05338c7 100644
--- a/src/PhpWord/Writer/Word2007/Part/Styles.php
+++ b/src/PhpWord/Writer/Word2007/Part/Styles.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Theme.php b/src/PhpWord/Writer/Word2007/Part/Theme.php
index c264140e..f4ef478e 100644
--- a/src/PhpWord/Writer/Word2007/Part/Theme.php
+++ b/src/PhpWord/Writer/Word2007/Part/Theme.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index 9f18e356..46252e87 100644
--- a/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
index d7756933..3236cead 100644
--- a/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
+++ b/src/PhpWord/Writer/Word2007/Style/AbstractStyle.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index b889aa55..733b7b43 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index e3a86a58..19399348 100644
--- a/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Fill.php b/src/PhpWord/Writer/Word2007/Style/Fill.php
index de64313b..53d03974 100644
--- a/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index 5f2a84c0..58282d15 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 9bd5db66..47f9ef75 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
index 271b99df..ef23ed10 100644
--- a/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Indentation.php b/src/PhpWord/Writer/Word2007/Style/Indentation.php
index c5a598ff..961e770f 100644
--- a/src/PhpWord/Writer/Word2007/Style/Indentation.php
+++ b/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
index f065e521..154a42c1 100644
--- a/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index 3ed577c6..4bf08b65 100644
--- a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
index 5c3ecde2..f5c4b015 100644
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Outline.php b/src/PhpWord/Writer/Word2007/Style/Outline.php
index 9ae61f39..ae4c1da3 100644
--- a/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index eeccc5c8..67616086 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Row.php b/src/PhpWord/Writer/Word2007/Style/Row.php
index f57094db..82028d24 100644
--- a/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
index ef50c111..af77396d 100644
--- a/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index 00680687..0f9d6ccc 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Shadow.php b/src/PhpWord/Writer/Word2007/Style/Shadow.php
index 5efc38c4..7fcb12a9 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Shape.php b/src/PhpWord/Writer/Word2007/Style/Shape.php
index aad42ae7..2def6842 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
index c18339bd..0185cbcc 100644
--- a/src/PhpWord/Writer/Word2007/Style/Spacing.php
+++ b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
index 7b0a0ab5..b41653f6 100644
--- a/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 058e60e2..eb5af86d 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/TablePosition.php b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
index 14fa6a0d..fa57b93c 100644
--- a/src/PhpWord/Writer/Word2007/Style/TablePosition.php
+++ b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
index cd92f845..627d0c86 100644
--- a/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/src/PhpWord/Writer/WriterInterface.php b/src/PhpWord/Writer/WriterInterface.php
index b5f08199..499cde3b 100644
--- a/src/PhpWord/Writer/WriterInterface.php
+++ b/src/PhpWord/Writer/WriterInterface.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Collection/CollectionTest.php b/tests/PhpWord/Collection/CollectionTest.php
index a8757171..aba63212 100644
--- a/tests/PhpWord/Collection/CollectionTest.php
+++ b/tests/PhpWord/Collection/CollectionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
index b8df9bbe..4448daf8 100644
--- a/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWord/ComplexType/FootnotePropertiesTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/ComplexType/ProofStateTest.php b/tests/PhpWord/ComplexType/ProofStateTest.php
index baf2009e..cd1e77f7 100644
--- a/tests/PhpWord/ComplexType/ProofStateTest.php
+++ b/tests/PhpWord/ComplexType/ProofStateTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/AbstractElementTest.php b/tests/PhpWord/Element/AbstractElementTest.php
index 87bb5e18..f0531b34 100644
--- a/tests/PhpWord/Element/AbstractElementTest.php
+++ b/tests/PhpWord/Element/AbstractElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/BookmarkTest.php b/tests/PhpWord/Element/BookmarkTest.php
index bd5d27ae..04e3f6d5 100644
--- a/tests/PhpWord/Element/BookmarkTest.php
+++ b/tests/PhpWord/Element/BookmarkTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/CellTest.php b/tests/PhpWord/Element/CellTest.php
index a1132cfa..d4aaa488 100644
--- a/tests/PhpWord/Element/CellTest.php
+++ b/tests/PhpWord/Element/CellTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index d5bda9bd..f732407b 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index d33a54f6..b9c3dfce 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/FieldTest.php b/tests/PhpWord/Element/FieldTest.php
index 8baa68e4..1c1c0ca1 100644
--- a/tests/PhpWord/Element/FieldTest.php
+++ b/tests/PhpWord/Element/FieldTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/FooterTest.php b/tests/PhpWord/Element/FooterTest.php
index b68e80cd..9de2487a 100644
--- a/tests/PhpWord/Element/FooterTest.php
+++ b/tests/PhpWord/Element/FooterTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/FootnoteTest.php b/tests/PhpWord/Element/FootnoteTest.php
index fd4c8d03..4ea330f5 100644
--- a/tests/PhpWord/Element/FootnoteTest.php
+++ b/tests/PhpWord/Element/FootnoteTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index 29b2fef5..e61175f1 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ImageTest.php b/tests/PhpWord/Element/ImageTest.php
index 8bebce91..747a77ac 100644
--- a/tests/PhpWord/Element/ImageTest.php
+++ b/tests/PhpWord/Element/ImageTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index 4d414944..20eee74f 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index 63e8f1de..e1be7521 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 84beec02..95eb17eb 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index 5fae34d4..e5c815ec 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/ObjectTest.php b/tests/PhpWord/Element/ObjectTest.php
index ba761b70..9fbe1bb5 100644
--- a/tests/PhpWord/Element/ObjectTest.php
+++ b/tests/PhpWord/Element/ObjectTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index 3b081848..d4491fe1 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/PreserveTextTest.php b/tests/PhpWord/Element/PreserveTextTest.php
index c2767a4f..97e49b93 100644
--- a/tests/PhpWord/Element/PreserveTextTest.php
+++ b/tests/PhpWord/Element/PreserveTextTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index 9abf3776..3c534502 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index 41eae213..6e40bae0 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index 37096e2d..265307d7 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index d826a1a1..5f5f518f 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 0bbefb24..8ae5306c 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index 63b093c9..cd50acd4 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index 9b25bac3..13084c67 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index 59b8b89f..2168bcc4 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index 09027ad6..97be7ae5 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index e99a80a6..6ef87c3e 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Element/TrackChangeTest.php b/tests/PhpWord/Element/TrackChangeTest.php
index 3249f10b..df86feb2 100644
--- a/tests/PhpWord/Element/TrackChangeTest.php
+++ b/tests/PhpWord/Element/TrackChangeTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/CopyFileExceptionTest.php b/tests/PhpWord/Exception/CopyFileExceptionTest.php
index fa9949ed..5fed9c9f 100644
--- a/tests/PhpWord/Exception/CopyFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CopyFileExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
index 6b4d14bf..f879285e 100644
--- a/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
+++ b/tests/PhpWord/Exception/CreateTemporaryFileExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/ExceptionTest.php b/tests/PhpWord/Exception/ExceptionTest.php
index 255477f9..8c7bce57 100644
--- a/tests/PhpWord/Exception/ExceptionTest.php
+++ b/tests/PhpWord/Exception/ExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/InvalidImageExceptionTest.php b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
index c0285dc1..71da1aa9 100644
--- a/tests/PhpWord/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidImageExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
index d516019f..1d981449 100644
--- a/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWord/Exception/InvalidStyleExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
index 559d6341..5b03f5e3 100644
--- a/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWord/Exception/UnsupportedImageTypeExceptionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/IOFactoryTest.php b/tests/PhpWord/IOFactoryTest.php
index 581b7d49..4a59e702 100644
--- a/tests/PhpWord/IOFactoryTest.php
+++ b/tests/PhpWord/IOFactoryTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/MediaTest.php b/tests/PhpWord/MediaTest.php
index ed56376b..02492016 100644
--- a/tests/PhpWord/MediaTest.php
+++ b/tests/PhpWord/MediaTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Metadata/DocInfoTest.php b/tests/PhpWord/Metadata/DocInfoTest.php
index d9b44dc6..25a323d2 100644
--- a/tests/PhpWord/Metadata/DocInfoTest.php
+++ b/tests/PhpWord/Metadata/DocInfoTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Metadata/SettingsTest.php b/tests/PhpWord/Metadata/SettingsTest.php
index 07dc8962..9670f1d9 100644
--- a/tests/PhpWord/Metadata/SettingsTest.php
+++ b/tests/PhpWord/Metadata/SettingsTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index 3b1b5a36..d818e0f8 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index c56fc1fc..38588afc 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/MsDocTest.php b/tests/PhpWord/Reader/MsDocTest.php
index e407547d..3ce39939 100644
--- a/tests/PhpWord/Reader/MsDocTest.php
+++ b/tests/PhpWord/Reader/MsDocTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/ODTextTest.php b/tests/PhpWord/Reader/ODTextTest.php
index 7041e13e..ad270864 100644
--- a/tests/PhpWord/Reader/ODTextTest.php
+++ b/tests/PhpWord/Reader/ODTextTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/RTFTest.php b/tests/PhpWord/Reader/RTFTest.php
index ca1f6ed4..fed00ceb 100644
--- a/tests/PhpWord/Reader/RTFTest.php
+++ b/tests/PhpWord/Reader/RTFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 10c1ec9a..941e6f82 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/Word2007/PartTest.php b/tests/PhpWord/Reader/Word2007/PartTest.php
index 0f7ecc7c..31a492b8 100644
--- a/tests/PhpWord/Reader/Word2007/PartTest.php
+++ b/tests/PhpWord/Reader/Word2007/PartTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index 3b04b677..46421d97 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 9a555672..62d23a68 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/SettingsTest.php b/tests/PhpWord/SettingsTest.php
index d8752b2b..afe59549 100644
--- a/tests/PhpWord/SettingsTest.php
+++ b/tests/PhpWord/SettingsTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 752b9a8a..3798a07b 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 8be1cc19..7541c9c4 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
index c42a6eb4..5a050c54 100644
--- a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
+++ b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index cb095127..ecd0961e 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/AbstractStyleTest.php b/tests/PhpWord/Style/AbstractStyleTest.php
index c0263b1b..7ec272bb 100644
--- a/tests/PhpWord/Style/AbstractStyleTest.php
+++ b/tests/PhpWord/Style/AbstractStyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index 79b22ee1..db789fdc 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index 91bba97f..4ddbd397 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index 5d9e5568..09287bb9 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index 63a96628..b39a4d77 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
index 74b2067a..99741cea 100644
--- a/tests/PhpWord/Style/LanguageTest.php
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index 9ec1e3b7..0d3f4e05 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index ab77b328..fba09f70 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index a8155fa3..71598e80 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/NumberingLevelTest.php b/tests/PhpWord/Style/NumberingLevelTest.php
index 9b512eb0..008a1fc5 100644
--- a/tests/PhpWord/Style/NumberingLevelTest.php
+++ b/tests/PhpWord/Style/NumberingLevelTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index 4ec12366..2090f9f6 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index 687e23c6..688f31af 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index adf0ed4d..62460738 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index 2daad7ea..534815b1 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index c9b7003f..b26d1d94 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index ab991a57..7aba03a1 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index 65be8092..f7402edd 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index 5981b00c..445c5e43 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index c11f0558..8d8d3f6c 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 1ee718df..332d31aa 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index 5a6bc76f..803189cd 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index 6f2f0980..cbc39c87 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 7b064ef7..c762a609 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index fc092ba3..ff79953c 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index 3d56f983..f8303414 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/HTML/StyleTest.php b/tests/PhpWord/Writer/HTML/StyleTest.php
index e9117de9..5b60226c 100644
--- a/tests/PhpWord/Writer/HTML/StyleTest.php
+++ b/tests/PhpWord/Writer/HTML/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index f2bc7175..8868db5a 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index f56114ea..37f0d1ef 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
index f91e6dd2..51d893d2 100644
--- a/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/AbstractPartTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/ODText/Part/ContentTest.php b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
index d5681143..2e501c60 100644
--- a/tests/PhpWord/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWord/Writer/ODText/Part/ContentTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index 5bd862f9..b1bf417d 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/tests/PhpWord/Writer/ODTextTest.php
index 1984de0f..a576a68d 100644
--- a/tests/PhpWord/Writer/ODTextTest.php
+++ b/tests/PhpWord/Writer/ODTextTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index 61c3d296..bc229d51 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/PDF/MPDFTest.php b/tests/PhpWord/Writer/PDF/MPDFTest.php
index 330125fb..34a5f8d8 100644
--- a/tests/PhpWord/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/MPDFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/PDF/TCPDFTest.php b/tests/PhpWord/Writer/PDF/TCPDFTest.php
index e697eee1..6dc8f24c 100644
--- a/tests/PhpWord/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/TCPDFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/PDFTest.php b/tests/PhpWord/Writer/PDFTest.php
index a7ca9f68..f699385c 100644
--- a/tests/PhpWord/Writer/PDFTest.php
+++ b/tests/PhpWord/Writer/PDFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index e85d2091..47630335 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index 42f76430..5f04f1a8 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index 803087e5..010720bd 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index b59e369f..979a4337 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index 7796c02c..fac94882 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
index 83af284f..0233abdf 100644
--- a/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/CommentsTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
index 39db6028..b35f9327 100644
--- a/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/DocumentTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 82bb7b7d..1f9bba0d 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index 3d11174a..4b0e94df 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
index afa81cf9..9edd0063 100644
--- a/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/HeaderTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
index 62127e29..fb5a220e 100644
--- a/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/NumberingTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index a8c01da0..8201d746 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 0cdb444e..91f37184 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index 160bf553..277f61e1 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index f66cf24f..c57f50ab 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
index 1e5e1d13..8443bbca 100644
--- a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index 2b67507a..364a34d6 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index f48597d2..48cff871 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 3e1edb39..22a0e6df 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/_includes/AbstractTestReader.php b/tests/PhpWord/_includes/AbstractTestReader.php
index 348cab98..d9097d71 100644
--- a/tests/PhpWord/_includes/AbstractTestReader.php
+++ b/tests/PhpWord/_includes/AbstractTestReader.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/_includes/TestHelperDOCX.php b/tests/PhpWord/_includes/TestHelperDOCX.php
index bef060ee..02fa7d78 100644
--- a/tests/PhpWord/_includes/TestHelperDOCX.php
+++ b/tests/PhpWord/_includes/TestHelperDOCX.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 21a12105..8c937bf5 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 7126c204..c1681bcd 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors. test bootstrap
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 require_once __DIR__ . '/../bootstrap.php';

From e29a3e7c103c29867d855b75a98134ae48fa4072 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 11 Mar 2018 13:27:35 +0100
Subject: [PATCH 252/370] add text wrapping distance

---
 samples/Sample_13_Images.php                  |  38 ++++--
 src/PhpWord/Style/Frame.php                   | 120 ++++++++++++++++++
 src/PhpWord/Writer/Word2007/Style/Frame.php   |  13 +-
 tests/PhpWord/Style/FontTest.php              |   1 +
 tests/PhpWord/Style/ImageTest.php             |  41 +++---
 tests/PhpWord/Writer/HTML/ElementTest.php     |  23 ++++
 .../Writer/Word2007/Style/ImageTest.php       |  69 ++++++++++
 7 files changed, 272 insertions(+), 33 deletions(-)
 create mode 100644 tests/PhpWord/Writer/Word2007/Style/ImageTest.php

diff --git a/samples/Sample_13_Images.php b/samples/Sample_13_Images.php
index 6c7033b0..f7be3be9 100644
--- a/samples/Sample_13_Images.php
+++ b/samples/Sample_13_Images.php
@@ -1,4 +1,7 @@
 <?php
+use PhpOffice\PhpWord\Element\Section;
+use PhpOffice\PhpWord\Shared\Converter;
+
 include_once 'Sample_Header.php';
 
 // New Word document
@@ -9,45 +12,48 @@ $phpWord = new \PhpOffice\PhpWord\PhpWord();
 $section = $phpWord->addSection();
 $section->addText('Local image without any styles:');
 $section->addImage('resources/_mars.jpg');
-$section->addTextBreak(2);
 
+printSeparator($section);
 $section->addText('Local image with styles:');
 $section->addImage('resources/_earth.jpg', array('width' => 210, 'height' => 210, 'alignment' => \PhpOffice\PhpWord\SimpleType\Jc::CENTER));
-$section->addTextBreak(2);
 
 // Remote image
+printSeparator($section);
 $source = 'http://php.net/images/logos/php-med-trans-light.gif';
 $section->addText("Remote image from: {$source}");
 $section->addImage($source);
 
 // Image from string
+printSeparator($section);
 $source = 'resources/_mars.jpg';
 $fileContent = file_get_contents($source);
 $section->addText('Image from string');
 $section->addImage($fileContent);
 
 //Wrapping style
-$text = str_repeat('Hello World! ', 15);
+printSeparator($section);
+$text = str_repeat('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. ', 2);
 $wrappingStyles = array('inline', 'behind', 'infront', 'square', 'tight');
 foreach ($wrappingStyles as $wrappingStyle) {
-    $section->addTextBreak(5);
     $section->addText("Wrapping style {$wrappingStyle}");
     $section->addImage(
         'resources/_earth.jpg',
         array(
-            'positioning'   => 'relative',
-            'marginTop'     => -1,
-            'marginLeft'    => 1,
-            'width'         => 80,
-            'height'        => 80,
-            'wrappingStyle' => $wrappingStyle,
+            'positioning'        => 'relative',
+            'marginTop'          => -1,
+            'marginLeft'         => 1,
+            'width'              => 80,
+            'height'             => 80,
+            'wrappingStyle'      => $wrappingStyle,
+            'wrapDistanceRight'  => Converter::cmToPoint(1),
+            'wrapDistanceBottom' => Converter::cmToPoint(1),
         )
     );
     $section->addText($text);
+    printSeparator($section);
 }
 
 //Absolute positioning
-$section->addTextBreak(3);
 $section->addText('Absolute positioning: see top right corner of page');
 $section->addImage(
     'resources/_mars.jpg',
@@ -64,7 +70,7 @@ $section->addImage(
 );
 
 //Relative positioning
-$section->addTextBreak(3);
+printSeparator($section);
 $section->addText('Relative positioning: Horizontal position center relative to column,');
 $section->addText('Vertical position top relative to line');
 $section->addImage(
@@ -80,6 +86,14 @@ $section->addImage(
     )
 );
 
+function printSeparator(Section $section)
+{
+    $section->addTextBreak();
+    $lineStyle = array('weight' => 0.2, 'width' => 150, 'height' => 0, 'align' => 'center');
+    $section->addLine($lineStyle);
+    $section->addTextBreak(2);
+}
+
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {
diff --git a/src/PhpWord/Style/Frame.php b/src/PhpWord/Style/Frame.php
index b9263049..e87b7a80 100644
--- a/src/PhpWord/Style/Frame.php
+++ b/src/PhpWord/Style/Frame.php
@@ -171,6 +171,34 @@ class Frame extends AbstractStyle
      */
     private $wrap;
 
+    /**
+     * Top wrap distance
+     *
+     * @var float
+     */
+    private $wrapDistanceTop;
+
+    /**
+     * Bottom wrap distance
+     *
+     * @var float
+     */
+    private $wrapDistanceBottom;
+
+    /**
+     * Left wrap distance
+     *
+     * @var float
+     */
+    private $wrapDistanceLeft;
+
+    /**
+     * Right wrap distance
+     *
+     * @var float
+     */
+    private $wrapDistanceRight;
+
     /**
      * Vertically raised or lowered text
      *
@@ -547,6 +575,98 @@ class Frame extends AbstractStyle
         return $this;
     }
 
+    /**
+     * Get top distance from text wrap
+     *
+     * @return float
+     */
+    public function getWrapDistanceTop()
+    {
+        return $this->wrapDistanceTop;
+    }
+
+    /**
+     * Set top distance from text wrap
+     *
+     * @param int $value
+     * @return self
+     */
+    public function setWrapDistanceTop($value = null)
+    {
+        $this->wrapDistanceTop = $this->setFloatVal($value, null);
+
+        return $this;
+    }
+
+    /**
+     * Get bottom distance from text wrap
+     *
+     * @return float
+     */
+    public function getWrapDistanceBottom()
+    {
+        return $this->wrapDistanceBottom;
+    }
+
+    /**
+     * Set bottom distance from text wrap
+     *
+     * @param float $value
+     * @return self
+     */
+    public function setWrapDistanceBottom($value = null)
+    {
+        $this->wrapDistanceBottom = $this->setFloatVal($value, null);
+
+        return $this;
+    }
+
+    /**
+     * Get left distance from text wrap
+     *
+     * @return float
+     */
+    public function getWrapDistanceLeft()
+    {
+        return $this->wrapDistanceLeft;
+    }
+
+    /**
+     * Set left distance from text wrap
+     *
+     * @param float $value
+     * @return self
+     */
+    public function setWrapDistanceLeft($value = null)
+    {
+        $this->wrapDistanceLeft = $this->setFloatVal($value, null);
+
+        return $this;
+    }
+
+    /**
+     * Get right distance from text wrap
+     *
+     * @return float
+     */
+    public function getWrapDistanceRight()
+    {
+        return $this->wrapDistanceRight;
+    }
+
+    /**
+     * Set right distance from text wrap
+     *
+     * @param float $value
+     * @return self
+     */
+    public function setWrapDistanceRight($value = null)
+    {
+        $this->wrapDistanceRight = $this->setFloatVal($value, null);
+
+        return $this;
+    }
+
     /**
      * Get position
      *
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 47f9ef75..ea5abf78 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -45,10 +45,14 @@ class Frame extends AbstractStyle
         $zIndices = array(FrameStyle::WRAP_INFRONT => $maxZIndex, FrameStyle::WRAP_BEHIND => -$maxZIndex);
 
         $properties = array(
-            'width'     => 'width',
-            'height'    => 'height',
-            'left'      => 'margin-left',
-            'top'       => 'margin-top',
+            'width'              => 'width',
+            'height'             => 'height',
+            'left'               => 'margin-left',
+            'top'                => 'margin-top',
+            'wrapDistanceTop'    => 'mso-wrap-distance-top',
+            'wrapDistanceBottom' => 'mso-wrap-distance-bottom',
+            'wrapDistanceLeft'   => 'mso-wrap-distance-left',
+            'wrapDistanceRight'  => 'mso-wrap-distance-right',
         );
         $sizeStyles = $this->getStyles($style, $properties, $style->getUnit());
 
@@ -57,7 +61,6 @@ class Frame extends AbstractStyle
             'hPos'      => 'mso-position-horizontal',
             'vPos'      => 'mso-position-vertical',
             'hPosRelTo' => 'mso-position-horizontal-relative',
-            'vPosRelTo' => 'mso-position-vertical-relative',
         );
         $posStyles = $this->getStyles($style, $properties);
 
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index 4ddbd397..6a934579 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -115,6 +115,7 @@ class FontTest extends \PHPUnit\Framework\TestCase
             'spacing'             => 240,
             'kerning'             => 10,
             'rtl'                 => true,
+            'noProof'             => true,
             'lang'                => new Language(Language::EN_US),
         );
         $object->setStyleByArray($attributes);
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index 09287bb9..1d43d921 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -35,12 +35,16 @@ class ImageTest extends \PHPUnit\Framework\TestCase
         $object = new Image();
 
         $properties = array(
-            'width'         => 200,
-            'height'        => 200,
-            'alignment'     => Jc::START,
-            'marginTop'     => 240,
-            'marginLeft'    => 240,
-            'wrappingStyle' => 'inline',
+            'width'              => 200,
+            'height'             => 200,
+            'alignment'          => Jc::START,
+            'marginTop'          => 240,
+            'marginLeft'         => 240,
+            'wrappingStyle'      => 'inline',
+            'wrapDistanceLeft'   => 10,
+            'wrapDistanceRight'  => 20,
+            'wrapDistanceTop'    => 30,
+            'wrapDistanceBottom' => 40,
         );
         foreach ($properties as $key => $value) {
             $set = "set{$key}";
@@ -58,16 +62,21 @@ class ImageTest extends \PHPUnit\Framework\TestCase
         $object = new Image();
 
         $properties = array(
-            'width'            => 200,
-            'height'           => 200,
-            'alignment'        => Jc::START,
-            'marginTop'        => 240,
-            'marginLeft'       => 240,
-            'positioning'      => \PhpOffice\PhpWord\Style\Image::POSITION_ABSOLUTE,
-            'posHorizontal'    => \PhpOffice\PhpWord\Style\Image::POSITION_HORIZONTAL_CENTER,
-            'posVertical'      => \PhpOffice\PhpWord\Style\Image::POSITION_VERTICAL_TOP,
-            'posHorizontalRel' => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_COLUMN,
-            'posVerticalRel'   => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_IMARGIN,
+            'width'              => 200,
+            'height'             => 200,
+            'alignment'          => Jc::START,
+            'marginTop'          => 240,
+            'marginLeft'         => 240,
+            'position'           => 10,
+            'positioning'        => \PhpOffice\PhpWord\Style\Image::POSITION_ABSOLUTE,
+            'posHorizontal'      => \PhpOffice\PhpWord\Style\Image::POSITION_HORIZONTAL_CENTER,
+            'posVertical'        => \PhpOffice\PhpWord\Style\Image::POSITION_VERTICAL_TOP,
+            'posHorizontalRel'   => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_COLUMN,
+            'posVerticalRel'     => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_IMARGIN,
+            'wrapDistanceLeft'   => 10,
+            'wrapDistanceRight'  => 20,
+            'wrapDistanceTop'    => 30,
+            'wrapDistanceBottom' => 40,
         );
         foreach ($properties as $key => $value) {
             $get = "get{$key}";
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index ff79953c..ceb3abcb 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -17,7 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML;
 
+use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Element\Text as TextElement;
+use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\Writer\HTML;
 use PhpOffice\PhpWord\Writer\HTML\Element\Text;
 
@@ -54,4 +56,25 @@ class ElementTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals(htmlspecialchars('-A-', ENT_COMPAT, 'UTF-8'), $object->write());
     }
+
+    /**
+     * Test write TrackChange
+     */
+    public function testWriteTrackChanges()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $text = $section->addText('my dummy text');
+        $text->setChangeInfo(TrackChange::INSERTED, 'author name');
+        $text2 = $section->addText('my other text');
+        $text2->setTrackChange(new TrackChange(TrackChange::DELETED, 'another author', new \DateTime()));
+
+        $htmlWriter = new HTML($phpWord);
+        $dom = new \DOMDocument();
+        $dom->loadHTML($htmlWriter->getContent());
+        $xpath = new \DOMXpath($dom);
+
+        $this->assertTrue($xpath->query('/html/body/p[1]/ins')->length == 1);
+        $this->assertTrue($xpath->query('/html/body/p[2]/del')->length == 1);
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/ImageTest.php b/tests/PhpWord/Writer/Word2007/Style/ImageTest.php
new file mode 100644
index 00000000..efa0a105
--- /dev/null
+++ b/tests/PhpWord/Writer/Word2007/Style/ImageTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2018 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\Word2007\Style;
+
+use PhpOffice\PhpWord\Style\Image;
+use PhpOffice\PhpWord\TestHelperDOCX;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Font
+ *
+ * @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Frame
+ * @runTestsInSeparateProcesses
+ */
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Executed before each method of the class
+     */
+    public function tearDown()
+    {
+        TestHelperDOCX::clear();
+    }
+
+    /**
+     * Test writing image wrapping
+     */
+    public function testWrapping()
+    {
+        $styles = array(
+            'wrap'               => Image::WRAP_INLINE,
+            'wrapDistanceLeft'   => 10,
+            'wrapDistanceRight'  => 20,
+            'wrapDistanceTop'    => 30,
+            'wrapDistanceBottom' => 40,
+        );
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $section->addImage(__DIR__ . '/../../../_files/images/earth.jpg', $styles);
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:p[1]/w:r/w:pict/v:shape';
+        $this->assertTrue($doc->elementExists($path . '/w10:wrap'));
+        $this->assertEquals('inline', $doc->getElementAttribute($path . '/w10:wrap', 'type'));
+
+        $this->assertTrue($doc->elementExists($path));
+        $style = $doc->getElement($path)->getAttribute('style');
+        $this->assertNotNull($style);
+        $this->assertContains('mso-wrap-distance-left:10pt;', $style);
+        $this->assertContains('mso-wrap-distance-right:20pt;', $style);
+        $this->assertContains('mso-wrap-distance-top:30pt;', $style);
+        $this->assertContains('mso-wrap-distance-bottom:40pt;', $style);
+    }
+}

From a0111be6ae1e5bc2018f171b34849975ce59d579 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 11 Mar 2018 15:02:24 +0100
Subject: [PATCH 253/370] update changelog and doc

---
 CHANGELOG.md                              | 1 +
 docs/styles.rst                           | 4 ++++
 tests/PhpWord/Writer/HTML/ElementTest.php | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c83ac35..e4515131 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for MACROBUTTON field @phryneas @troosan #1021
 - Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
 - Added support for Floating Table Positioning (tblpPr) @anrikun #639
+- Added support for Image text wrapping distance @troosan #1310
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/styles.rst b/docs/styles.rst
index 98088e78..9b3ce758 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -154,6 +154,10 @@ Available Image style options:
 - ``marginTop``. Top margin in inches, can be negative.
 - ``width``. Width in pixels.
 - ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*.
+- ``wrapDistanceTop``. Top text wrapping in pixels.
+- ``wrapDistanceBottom``. Bottom text wrapping in pixels.
+- ``wrapDistanceLeft``. Left text wrapping in pixels.
+- ``wrapDistanceRight``. Right text wrapping in pixels.
 
 .. _numbering-level-style:
 
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index ceb3abcb..b99a5c9a 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -17,9 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML;
 
-use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Element\Text as TextElement;
 use PhpOffice\PhpWord\Element\TrackChange;
+use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\HTML;
 use PhpOffice\PhpWord\Writer\HTML\Element\Text;
 

From bb70eb0b4c37fa059d53c9714da88150f1ed3cfc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Mar 2018 12:37:39 +0100
Subject: [PATCH 254/370] fix docx parsing

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 143 +++++++++---------
 src/PhpWord/Writer/HTML/Element/Title.php     |  14 +-
 src/PhpWord/Writer/ODText/Element/Title.php   |   8 +-
 src/PhpWord/Writer/RTF/Element/Text.php       |   2 +-
 tests/PhpWord/Reader/Word2007/ElementTest.php |  91 ++++++++++-
 tests/PhpWord/Reader/Word2007/StyleTest.php   |   9 +-
 tests/PhpWord/Writer/Word2007Test.php         |   2 +-
 7 files changed, 180 insertions(+), 89 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 9d002623..7509a382 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
@@ -161,20 +162,14 @@ abstract class AbstractPart
             $parent->addTitle($textContent, $headingDepth);
         } else {
             // Text and TextRun
-            $runCount = $xmlReader->countElements('w:r', $domNode);
-            $insCount = $xmlReader->countElements('w:ins', $domNode);
-            $delCount = $xmlReader->countElements('w:del', $domNode);
-            $linkCount = $xmlReader->countElements('w:hyperlink', $domNode);
-            $runLinkCount = $runCount + $insCount + $delCount + $linkCount;
-            if (0 == $runLinkCount) {
+            $textRunContainers = $xmlReader->countElements('w:r|w:ins|w:del|w:hyperlink|w:smartTag', $domNode);
+            if (0 === $textRunContainers) {
                 $parent->addTextBreak(null, $paragraphStyle);
             } else {
                 $nodes = $xmlReader->getElements('*', $domNode);
-                if ($runLinkCount > 1) {
-                    $parent = $parent->addTextRun($paragraphStyle);
-                }
+                $paragraph = $parent->addTextRun($paragraphStyle);
                 foreach ($nodes as $node) {
-                    $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
+                    $this->readRun($xmlReader, $node, $paragraph, $docPart, $paragraphStyle);
                 }
             }
         }
@@ -216,81 +211,85 @@ abstract class AbstractPart
      */
     protected function readRun(XMLReader $xmlReader, \DOMElement $domNode, $parent, $docPart, $paragraphStyle = null)
     {
-        if (in_array($domNode->nodeName, array('w:ins', 'w:del'))) {
+        if (in_array($domNode->nodeName, array('w:ins', 'w:del', 'w:smartTag', 'w:hyperlink'))) {
             $nodes = $xmlReader->getElements('*', $domNode);
             foreach ($nodes as $node) {
-                return $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
+                $this->readRun($xmlReader, $node, $parent, $docPart, $paragraphStyle);
+            }
+        } elseif ($domNode->nodeName == 'w:r') {
+            $fontStyle = $this->readFontStyle($xmlReader, $domNode);
+            $nodes = $xmlReader->getElements('*', $domNode);
+            foreach ($nodes as $node) {
+                $this->readRunChild($xmlReader, $node, $parent, $docPart, $paragraphStyle, $fontStyle);
             }
         }
+    }
 
-        if (!in_array($domNode->nodeName, array('w:r', 'w:hyperlink'))) {
-            return;
-        }
-        $fontStyle = $this->readFontStyle($xmlReader, $domNode);
-
-        // Link
-        if ('w:hyperlink' == $domNode->nodeName) {
-            $rId = $xmlReader->getAttribute('r:id', $domNode);
-            $textContent = $xmlReader->getValue('w:r/w:t', $domNode);
+    /**
+     * Parses nodes under w:r
+     *
+     * @param XMLReader $xmlReader
+     * @param \DOMElement $node
+     * @param AbstractContainer $parent
+     * @param string $docPart
+     * @param mixed $paragraphStyle
+     * @param mixed $fontStyle
+     */
+    protected function readRunChild(XMLReader $xmlReader, \DOMElement $node, AbstractContainer $parent, $docPart, $paragraphStyle = null, $fontStyle = null)
+    {
+        $runParent = $node->parentNode->parentNode;
+        if ($node->nodeName == 'w:footnoteReference') {
+            // Footnote
+            $wId = $xmlReader->getAttribute('w:id', $node);
+            $footnote = $parent->addFootnote();
+            $footnote->setRelationId($wId);
+        } elseif ($node->nodeName == 'w:endnoteReference') {
+            // Endnote
+            $wId = $xmlReader->getAttribute('w:id', $node);
+            $endnote = $parent->addEndnote();
+            $endnote->setRelationId($wId);
+        } elseif ($node->nodeName == 'w:pict') {
+            // Image
+            $rId = $xmlReader->getAttribute('r:id', $node, 'v:shape/v:imagedata');
             $target = $this->getMediaTarget($docPart, $rId);
             if (!is_null($target)) {
-                $parent->addLink($target, $textContent, $fontStyle, $paragraphStyle);
+                if ('External' == $this->getTargetMode($docPart, $rId)) {
+                    $imageSource = $target;
+                } else {
+                    $imageSource = "zip://{$this->docFile}#{$target}";
+                }
+                $parent->addImage($imageSource);
             }
-        } else {
-            if ($xmlReader->elementExists('w:footnoteReference', $domNode)) {
-                // Footnote
-                $wId = $xmlReader->getAttribute('w:id', $domNode, 'w:footnoteReference');
-                $footnote = $parent->addFootnote();
-                $footnote->setRelationId($wId);
-            } elseif ($xmlReader->elementExists('w:endnoteReference', $domNode)) {
-                // Endnote
-                $wId = $xmlReader->getAttribute('w:id', $domNode, 'w:endnoteReference');
-                $endnote = $parent->addEndnote();
-                $endnote->setRelationId($wId);
-            } elseif ($xmlReader->elementExists('w:pict', $domNode)) {
-                // Image
-                $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
+        } elseif ($node->nodeName == 'w:object') {
+            // Object
+            $rId = $xmlReader->getAttribute('r:id', $node, 'o:OLEObject');
+            // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
+            $target = $this->getMediaTarget($docPart, $rId);
+            if (!is_null($target)) {
+                $textContent = "&lt;Object: {$target}>";
+                $parent->addText($textContent, $fontStyle, $paragraphStyle);
+            }
+        } elseif ($node->nodeName == 'w:br') {
+            $parent->addTextBreak();
+        } elseif ($node->nodeName == 'w:tab') {
+            $parent->addText("\t");
+        } elseif ($node->nodeName == 'w:t' || $node->nodeName == 'w:delText') {
+            // TextRun
+            $textContent = $xmlReader->getValue('.', $node);
+
+            if ($runParent->nodeName == 'w:hyperlink') {
+                $rId = $xmlReader->getAttribute('r:id', $runParent);
                 $target = $this->getMediaTarget($docPart, $rId);
                 if (!is_null($target)) {
-                    if ('External' == $this->getTargetMode($docPart, $rId)) {
-                        $imageSource = $target;
-                    } else {
-                        $imageSource = "zip://{$this->docFile}#{$target}";
-                    }
-                    $parent->addImage($imageSource);
-                }
-            } elseif ($xmlReader->elementExists('w:object', $domNode)) {
-                // Object
-                $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:object/o:OLEObject');
-                // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
-                $target = $this->getMediaTarget($docPart, $rId);
-                if (!is_null($target)) {
-                    $textContent = "&lt;Object: {$target}>";
-                    $parent->addText($textContent, $fontStyle, $paragraphStyle);
-                }
-            }
-            if ($xmlReader->elementExists('w:br', $domNode)) {
-                $parent->addTextBreak();
-            }
-            if ($xmlReader->elementExists('w:t', $domNode) || $xmlReader->elementExists('w:tab', $domNode) || $xmlReader->elementExists('w:delText', $domNode)) {
-                // TextRun
-                $textContent = '';
-                $nodes = $xmlReader->getElements('w:t|w:delText|w:tab', $domNode);
-                foreach ($nodes as $node) {
-                    if ($node->nodeName == 'w:t') {
-                        $textContent .= $node->nodeValue;
-                    } elseif ($node->nodeName == 'w:delText') {
-                        $textContent .= $node->nodeValue;
-                    } elseif ($node->nodeName == 'w:tab') {
-                        $textContent .= "\t";
-                    }
+                    $parent->addLink($target, $textContent, $fontStyle, $paragraphStyle);
                 }
+            } else {
                 /** @var AbstractElement $element */
                 $element = $parent->addText($textContent, $fontStyle, $paragraphStyle);
-                if (in_array($domNode->parentNode->nodeName, array('w:ins', 'w:del'))) {
-                    $type = ($domNode->parentNode->nodeName == 'w:del') ? TrackChange::DELETED : TrackChange::INSERTED;
-                    $author = $domNode->parentNode->getAttribute('w:author');
-                    $date = \DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $domNode->parentNode->getAttribute('w:date'));
+                if (in_array($runParent->nodeName, array('w:ins', 'w:del'))) {
+                    $type = ($runParent->nodeName == 'w:del') ? TrackChange::DELETED : TrackChange::INSERTED;
+                    $author = $runParent->getAttribute('w:author');
+                    $date = \DateTime::createFromFormat('Y-m-d\TH:i:s\Z', $runParent->getAttribute('w:date'));
                     $element->setChangeInfo($type, $author, $date);
                 }
             }
diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index 3a802018..7307ce0c 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -38,11 +38,17 @@ class Title extends AbstractElement
         }
 
         $tag = 'h' . $this->element->getDepth();
-        if (Settings::isOutputEscapingEnabled()) {
-            $text = $this->escaper->escapeHtml($this->element->getText());
-        } else {
-            $text = $this->element->getText();
+
+        $text = $this->element->getText();
+        if (is_string($text)) {
+            if (Settings::isOutputEscapingEnabled()) {
+                $text = $this->escaper->escapeHtml($text);
+            }
+        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+            $writer = new Container($this->parentWriter, $this->element);
+            $text = $writer->write();
         }
+
         $content = "<{$tag}>{$text}</{$tag}>" . PHP_EOL;
 
         return $content;
diff --git a/src/PhpWord/Writer/ODText/Element/Title.php b/src/PhpWord/Writer/ODText/Element/Title.php
index 343949a2..8b9440ab 100644
--- a/src/PhpWord/Writer/ODText/Element/Title.php
+++ b/src/PhpWord/Writer/ODText/Element/Title.php
@@ -37,7 +37,13 @@ class Title extends AbstractElement
 
         $xmlWriter->startElement('text:h');
         $xmlWriter->writeAttribute('text:outline-level', $element->getDepth());
-        $this->writeText($element->getText());
+        $text = $element->getText();
+        if (is_string($text)) {
+            $this->writeText($text);
+        } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
+            $containerWriter = new Container($xmlWriter, $text);
+            $containerWriter->write();
+        }
         $xmlWriter->endElement(); // text:h
     }
 }
diff --git a/src/PhpWord/Writer/RTF/Element/Text.php b/src/PhpWord/Writer/RTF/Element/Text.php
index f80e7935..b9e56e89 100644
--- a/src/PhpWord/Writer/RTF/Element/Text.php
+++ b/src/PhpWord/Writer/RTF/Element/Text.php
@@ -34,7 +34,7 @@ class Text extends AbstractElement
         /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
         $element = $this->element;
         $elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
-        if (!$element instanceof $elementClass) {
+        if (!$element instanceof $elementClass || !is_string($element->getText())) {
             return '';
         }
 
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 46780278..75060625 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\PhpWord\AbstractTestReader;
+use PhpOffice\PhpWord\Element\TrackChange;
 
 /**
  * Test class for PhpOffice\PhpWord\Reader\Word2007\Element subnamespace
@@ -39,9 +40,35 @@ class ElementTest extends AbstractTestReader
         $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
         $elements = $phpWord->getSection(0)->getElements();
-        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextBreak', $elements[0]);
-        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[1]);
-        $this->assertEquals('test string', $elements[1]->getText());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\TextRun $textRun */
+        $textRun = $elements[0];
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextBreak', $textRun->getElement(0));
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(1));
+        $this->assertEquals('test string', $textRun->getElement(1)->getText());
+    }
+
+    /**
+     * Test reading content inside w:smartTag
+     */
+    public function testSmartTag()
+    {
+        $documentXml = '<w:p>
+            <w:smartTag>
+                <w:r>
+                    <w:t xml:space="preserve">test string</w:t>
+                </w:r>
+            </w:smartTag>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\TextRun $textRun */
+        $textRun = $elements[0];
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(0));
+        $this->assertEquals('test string', $textRun->getElement(0)->getText());
     }
 
     /**
@@ -85,6 +112,49 @@ class ElementTest extends AbstractTestReader
         $this->assertTrue($listElements[2]->getFontStyle()->getBold());
     }
 
+    /**
+     * Test reading track changes
+     */
+    public function testReadTrackChange()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:t>One </w:t>
+            </w:r>
+            <w:del w:author="Barney" w:date="2018-03-14T10:57:05Z">
+                <w:r>
+                    <w:delText>two</w:delText>
+                </w:r>
+            </w:del>
+            <w:ins w:author="Fred" w:date="2018-03-14T10:57:05Z">
+                	<w:r>
+                    <w:t>three</w:t>
+                	</w:r>
+            </w:ins>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\TextRun $elements */
+        $textRun = $elements[0];
+
+        $this->assertEquals('One ', $textRun->getElement(0)->getText());
+
+        $this->assertEquals('two', $textRun->getElement(1)->getText());
+        $this->assertNotNull($textRun->getElement(1)->getTrackChange());
+        /** @var \PhpOffice\PhpWord\Element\TrackChange $trackChange */
+        $trackChange = $textRun->getElement(1)->getTrackChange();
+        $this->assertEquals(TrackChange::DELETED, $trackChange->getChangeType());
+
+        $this->assertEquals('three', $textRun->getElement(2)->getText());
+        $this->assertNotNull($textRun->getElement(2)->getTrackChange());
+        /** @var \PhpOffice\PhpWord\Element\TrackChange $trackChange */
+        $trackChange = $textRun->getElement(2)->getTrackChange();
+        $this->assertEquals(TrackChange::INSERTED, $trackChange->getChangeType());
+    }
+
     /**
      * Test reading of tab
      */
@@ -98,11 +168,18 @@ class ElementTest extends AbstractTestReader
             </w:r>
         </w:p>';
 
-        $phpWord = $this->getDocumentFromString($documentXml);
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
-        $elements = $this->get($phpWord->getSections(), 0)->getElements();
-        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
-        $this->assertEquals("One\tTwo", $elements[0]->getText());
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+        /** @var \PhpOffice\PhpWord\Element\TextRun $textRun */
+        $textRun = $elements[0];
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(0));
+        $this->assertEquals('One', $textRun->getElement(0)->getText());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(1));
+        $this->assertEquals("\t", $textRun->getElement(1)->getText());
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(2));
+        $this->assertEquals('Two', $textRun->getElement(2)->getText());
     }
 
     /**
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index 46421d97..9bb6d3bd 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -117,10 +117,13 @@ class StyleTest extends AbstractTestReader
         $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
 
         $elements = $phpWord->getSection(0)->getElements();
-        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[0]);
-        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Font', $elements[0]->getFontStyle());
+        /** @var \PhpOffice\PhpWord\Element\TextRun $elements */
+        $textRun = $elements[0];
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $textRun);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $textRun->getElement(0));
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Font', $textRun->getElement(0)->getFontStyle());
         /** @var \PhpOffice\PhpWord\Style\Font $fontStyle */
-        $fontStyle = $elements[0]->getFontStyle();
+        $fontStyle = $textRun->getElement(0)->getFontStyle();
         $this->assertEquals(15, $fontStyle->getPosition());
     }
 }
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 22a0e6df..0db36fc1 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -75,7 +75,7 @@ class Word2007Test extends \PHPUnit\Framework\TestCase
     public function testSave()
     {
         $localImage = __DIR__ . '/../_files/images/earth.jpg';
-        $remoteImage = 'http://php.net//images/logos/php-med-trans-light.gif';
+        $remoteImage = 'http://php.net/images/logos/new-php-logo.png';
         $phpWord = new PhpWord();
         $phpWord->addFontStyle('Font', array('size' => 11));
         $phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));

From 4c846426ce68998d6846660338093a535a784f33 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Mar 2018 20:53:05 +0100
Subject: [PATCH 255/370] format & changelog

---
 CHANGELOG.md                  | 1 +
 src/PhpWord/Element/Field.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4515131..b58ec404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ v0.15.0 (?? ??? 2018)
 - Bookmark are not writton as internal link in html writer @troosan #1263
 - It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
+- Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index e5377cf4..0e5e28ed 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -46,8 +46,8 @@ class Field extends AbstractElement
            ),
            'options' => array('PreserveFormat'),
         ),
-        'DATE'=>array(
-            'properties'=> array(
+        'DATE' => array(
+            'properties' => array(
                 'dateformat' => array(
                     /* Generic formats */
                     'yyyy-MM-dd', 'yyyy-MM', 'MMM-yy', 'MMM-yyyy', 'h:mm am/pm', 'h:mm:ss am/pm', 'HH:mm', 'HH:mm:ss',

From 997e21433ccb397ac8a547863227e33f75089eb1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 18 Mar 2018 22:26:45 +0100
Subject: [PATCH 256/370] add parsing of line-height and text-indent

---
 src/PhpWord/Shared/Html.php       |  6 ++++++
 tests/PhpWord/Shared/HtmlTest.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 15f3b605..64c6b4a5 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -520,6 +520,12 @@ class Html
                 case 'background-color':
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
+                case 'line-height':
+                    $styles['lineHeight'] = $cValue;
+                    break;
+                case 'text-indent':
+                    $styles['indentation']['firstLine'] = Converter::cssToTwip($cValue);
+                    break;
                 case 'font-weight':
                     $tValue = false;
                     if (preg_match('#bold#', $cValue)) {
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 7541c9c4..eda7abb8 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -114,6 +114,34 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
     }
 
+    /**
+     * Test line-height style
+     */
+    public function testParseLineHeight()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="line-height: 1.5;">test</p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:spacing'));
+        $this->assertEquals(240 * 1.5, $doc->getElementAttribute('/w:document/w:body/w:p/w:pPr/w:spacing', 'w:line'));
+    }
+
+    /**
+     * Test text-indent style
+     */
+    public function testParseTextIndent()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, '<p style="text-indent: 50px;">test</p>');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:ind'));
+        $this->assertEquals(750, $doc->getElementAttribute('/w:document/w:body/w:p/w:pPr/w:ind', 'w:firstLine'));
+    }
+
     /**
      * Test text-align style
      */

From de2e05bc112887332ea8800e5ddee255d1f83639 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 06:41:46 +0100
Subject: [PATCH 257/370] update changelog

[ci skip]
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b58ec404..e2bf4eb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for Hyphenation @Trainmaster #1282 (Document: `autoHyphenation`, `consecutiveHyphenLimit`, `hyphenationZone`, `doNotHyphenateCaps`, Paragraph: `suppressAutoHyphens`)
 - Added support for Floating Table Positioning (tblpPr) @anrikun #639
 - Added support for Image text wrapping distance @troosan #1310
+- Added parsing of CSS line-height and text-indent in HTML reader @troosan #1316
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238

From 97d60dd985363681bfd376aacee776898032ea3d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 17:25:19 +0100
Subject: [PATCH 258/370] tranlate percentage to rate

---
 samples/Sample_26_Html.php  |  3 +++
 src/PhpWord/Shared/Html.php | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index 31e5984f..d8763805 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -18,6 +18,9 @@ $html .= '<p lang="he-IL" style="text-align: right; direction: rtl">היי, זה
 $html .= '<p style="margin-top: 240pt;">Unordered (bulleted) list:</p>';
 $html .= '<ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>';
 
+$html .= '<p style="margin-top: 240pt;">1.5 line height with first line text indent:</p>';
+$html .= '<p style="text-align: justify; text-indent: 70.9pt; line-height: 150%;">Lorem ipsum dolor sit amet, <strong>consectetur adipiscing elit</strong>, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>';
+
 $html .= '<h2 style="align: center">centered title</h2>';
 
 $html .= '<p style="margin-top: 240pt;">Ordered (numbered) list:</p>';
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 64c6b4a5..dcf84778 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -521,7 +521,7 @@ class Html
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
                 case 'line-height':
-                    $styles['lineHeight'] = $cValue;
+                    $styles['lineHeight'] = Html::toMultiplier($cValue);
                     break;
                 case 'text-indent':
                     $styles['indentation']['firstLine'] = Converter::cssToTwip($cValue);
@@ -681,6 +681,15 @@ class Html
         return null;
     }
 
+    private static function toMultiplier($cssValue)
+    {
+        if (preg_match('/([0-9]+)%/', $cssValue, $matches)) {
+            return ((int) $matches[1]) / 100;
+        }
+
+        return $cssValue;
+    }
+
     /**
      * Parse line break
      *

From de01e86d41e397891fe5a8255b2b595ccd883b75 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 22:43:10 +0100
Subject: [PATCH 259/370] parse fixed line space

---
 src/PhpWord/Shared/Html.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index dcf84778..f8b25605 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -521,7 +521,18 @@ class Html
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
                 case 'line-height':
-                    $styles['lineHeight'] = Html::toMultiplier($cValue);
+                    if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
+                        $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
+                        $spacing = Converter::cssToTwip($matches[1]) / \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
+                    } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
+                        $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
+                        $spacing = ((int) $matches[1]) / 100;
+                    } else {
+                        $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::AUTO;
+                        $spacing = $cValue;
+                    }
+                    $styles['spacingLineRule'] = $spacingLineRule;
+                    $styles['lineHeight'] = $spacing;
                     break;
                 case 'text-indent':
                     $styles['indentation']['firstLine'] = Converter::cssToTwip($cValue);
@@ -681,15 +692,6 @@ class Html
         return null;
     }
 
-    private static function toMultiplier($cssValue)
-    {
-        if (preg_match('/([0-9]+)%/', $cssValue, $matches)) {
-            return ((int) $matches[1]) / 100;
-        }
-
-        return $cssValue;
-    }
-
     /**
      * Parse line break
      *

From 16a9ded2c97304c89d0a7f1c4f34aa72c12e3818 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 22:49:00 +0100
Subject: [PATCH 260/370] add exact line spacing test

---
 tests/PhpWord/Shared/HtmlTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index eda7abb8..386aaee1 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -20,6 +20,8 @@ namespace PhpOffice\PhpWord\Shared;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
 
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html
@@ -122,10 +124,16 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
         Html::addHtml($section, '<p style="line-height: 1.5;">test</p>');
+        Html::addHtml($section, '<p style="line-height: 15pt;">test</p>');
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
-        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:spacing'));
-        $this->assertEquals(240 * 1.5, $doc->getElementAttribute('/w:document/w:body/w:p/w:pPr/w:spacing', 'w:line'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:spacing'));
+        $this->assertEquals(Paragraph::LINE_HEIGHT * 1.5, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:spacing', 'w:line'));
+        $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:spacing', 'w:lineRule'));
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:pPr/w:spacing'));
+        $this->assertEquals(300, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:line'));
+        $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:lineRule'));
     }
 
     /**

From f73beaa26a90ece5eab8015b2127347fd35076f2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 23:06:00 +0100
Subject: [PATCH 261/370] reset static collections at instantiation

---
 src/PhpWord/PhpWord.php                   | 13 +++++++++++++
 tests/PhpWord/Shared/HtmlTest.php         |  4 ++--
 tests/PhpWord/Style/TablePositionTest.php |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index 6b6fd9ff..d524adc7 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -52,8 +52,17 @@ class PhpWord
      * @const string|int
      */
     const DEFAULT_FONT_NAME = Settings::DEFAULT_FONT_NAME;
+    /**
+     * @deprecated 0.11.0 Use Settings constants
+     */
     const DEFAULT_FONT_SIZE = Settings::DEFAULT_FONT_SIZE;
+    /**
+     * @deprecated 0.11.0 Use Settings constants
+     */
     const DEFAULT_FONT_COLOR = Settings::DEFAULT_FONT_COLOR;
+    /**
+     * @deprecated 0.11.0 Use Settings constants
+     */
     const DEFAULT_FONT_CONTENT_TYPE = Settings::DEFAULT_FONT_CONTENT_TYPE;
 
     /**
@@ -85,6 +94,10 @@ class PhpWord
      */
     public function __construct()
     {
+        // Reset Media and styles
+        Media::resetStyles();
+        Style::resetStyles();
+
         // Collection
         $collections = array('Bookmarks', 'Titles', 'Footnotes', 'Endnotes', 'Charts', 'Comments');
         foreach ($collections as $collection) {
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 386aaee1..1171489c 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -19,9 +19,9 @@ namespace PhpOffice\PhpWord\Shared;
 
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\SimpleType\Jc;
-use PhpOffice\PhpWord\TestHelperDOCX;
-use PhpOffice\PhpWord\Style\Paragraph;
 use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
+use PhpOffice\PhpWord\Style\Paragraph;
+use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html
diff --git a/tests/PhpWord/Style/TablePositionTest.php b/tests/PhpWord/Style/TablePositionTest.php
index 77b22e4e..1243c3d5 100644
--- a/tests/PhpWord/Style/TablePositionTest.php
+++ b/tests/PhpWord/Style/TablePositionTest.php
@@ -11,7 +11,7 @@
  * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
  *
  * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2017 PHPWord contributors
+ * @copyright   2010-2018 PHPWord contributors
  * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
  */
 

From 992d8425521cb15f8b3a440a973a3b4394da1435 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 19 Mar 2018 23:07:35 +0100
Subject: [PATCH 262/370] fix

---
 src/PhpWord/PhpWord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index d524adc7..b5cc0c51 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -95,7 +95,7 @@ class PhpWord
     public function __construct()
     {
         // Reset Media and styles
-        Media::resetStyles();
+        Media::resetElements();
         Style::resetStyles();
 
         // Collection

From 296706aa03ad9c24b35528acdb052feb0219ee96 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 20 Mar 2018 21:35:06 +0100
Subject: [PATCH 263/370] add unit tests

---
 CHANGELOG.md                              |  1 +
 samples/Sample_09_Tables.php              | 22 ++++----
 tests/PhpWord/Writer/HTML/ElementTest.php | 68 +++++++++++++++++++++++
 3 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6f87158..526b9c95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ v0.15.0 (?? ??? 2018)
 - Fix parsing of `<w:br/>` tag. @troosan #1274
 - Bookmark are not writton as internal link in html writer @troosan #1263
 - It should be possible to add a Footnote in a ListItemRun @troosan #1287 #1287
+- Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/samples/Sample_09_Tables.php b/samples/Sample_09_Tables.php
index ba41aa54..b1231d55 100644
--- a/samples/Sample_09_Tables.php
+++ b/samples/Sample_09_Tables.php
@@ -113,20 +113,20 @@ $phpWord->addTableStyle('Colspan Rowspan', $styleTable);
 $table = $section->addTable('Colspan Rowspan');
 
 $row = $table->addRow();
-
-$row->addCell(null, array('vMerge' => 'restart'))->addText('A');
-$row->addCell(null, array('gridSpan' => 2, 'vMerge' => 'restart'))->addText('B');
-$row->addCell()->addText('1');
+$row->addCell(1000, array('vMerge' => 'restart'))->addText('A');
+$row->addCell(1000, array('gridSpan' => 2, 'vMerge' => 'restart'))->addText('B');
+$row->addCell(1000)->addText('1');
 
 $row = $table->addRow();
-$row->addCell(null, array('vMerge' => 'continue'));
-$row->addCell(null, array('vMerge' => 'continue', 'gridSpan' => 2));
-$row->addCell()->addText('2');
+$row->addCell(1000, array('vMerge' => 'continue'));
+$row->addCell(1000, array('vMerge' => 'continue', 'gridSpan' => 2));
+$row->addCell(1000)->addText('2');
+
 $row = $table->addRow();
-$row->addCell(null, array('vMerge' => 'continue'));
-$row->addCell()->addText('C');
-$row->addCell()->addText('D');
-$row->addCell()->addText('3');
+$row->addCell(1000, array('vMerge' => 'continue'));
+$row->addCell(1000)->addText('C');
+$row->addCell(1000)->addText('D');
+$row->addCell(1000)->addText('3');
 
 // 5. Nested table
 
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index fc092ba3..eb0d2571 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Element\Text as TextElement;
+use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\HTML;
 use PhpOffice\PhpWord\Writer\HTML\Element\Text;
 
@@ -54,4 +55,71 @@ class ElementTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals(htmlspecialchars('-A-', ENT_COMPAT, 'UTF-8'), $object->write());
     }
+
+    /**
+     * Tests writing table with col span
+     */
+    public function testWriteColSpan()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable();
+        $row1 = $table->addRow();
+        $cell11 = $row1->addCell(1000, array('gridSpan' => 2));
+        $cell11->addText('cell spanning 2 bellow');
+        $row2 = $table->addRow();
+        $cell21 = $row2->addCell(500);
+        $cell21->addText('first cell');
+        $cell22 = $row2->addCell(500);
+        $cell22->addText('second cell');
+
+        $dom = $this->getAsHTML($phpWord);
+        echo $dom->saveHTML();
+
+        $xpath = new \DOMXpath($dom);
+
+        $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 1);
+        $this->assertEquals('2', $xpath->query('/html/body/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
+        $this->assertTrue($xpath->query('/html/body/table/tr[2]/td')->length == 2);
+    }
+
+    /**
+     * Tests writing table with row span
+     */
+    public function testWriteRowSpan()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable();
+
+        $row1 = $table->addRow();
+        $row1->addCell(1000, array('vMerge' => 'restart'))->addText('row spanning 3 bellow');
+        $row1->addCell(500)->addText('first cell being spanned');
+
+        $row2 = $table->addRow();
+        $row2->addCell(null, array('vMerge' => 'continue'));
+        $row2->addCell(500)->addText('second cell being spanned');
+
+        $row3 = $table->addRow();
+        $row3->addCell(null, array('vMerge' => 'continue'));
+        $row3->addCell(500)->addText('third cell being spanned');
+
+        $dom = $this->getAsHTML($phpWord);
+        echo $dom->saveHTML();
+
+        $xpath = new \DOMXpath($dom);
+
+        $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 2);
+        $this->assertEquals('3', $xpath->query('/html/body/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
+        $this->assertTrue($xpath->query('/html/body/table/tr[2]/td')->length == 1);
+    }
+
+    private function getAsHTML(PhpWord $phpWord)
+    {
+        $htmlWriter = new HTML($phpWord);
+        $dom = new \DOMDocument();
+        $dom->loadHTML($htmlWriter->getContent());
+
+        return $dom;
+    }
 }

From d8387c1abad2e0e44af3f936cad0e6d5746ad271 Mon Sep 17 00:00:00 2001
From: Tim Jarrett <tim.jarrett@gmail.com>
Date: Tue, 2 Feb 2016 16:17:20 -0500
Subject: [PATCH 264/370] Escape incoming invalid XML characters using
 htmlspecialchars().

---
 src/PhpWord/Reader/Word2007/AbstractPart.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 7509a382..9623fb79 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -135,7 +135,7 @@ abstract class AbstractPart
                     }
                 }
             }
-            $parent->addPreserveText($textContent, $fontStyle, $paragraphStyle);
+            $parent->addPreserveText(htmlspecialchars($textContent, ENT_QUOTES | ENT_XML1), $fontStyle, $paragraphStyle);
         } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
             // List item
             $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
@@ -152,7 +152,7 @@ abstract class AbstractPart
             $textContent = null;
             $nodes = $xmlReader->getElements('w:r', $domNode);
             if ($nodes->length === 1) {
-                $textContent = $xmlReader->getValue('w:t', $nodes->item(0));
+                $textContent = htmlspecialchars($xmlReader->getValue('w:t', $nodes->item(0)), ENT_QUOTES | ENT_XML1);
             } else {
                 $textContent = new TextRun($paragraphStyle);
                 foreach ($nodes as $node) {
@@ -275,7 +275,7 @@ abstract class AbstractPart
             $parent->addText("\t");
         } elseif ($node->nodeName == 'w:t' || $node->nodeName == 'w:delText') {
             // TextRun
-            $textContent = $xmlReader->getValue('.', $node);
+            $textContent = htmlspecialchars($xmlReader->getValue('.', $node), ENT_QUOTES | ENT_XML1);
 
             if ($runParent->nodeName == 'w:hyperlink') {
                 $rId = $xmlReader->getAttribute('r:id', $runParent);

From 2c5970a38880d66ffb4db6870825f581755b44ee Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 20 Mar 2018 23:42:01 +0100
Subject: [PATCH 265/370] php 5.3 compatibility

---
 src/PhpWord/Reader/Word2007/AbstractPart.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 9623fb79..f64886cf 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -135,7 +135,7 @@ abstract class AbstractPart
                     }
                 }
             }
-            $parent->addPreserveText(htmlspecialchars($textContent, ENT_QUOTES | ENT_XML1), $fontStyle, $paragraphStyle);
+            $parent->addPreserveText(htmlspecialchars($textContent, ENT_QUOTES, 'UTF-8'), $fontStyle, $paragraphStyle);
         } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
             // List item
             $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
@@ -152,7 +152,7 @@ abstract class AbstractPart
             $textContent = null;
             $nodes = $xmlReader->getElements('w:r', $domNode);
             if ($nodes->length === 1) {
-                $textContent = htmlspecialchars($xmlReader->getValue('w:t', $nodes->item(0)), ENT_QUOTES | ENT_XML1);
+                $textContent = htmlspecialchars($xmlReader->getValue('w:t', $nodes->item(0)), ENT_QUOTES, 'UTF-8');
             } else {
                 $textContent = new TextRun($paragraphStyle);
                 foreach ($nodes as $node) {
@@ -275,7 +275,7 @@ abstract class AbstractPart
             $parent->addText("\t");
         } elseif ($node->nodeName == 'w:t' || $node->nodeName == 'w:delText') {
             // TextRun
-            $textContent = htmlspecialchars($xmlReader->getValue('.', $node), ENT_QUOTES | ENT_XML1);
+            $textContent = htmlspecialchars($xmlReader->getValue('.', $node), ENT_QUOTES, 'UTF-8');
 
             if ($runParent->nodeName == 'w:hyperlink') {
                 $rId = $xmlReader->getAttribute('r:id', $runParent);

From 45e2e92af7476d54b500271b9bb2d062b9407b2e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 21 Mar 2018 21:50:41 +0100
Subject: [PATCH 266/370] fix graph data

---
 src/PhpWord/Writer/Word2007/Part/Chart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 011e3472..09ce8c55 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -236,7 +236,7 @@ class Chart extends AbstractPart
             $xmlWriter->startElement('c:pt');
             $xmlWriter->writeAttribute('idx', $index);
             $xmlWriter->startElement('c:v');
-            $this->writeText($value);
+            $xmlWriter->writeText($value);
             $xmlWriter->endElement(); // c:v
             $xmlWriter->endElement(); // c:pt
             $index++;

From c08f2718af9c46ef1bcc56a0710487ca543e97d2 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 21 Mar 2018 21:58:41 +0100
Subject: [PATCH 267/370] check style fixes

---
 samples/Sample_32_Chart.php                | 10 ++++++++--
 src/PhpWord/Writer/Word2007/Part/Chart.php |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/samples/Sample_32_Chart.php b/samples/Sample_32_Chart.php
index e345afda..87d6f3e3 100644
--- a/samples/Sample_32_Chart.php
+++ b/samples/Sample_32_Chart.php
@@ -49,8 +49,14 @@ $section = $phpWord->addSection(array('colsNum' => 2, 'breakType' => 'continuous
 
 $chartTypes = array('pie', 'bar', 'column', 'line', 'area');
 $multiSeries = array('bar', 'column', 'line', 'area');
-$style = array('width' => Converter::cmToEmu(5), 'height' => Converter::cmToEmu(4), '3d' => true, 
-                'showAxisLabels' => $showAxisLabels, 'showGridX' => $showGridLines, 'showGridY' => $showGridLines);
+$style = array(
+    'width'          => Converter::cmToEmu(5),
+    'height'         => Converter::cmToEmu(4),
+    '3d'             => true,
+    'showAxisLabels' => $showAxisLabels,
+    'showGridX'      => $showGridLines,
+    'showGridY'      => $showGridLines,
+);
 foreach ($chartTypes as $chartType) {
     $section->addTitle(ucfirst($chartType), 2);
     $chart = $section->addChart($chartType, $categories, $series1, $style);
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 09ce8c55..59255a6b 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -280,7 +280,7 @@ class Chart extends AbstractPart
             }
             $xmlWriter->writeElementBlock('c:crosses', 'val', 'autoZero');
         }
-        if (isset($this->options['radar']) || ($type == "cat" && $style->showGridX()) || ($type == "val" && $style->showGridY())) {
+        if (isset($this->options['radar']) || ($type == 'cat' && $style->showGridX()) || ($type == 'val' && $style->showGridY())) {
             $xmlWriter->writeElement('c:majorGridlines');
         }
 

From ade497d9d78962caccbf777256be1abfdee7d4f6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 21 Mar 2018 22:19:56 +0100
Subject: [PATCH 268/370] update changelog and doc

---
 CHANGELOG.md           |  1 +
 docs/ISSUE_TEMPLATE.md |  2 +-
 docs/elements.rst      |  4 +++-
 docs/styles.rst        | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c3b4dfd..d0b39ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ v0.15.0 (?? ??? 2018)
 - Added support for Floating Table Positioning (tblpPr) @anrikun #639
 - Added support for Image text wrapping distance @troosan #1310
 - Added parsing of CSS line-height and text-indent in HTML reader @troosan #1316
+- Added the ability to enable gridlines and axislabels on charts @FrankMeyer #576
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
index ee811b00..c7ed27d7 100644
--- a/docs/ISSUE_TEMPLATE.md
+++ b/docs/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@ This is:
 - [ ] a feature request
 - [ ] **not** a usage question (ask them on https://stackoverflow.com/questions/tagged/phpword)
 
-# Expected Behavior
+### Expected Behavior
 
 Please describe the behavior you are expecting.
 
diff --git a/docs/elements.rst b/docs/elements.rst
index 4c5ad03b..8f33b503 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -448,7 +448,9 @@ Charts can be added using
 
     $categories = array('A', 'B', 'C', 'D', 'E');
     $series = array(1, 3, 2, 5, 4);
-    $chart = $section->addChart('line', $categories, $series);
+    $chart = $section->addChart('line', $categories, $series, $style);
+
+For available styling options see :ref:`chart-style`.
 
 check out the Sample_32_Chart.php for more options and styling.
 
diff --git a/docs/styles.rst b/docs/styles.rst
index 9b3ce758..0bda3faf 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -178,3 +178,17 @@ Available NumberingLevel style options:
 - ``suffix``. Content between numbering symbol and paragraph text tab\|space\|nothing.
 - ``tabPos``. See paragraph style.
 - ``text``. Numbering level text e.g. %1 for nonbullet or bullet character.
+
+.. _chart-style:
+
+Chart
+-----
+
+Available Chart style options:
+
+- ``width``. Width (in EMU).
+- ``height``. Height (in EMU).
+- ``3d``. Is 3D; applies to pie, bar, line, area, *true* or *false*.
+- ``showAxisLabels``. Show labels for axis, *true* or *false*.
+- ``gridX``. Show Gridlines for X-Axis, *true* or *false*.
+- ``gridY``. Show Gridlines for Y-Axis, *true* or *false*.

From 400ee57bee82faaa3745f51a02ef6f1f6fa52b62 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 22 Mar 2018 22:47:27 +0100
Subject: [PATCH 269/370] fix

---
 src/PhpWord/Writer/Word2007/Part/Chart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 59255a6b..2aeccca0 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -236,7 +236,7 @@ class Chart extends AbstractPart
             $xmlWriter->startElement('c:pt');
             $xmlWriter->writeAttribute('idx', $index);
             $xmlWriter->startElement('c:v');
-            $xmlWriter->writeText($value);
+            $xmlWriter->text($value);
             $xmlWriter->endElement(); // c:v
             $xmlWriter->endElement(); // c:pt
             $index++;

From 34bda105365cc4c8d9e8fe9c33f3d8b204c4ee79 Mon Sep 17 00:00:00 2001
From: gthomas2 <gthomas@moodlerooms.com>
Date: Tue, 6 Jan 2015 17:20:27 +0000
Subject: [PATCH 270/370] Fix images added in word 2011

---
 src/PhpWord/Element/Image.php                | 20 +++++++++++++++++++-
 src/PhpWord/Reader/Word2007/AbstractPart.php |  9 +++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 03637067..0eb3d937 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -65,6 +65,13 @@ class Image extends AbstractElement
      */
     private $watermark;
 
+    /**
+     * Name of image
+     *
+     * @var string
+     */
+    private $name;
+
     /**
      * Image type
      *
@@ -131,11 +138,12 @@ class Image extends AbstractElement
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
      */
-    public function __construct($source, $style = null, $watermark = false)
+    public function __construct($source, $style = null, $watermark = false, $name = null)
     {
         $this->source = $source;
         $this->setIsWatermark($watermark);
         $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
+        $this->name = $name;
 
         $this->checkImage();
     }
@@ -170,6 +178,16 @@ class Image extends AbstractElement
         return $this->sourceType;
     }
 
+    /**
+     * Get image name
+     *
+     * @return null|string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * Get image media ID
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index f64886cf..d8155eb5 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -260,6 +260,15 @@ abstract class AbstractPart
                 }
                 $parent->addImage($imageSource);
             }
+        } elseif ($node->nodeName == 'w:drawing') {
+            // Office 2011 Images
+            $name = $xmlReader->getAttribute('name', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
+            $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
+            $target = $this->getMediaTarget($docPart, $embedId);
+            if (!is_null($target)) {
+                $imageSource = "zip://{$this->docFile}#{$target}";
+                $parent->addImage($imageSource, null, false, $name);
+            }
         } elseif ($node->nodeName == 'w:object') {
             // Object
             $rId = $xmlReader->getAttribute('r:id', $node, 'o:OLEObject');

From 9b722a5b0cc03e7e46390fba9c011c88e0dca46d Mon Sep 17 00:00:00 2001
From: gthomas2 <gthomas@moodlerooms.com>
Date: Tue, 6 Jan 2015 17:36:11 +0000
Subject: [PATCH 271/370] Added missing namespaces

---
 src/PhpWord/Shared/XMLReader.php | 195 +++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 src/PhpWord/Shared/XMLReader.php

diff --git a/src/PhpWord/Shared/XMLReader.php b/src/PhpWord/Shared/XMLReader.php
new file mode 100644
index 00000000..44ee07cd
--- /dev/null
+++ b/src/PhpWord/Shared/XMLReader.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Shared;
+
+use PhpOffice\PhpWord\Exception\Exception;
+
+/**
+ * XML Reader wrapper
+ *
+ * @since   0.10.0
+ */
+class XMLReader
+{
+    /**
+     * DOMDocument object
+     *
+     * @var \DOMDocument
+     */
+    private $dom = null;
+
+    /**
+     * DOMXpath object
+     *
+     * @var \DOMXpath
+     */
+    private $xpath = null;
+
+    /**
+     * Get DOMDocument from ZipArchive
+     *
+     * @param string $zipFile
+     * @param string $xmlFile
+     * @return \DOMDocument|false
+     * @throws \PhpOffice\PhpWord\Exception\Exception
+     */
+    public function getDomFromZip($zipFile, $xmlFile)
+    {
+        if (file_exists($zipFile) === false) {
+            throw new Exception('Cannot find archive file.');
+        }
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile);
+        $content = $zip->getFromName($xmlFile);
+        $zip->close();
+
+        if ($content === false) {
+            return false;
+        } else {
+            return $this->getDomFromString($content);
+        }
+    }
+
+    /**
+     * Get DOMDocument from content string
+     *
+     * @param string $content
+     * @return \DOMDocument
+     */
+    public function getDomFromString($content)
+    {
+        $this->dom = new \DOMDocument();
+        $this->dom->loadXML($content);
+
+        return $this->dom;
+    }
+
+    /**
+     * Get elements
+     *
+     * @param string $path
+     * @param \DOMElement $contextNode
+     * @return \DOMNodeList
+     */
+    public function getElements($path, \DOMElement $contextNode = null)
+    {
+        if ($this->dom === null) {
+            return array();
+        }
+        if ($this->xpath === null) {
+            $this->xpath = new \DOMXpath($this->dom);
+            // GT Mod - required for reading images
+            $this->xpath->registerNamespace('a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+            $this->xpath->registerNamespace('pic', 'http://schemas.openxmlformats.org/drawingml/2006/picture');
+        }
+
+        if (is_null($contextNode)) {
+            return $this->xpath->query($path);
+        } else {
+            return $this->xpath->query($path, $contextNode);
+        }
+    }
+
+    /**
+     * Get element
+     *
+     * @param string $path
+     * @param \DOMElement $contextNode
+     * @return \DOMElement|null
+     */
+    public function getElement($path, \DOMElement $contextNode = null)
+    {
+        $elements = $this->getElements($path, $contextNode);
+        if ($elements->length > 0) {
+            return $elements->item(0);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Get element attribute
+     *
+     * @param string $attribute
+     * @param \DOMElement $contextNode
+     * @param string $path
+     * @return string|null
+     */
+    public function getAttribute($attribute, \DOMElement $contextNode = null, $path = null)
+    {
+        $return = null;
+        if ($path !== null) {
+            $elements = $this->getElements($path, $contextNode);
+            if ($elements->length > 0) {
+                /** @var \DOMElement $node Type hint */
+                $node = $elements->item(0);
+                $return = $node->getAttribute($attribute);
+            }
+        } else {
+            if ($contextNode !== null) {
+                $return = $contextNode->getAttribute($attribute);
+            }
+        }
+
+        return ($return == '') ? null : $return;
+    }
+
+    /**
+     * Get element value
+     *
+     * @param string $path
+     * @param \DOMElement $contextNode
+     * @return string|null
+     */
+    public function getValue($path, \DOMElement $contextNode = null)
+    {
+        $elements = $this->getElements($path, $contextNode);
+        if ($elements->length > 0) {
+            return $elements->item(0)->nodeValue;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Count elements
+     *
+     * @param string $path
+     * @param \DOMElement $contextNode
+     * @return integer
+     */
+    public function countElements($path, \DOMElement $contextNode = null)
+    {
+        $elements = $this->getElements($path, $contextNode);
+
+        return $elements->length;
+    }
+
+    /**
+     * Element exists
+     *
+     * @param string $path
+     * @param \DOMElement $contextNode
+     * @return boolean
+     */
+    public function elementExists($path, \DOMElement $contextNode = null)
+    {
+        return $this->getElements($path, $contextNode)->length > 0;
+    }
+}

From 566e625b85b80f503db69d3e0e635a817dc0ef10 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 25 Mar 2018 22:46:50 +0200
Subject: [PATCH 272/370] merge/add test/cleanup

---
 composer.json                                 |   2 +-
 src/PhpWord/Element/AbstractContainer.php     |   2 +-
 src/PhpWord/Element/Image.php                 |  15 +-
 src/PhpWord/Reader/Word2007/AbstractPart.php  |   9 +-
 src/PhpWord/Shared/XMLReader.php              | 195 ------------------
 tests/PhpWord/Reader/Word2007/ElementTest.php |  36 ++++
 tests/PhpWord/Reader/Word2007Test.php         |  14 ++
 .../PhpWord/_files/documents/reader-2011.docx | Bin 0 -> 36938 bytes
 8 files changed, 73 insertions(+), 200 deletions(-)
 delete mode 100644 src/PhpWord/Shared/XMLReader.php
 create mode 100644 tests/PhpWord/_files/documents/reader-2011.docx

diff --git a/composer.json b/composer.json
index 742e4bc8..6dc9be2c 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "phpoffice/common": "^0.2"
+        "phpoffice/common": "dev-develop"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.0",
diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index ec990720..204d4a73 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -35,7 +35,7 @@ namespace PhpOffice\PhpWord\Element;
  * @method TOC addTOC(mixed $fontStyle = null, mixed $tocStyle = null, int $minDepth = 1, int $maxDepth = 9)
  * @method PageBreak addPageBreak()
  * @method Table addTable(mixed $style = null)
- * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false)
+ * @method Image addImage(string $source, mixed $style = null, bool $isWatermark = false, $name = null)
  * @method OLEObject addOLEObject(string $source, mixed $style = null)
  * @method TextBox addTextBox(mixed $style = null)
  * @method Field addField(string $type = null, array $properties = array(), array $options = array(), mixed $text = null)
diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
index 0eb3d937..bae87ff5 100644
--- a/src/PhpWord/Element/Image.php
+++ b/src/PhpWord/Element/Image.php
@@ -134,6 +134,7 @@ class Image extends AbstractElement
      * @param string $source
      * @param mixed $style
      * @param bool $watermark
+     * @param string $name
      *
      * @throws \PhpOffice\PhpWord\Exception\InvalidImageException
      * @throws \PhpOffice\PhpWord\Exception\UnsupportedImageTypeException
@@ -141,9 +142,9 @@ class Image extends AbstractElement
     public function __construct($source, $style = null, $watermark = false, $name = null)
     {
         $this->source = $source;
-        $this->setIsWatermark($watermark);
         $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
-        $this->name = $name;
+        $this->setIsWatermark($watermark);
+        $this->setName($name);
 
         $this->checkImage();
     }
@@ -178,6 +179,16 @@ class Image extends AbstractElement
         return $this->sourceType;
     }
 
+    /**
+     * Sets the image name
+     *
+     * @param string $value
+     */
+    public function setName($value)
+    {
+        $this->name = $value;
+    }
+
     /**
      * Get image name
      *
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index d8155eb5..c7ec4ca7 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -261,7 +261,12 @@ abstract class AbstractPart
                 $parent->addImage($imageSource);
             }
         } elseif ($node->nodeName == 'w:drawing') {
-            // Office 2011 Images
+            // Office 2011 Image
+            $xmlReader->registerNamespace('wp', 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing');
+            $xmlReader->registerNamespace('r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+            $xmlReader->registerNamespace('pic', 'http://schemas.openxmlformats.org/drawingml/2006/picture');
+            $xmlReader->registerNamespace('a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+
             $name = $xmlReader->getAttribute('name', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr');
             $embedId = $xmlReader->getAttribute('r:embed', $node, 'wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:blip');
             $target = $this->getMediaTarget($docPart, $embedId);
@@ -573,6 +578,8 @@ abstract class AbstractPart
                     return $possibleAttribute;
                 }
             }
+
+            return null;
         }
 
         return $attributes;
diff --git a/src/PhpWord/Shared/XMLReader.php b/src/PhpWord/Shared/XMLReader.php
deleted file mode 100644
index 44ee07cd..00000000
--- a/src/PhpWord/Shared/XMLReader.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * This file is part of PHPWord - A pure PHP library for reading and writing
- * word processing documents.
- *
- * PHPWord is free software distributed under the terms of the GNU Lesser
- * General Public License version 3 as published by the Free Software Foundation.
- *
- * For the full copyright and license information, please read the LICENSE
- * file that was distributed with this source code. For the full list of
- * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
- *
- * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2014 PHPWord contributors
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
- */
-
-namespace PhpOffice\PhpWord\Shared;
-
-use PhpOffice\PhpWord\Exception\Exception;
-
-/**
- * XML Reader wrapper
- *
- * @since   0.10.0
- */
-class XMLReader
-{
-    /**
-     * DOMDocument object
-     *
-     * @var \DOMDocument
-     */
-    private $dom = null;
-
-    /**
-     * DOMXpath object
-     *
-     * @var \DOMXpath
-     */
-    private $xpath = null;
-
-    /**
-     * Get DOMDocument from ZipArchive
-     *
-     * @param string $zipFile
-     * @param string $xmlFile
-     * @return \DOMDocument|false
-     * @throws \PhpOffice\PhpWord\Exception\Exception
-     */
-    public function getDomFromZip($zipFile, $xmlFile)
-    {
-        if (file_exists($zipFile) === false) {
-            throw new Exception('Cannot find archive file.');
-        }
-
-        $zip = new ZipArchive();
-        $zip->open($zipFile);
-        $content = $zip->getFromName($xmlFile);
-        $zip->close();
-
-        if ($content === false) {
-            return false;
-        } else {
-            return $this->getDomFromString($content);
-        }
-    }
-
-    /**
-     * Get DOMDocument from content string
-     *
-     * @param string $content
-     * @return \DOMDocument
-     */
-    public function getDomFromString($content)
-    {
-        $this->dom = new \DOMDocument();
-        $this->dom->loadXML($content);
-
-        return $this->dom;
-    }
-
-    /**
-     * Get elements
-     *
-     * @param string $path
-     * @param \DOMElement $contextNode
-     * @return \DOMNodeList
-     */
-    public function getElements($path, \DOMElement $contextNode = null)
-    {
-        if ($this->dom === null) {
-            return array();
-        }
-        if ($this->xpath === null) {
-            $this->xpath = new \DOMXpath($this->dom);
-            // GT Mod - required for reading images
-            $this->xpath->registerNamespace('a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-            $this->xpath->registerNamespace('pic', 'http://schemas.openxmlformats.org/drawingml/2006/picture');
-        }
-
-        if (is_null($contextNode)) {
-            return $this->xpath->query($path);
-        } else {
-            return $this->xpath->query($path, $contextNode);
-        }
-    }
-
-    /**
-     * Get element
-     *
-     * @param string $path
-     * @param \DOMElement $contextNode
-     * @return \DOMElement|null
-     */
-    public function getElement($path, \DOMElement $contextNode = null)
-    {
-        $elements = $this->getElements($path, $contextNode);
-        if ($elements->length > 0) {
-            return $elements->item(0);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get element attribute
-     *
-     * @param string $attribute
-     * @param \DOMElement $contextNode
-     * @param string $path
-     * @return string|null
-     */
-    public function getAttribute($attribute, \DOMElement $contextNode = null, $path = null)
-    {
-        $return = null;
-        if ($path !== null) {
-            $elements = $this->getElements($path, $contextNode);
-            if ($elements->length > 0) {
-                /** @var \DOMElement $node Type hint */
-                $node = $elements->item(0);
-                $return = $node->getAttribute($attribute);
-            }
-        } else {
-            if ($contextNode !== null) {
-                $return = $contextNode->getAttribute($attribute);
-            }
-        }
-
-        return ($return == '') ? null : $return;
-    }
-
-    /**
-     * Get element value
-     *
-     * @param string $path
-     * @param \DOMElement $contextNode
-     * @return string|null
-     */
-    public function getValue($path, \DOMElement $contextNode = null)
-    {
-        $elements = $this->getElements($path, $contextNode);
-        if ($elements->length > 0) {
-            return $elements->item(0)->nodeValue;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Count elements
-     *
-     * @param string $path
-     * @param \DOMElement $contextNode
-     * @return integer
-     */
-    public function countElements($path, \DOMElement $contextNode = null)
-    {
-        $elements = $this->getElements($path, $contextNode);
-
-        return $elements->length;
-    }
-
-    /**
-     * Element exists
-     *
-     * @param string $path
-     * @param \DOMElement $contextNode
-     * @return boolean
-     */
-    public function elementExists($path, \DOMElement $contextNode = null)
-    {
-        return $this->getElements($path, $contextNode)->length > 0;
-    }
-}
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
index 75060625..cb72ef9f 100644
--- a/tests/PhpWord/Reader/Word2007/ElementTest.php
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -236,4 +236,40 @@ class ElementTest extends AbstractTestReader
         $this->assertEquals('Title', $formattedTitle->getStyle());
         $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $formattedTitle->getText());
     }
+
+    /**
+     * Test reading Drawing
+     */
+    public function testReadDrawing()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:drawing xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing">
+                    <wp:inline distT="0" distB="0" distL="0" distR="0">
+                        <wp:extent cx="5727700" cy="6621145"/>
+                        <wp:docPr id="1" name="Picture 1"/>
+                        <a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
+                            <a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">
+                                <pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture">
+                                    <pic:nvPicPr>
+                                        <pic:cNvPr id="1" name="file_name.jpg"/>
+                                        <pic:cNvPicPr/>
+                                    </pic:nvPicPr>
+                                    <pic:blipFill>
+                                        <a:blip r:embed="rId4" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+                                        </a:blip>
+                                    </pic:blipFill>
+                                </pic:pic>
+                            </a:graphicData>
+                        </a:graphic>
+                    </wp:inline>
+                </w:drawing>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextRun', $elements[0]);
+    }
 }
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 62d23a68..e4ea62de 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -64,4 +64,18 @@ class Word2007Test extends \PHPUnit\Framework\TestCase
         $doc = TestHelperDOCX::getDocument($phpWord);
         $this->assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r[w:t/node()="italics"]/w:rPr/w:b'));
     }
+
+    /**
+     * Load a Word 2011 file
+     */
+    public function testLoadWord2011()
+    {
+        $filename = __DIR__ . '/../_files/documents/reader-2011.docx';
+        $phpWord = IOFactory::load($filename);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
+
+        $doc = TestHelperDOCX::getDocument($phpWord);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[3]/w:r/w:pict/v:shape/v:imagedata'));
+    }
 }
diff --git a/tests/PhpWord/_files/documents/reader-2011.docx b/tests/PhpWord/_files/documents/reader-2011.docx
new file mode 100644
index 0000000000000000000000000000000000000000..be94eca5242caeb7c9beda45741d5bcfd3b5838e
GIT binary patch
literal 36938
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%0AfwqU0&g5gH4Gl!~;>i>16+#cyIzb&8cM|zK
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
KfcGUbFaQ7-_U^U-

literal 0
HcmV?d00001


From ed24140e2fc08872da0c7b9db0364c1e07bf48b1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 2 Apr 2018 14:47:18 +0200
Subject: [PATCH 273/370] update samples instructions

[ci skip]
---
 docs/installing.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/installing.rst b/docs/installing.rst
index 4f407f54..34353be8 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -54,7 +54,5 @@ Example:
 Using samples
 -------------
 
-After installation, you can browse and use the samples that we've
-provided, either by command line or using browser. If you can access
-your PHPWord library folder using browser, point your browser to the
-``samples`` folder, e.g. ``http://localhost/PhpWord/samples/``.
+More examples are provided in the ``samples`` directory.
+For an easy access to those samples launch ``php -S localhost:8000`` in the samples directory then browse to http://localhost:8000 to view the samples.

From 67b18c32e7e4fa0bb0fa5cbe5c14efdf06437a91 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Mon, 2 Apr 2018 14:50:31 +0200
Subject: [PATCH 274/370] fix

[ci skip]
---
 samples/Sample_Header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index ac51f983..faa39a35 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -83,7 +83,7 @@ function write($phpWord, $filename, $writers)
         $result .= EOL;
     }
 
-    $result .= getEndingNotes($writers);
+    $result .= getEndingNotes($writers, $filename);
 
     return $result;
 }
@@ -95,7 +95,7 @@ function write($phpWord, $filename, $writers)
  *
  * @return string
  */
-function getEndingNotes($writers)
+function getEndingNotes($writers, $filename)
 {
     $result = '';
 

From ca82e19bba2e81f32530292b53f95cf623268c58 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Sat, 7 Apr 2018 11:24:52 +0200
Subject: [PATCH 275/370] support internal link in addHtml method

---
 src/PhpWord/Shared/Html.php       |  6 +++++-
 tests/PhpWord/Shared/HtmlTest.php | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 0f5f446a..caa49034 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -664,6 +664,10 @@ class Html
         }
         self::parseInlineStyle($node, $styles['font']);
 
-        return $element->addLink($target, $node->textContent, $styles['font'], $styles['paragraph']);
+        if(strpos($target, '#') === 0) {
+          return $element->addLink(substr($target, 1), $node->textContent, $styles['font'], $styles['paragraph'], true);
+        } else {
+          return $element->addLink($target, $node->textContent, $styles['font'], $styles['paragraph']);
+        }
     }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 6122924f..2c496081 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -353,5 +353,17 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
         $this->assertEquals('link text', $doc->getElement('/w:document/w:body/w:p/w:hyperlink/w:r/w:t')->nodeValue);
+        
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $section->addBookmark('bookmark');
+        $html = '<p><a href="#bookmark">internal link text</a></p>';
+        Html::addHtml($section, $html);
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
+        $this->assertTrue($doc->getElement('/w:document/w:body/w:p/w:hyperlink')->hasAttribute('w:anchor'));
+        $this->assertEquals('bookmark', $doc->getElement('/w:document/w:body/w:p/w:hyperlink')->getAttribute('w:anchor'));
+        
     }
 }

From a7981717b343dd09ece3962d36ebaf15e6852c4b Mon Sep 17 00:00:00 2001
From: pcworld <0188801@gmail.com>
Date: Mon, 9 Apr 2018 02:45:50 +0200
Subject: [PATCH 276/370] addImage docs: Warn about user-generated strings

---
 docs/elements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index c73ffa06..f2637ac9 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -234,7 +234,7 @@ To add an image, use the ``addImage`` method to sections, headers, footers, text
 
     $section->addImage($src, [$style]);
 
-- ``$src``. String path to a local image, URL of a remote image or the image data, as a string.
+- ``$src``. String path to a local image, URL of a remote image or the image data, as a string. Warning: Do not pass user-generated strings here, as that would allow an attacker to read arbitrary files or perform server-side request forgery by passing file paths or URLs instead of image data.
 - ``$style``. See :ref:`image-style`.
 
 Examples:

From 6253adaba15a72f5310970d180e7f5b1c13a3242 Mon Sep 17 00:00:00 2001
From: pcworld <0188801@gmail.com>
Date: Mon, 9 Apr 2018 02:47:16 +0200
Subject: [PATCH 277/370] Warn about parsing user-generated HTML

---
 src/PhpWord/Shared/Html.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index d8a10b57..3f34968d 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -34,6 +34,8 @@ class Html
      * Add HTML parts.
      *
      * Note: $stylesheet parameter is removed to avoid PHPMD error for unused parameter
+     * Warning: Do not pass user-generated HTML here, as that would allow an attacker to read arbitrary
+     * files or perform server-side request forgery by passing local file paths or URLs in <img>.
      *
      * @param \PhpOffice\PhpWord\Element\AbstractContainer $element Where the parts need to be added
      * @param string $html The code to parse

From e885b371bc4793fc43ed6d8c4586cd537f810b01 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Tue, 10 Apr 2018 20:30:04 +0200
Subject: [PATCH 278/370] Add missing param annotation

---
 samples/Sample_Header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Sample_Header.php b/samples/Sample_Header.php
index faa39a35..f0fc6266 100644
--- a/samples/Sample_Header.php
+++ b/samples/Sample_Header.php
@@ -92,7 +92,7 @@ function write($phpWord, $filename, $writers)
  * Get ending notes
  *
  * @param array $writers
- *
+ * @param mixed $filename
  * @return string
  */
 function getEndingNotes($writers, $filename)

From 081c6722f62aa15a88af8fdff8dca3b58b136bb8 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Wed, 11 Apr 2018 09:56:02 +0200
Subject: [PATCH 279/370] Add support for table indent

---
 CHANGELOG.md                                  |  1 +
 docs/styles.rst                               |  1 +
 src/PhpWord/ComplexType/TblWidth.php          | 59 +++++++++++++++++++
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 24 ++++++++
 src/PhpWord/Style/Table.php                   | 24 ++++++++
 src/PhpWord/Writer/Word2007/Style/Table.php   | 16 +++++
 tests/PhpWord/Reader/Word2007/StyleTest.php   | 19 ++++++
 tests/PhpWord/Style/TableTest.php             | 11 ++++
 .../Writer/Word2007/Style/TableTest.php       | 25 +++++++-
 9 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 src/PhpWord/ComplexType/TblWidth.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b39ce1..e1d0937f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ v0.15.0 (?? ??? 2018)
 - Added support for Image text wrapping distance @troosan #1310
 - Added parsing of CSS line-height and text-indent in HTML reader @troosan #1316
 - Added the ability to enable gridlines and axislabels on charts @FrankMeyer #576
+- Add support for table indent (tblInd) @Trainmaster
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/docs/styles.rst b/docs/styles.rst
index 0bda3faf..88caeaeb 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -104,6 +104,7 @@ Available Table style options:
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
 - ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in *twip*.
+- ``indent``. Table indent from leading margin. Must be an instance of ``\PhpOffice\PhpWord\ComplexType\TblWidth``.
 - ``width``. Table width in percent.
 - ``unit``. The unit to use for the width. One of ``\PhpOffice\PhpWord\SimpleType\TblWidth``. Defaults to *auto*.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
diff --git a/src/PhpWord/ComplexType/TblWidth.php b/src/PhpWord/ComplexType/TblWidth.php
new file mode 100644
index 00000000..91dedc3d
--- /dev/null
+++ b/src/PhpWord/ComplexType/TblWidth.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2018 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\ComplexType;
+
+use PhpOffice\PhpWord\SimpleType\TblWidth as TblWidthSimpleType;
+
+/**
+ * @see http://www.datypic.com/sc/ooxml/t-w_CT_TblWidth.html
+ */
+final class TblWidth
+{
+    /** @var string */
+    private $type;
+
+    /** @var int */
+    private $value;
+
+    /**
+     * @param int $value If omitted, then its value shall be assumed to be 0.
+     * @param string $type If omitted, then its value shall be assumed to be dxa.
+     */
+    public function __construct($value = 0, $type = TblWidthSimpleType::TWIP)
+    {
+        $this->value = $value;
+        TblWidthSimpleType::validate($type);
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+}
diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index f64886cf..48a84ff2 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Reader\Word2007;
 
 use PhpOffice\Common\XMLReader;
+use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
@@ -472,6 +473,11 @@ abstract class AbstractPart
                 if ($tablePositionNode !== null) {
                     $style['position'] = $this->readTablePosition($xmlReader, $tablePositionNode);
                 }
+
+                $indentNode = $xmlReader->getElement('w:tblInd', $styleNode);
+                if ($indentNode !== null) {
+                    $style['indent'] = $this->readTableIndent($xmlReader, $indentNode);
+                }
             }
         }
 
@@ -503,6 +509,24 @@ abstract class AbstractPart
         return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
     }
 
+    /**
+     * Read w:tblInd
+     *
+     * @param \PhpOffice\Common\XMLReader $xmlReader
+     * @param \DOMElement $domNode
+     * @return TblWidthComplexType
+     */
+    private function readTableIndent(XMLReader $xmlReader, \DOMElement $domNode)
+    {
+        $styleDefs = array(
+            'value' => array(self::READ_VALUE, '.', 'w:w'),
+            'type'  => array(self::READ_VALUE, '.', 'w:type'),
+        );
+        $styleDefs = $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
+
+        return new TblWidthComplexType((int) $styleDefs['value'], $styleDefs['type']);
+    }
+
     /**
      * Read w:tcPr
      *
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index feb028da..b622c78b 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -17,6 +17,7 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\JcTable;
 use PhpOffice\PhpWord\SimpleType\TblWidth;
@@ -159,6 +160,9 @@ class Table extends Border
      */
     private $position;
 
+    /** @var TblWidthComplexType|null */
+    private $indent;
+
     /**
      * Create new table style
      *
@@ -724,4 +728,24 @@ class Table extends Border
 
         return $this;
     }
+
+    /**
+     * @return TblWidthComplexType
+     */
+    public function getIndent()
+    {
+        return $this->indent;
+    }
+
+    /**
+     * @param TblWidthComplexType $indent
+     * @return self
+     * @see http://www.datypic.com/sc/ooxml/e-w_tblInd-1.html
+     */
+    public function setIndent(TblWidthComplexType $indent)
+    {
+        $this->indent = $indent;
+
+        return $this;
+    }
 }
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index eb5af86d..7f49be7c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -79,6 +79,7 @@ class Table extends AbstractStyle
 
         $this->writeTblWidth($xmlWriter, 'w:tblW', $style->getUnit(), $style->getWidth());
         $this->writeTblWidth($xmlWriter, 'w:tblCellSpacing', TblWidth::TWIP, $style->getCellSpacing());
+        $this->writeIndent($xmlWriter, $style);
         $this->writeLayout($xmlWriter, $style->getLayout());
 
         // Position
@@ -216,4 +217,19 @@ class Table extends AbstractStyle
     {
         $this->width = $value;
     }
+
+    /**
+     * @param XMLWriter $xmlWriter
+     * @param TableStyle $style
+     */
+    private function writeIndent(XMLWriter $xmlWriter, TableStyle $style)
+    {
+        $indent = $style->getIndent();
+
+        if ($indent === null) {
+            return;
+        }
+
+        $this->writeTblWidth($xmlWriter, 'w:tblInd', $indent->getType(), $indent->getValue());
+    }
 }
diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
index 9bb6d3bd..d64079fa 100644
--- a/tests/PhpWord/Reader/Word2007/StyleTest.php
+++ b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -126,4 +126,23 @@ class StyleTest extends AbstractTestReader
         $fontStyle = $textRun->getElement(0)->getFontStyle();
         $this->assertEquals(15, $fontStyle->getPosition());
     }
+
+    public function testReadIndent()
+    {
+        $documentXml = '<w:tbl>
+            <w:tblPr>
+                <w:tblInd w:w="2160" w:type="dxa"/>
+            </w:tblPr>
+        </w:tbl>';
+
+        $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+        $elements = $phpWord->getSection(0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
+        /** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
+        $tableStyle = $elements[0]->getStyle();
+        $this->assertSame(TblWidth::TWIP, $tableStyle->getIndent()->getType());
+        $this->assertSame(2160, $tableStyle->getIndent()->getValue());
+    }
 }
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 332d31aa..91fc3550 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -17,6 +17,7 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
 use PhpOffice\PhpWord\SimpleType\JcTable;
 use PhpOffice\PhpWord\SimpleType\TblWidth;
 
@@ -57,6 +58,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($object->getBgColor());
         $this->assertEquals(Table::LAYOUT_AUTO, $object->getLayout());
         $this->assertEquals(TblWidth::AUTO, $object->getUnit());
+        $this->assertNull($object->getIndent());
     }
 
     /**
@@ -208,4 +210,13 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertNotNull($object->getPosition());
         $this->assertEquals(TablePosition::VANCHOR_PAGE, $object->getPosition()->getVertAnchor());
     }
+
+    public function testIndent()
+    {
+        $indent = new TblWidthComplexType(100, TblWidth::TWIP);
+
+        $table = new Table(array('indent' => $indent));
+
+        $this->assertSame($indent, $table->getIndent());
+    }
 }
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index 364a34d6..ec3b2483 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Style;
 
+use PhpOffice\PhpWord\ComplexType\TblWidth as TblWidthComplexType;
+use PhpOffice\PhpWord\SimpleType\TblWidth;
 use PhpOffice\PhpWord\Style\Table;
 use PhpOffice\PhpWord\Style\TablePosition;
 use PhpOffice\PhpWord\TestHelperDOCX;
@@ -75,7 +77,7 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblCellSpacing';
         $this->assertTrue($doc->elementExists($path));
         $this->assertEquals(10.3, $doc->getElementAttribute($path, 'w:w'));
-        $this->assertEquals(\PhpOffice\PhpWord\SimpleType\TblWidth::TWIP, $doc->getElementAttribute($path, 'w:type'));
+        $this->assertEquals(TblWidth::TWIP, $doc->getElementAttribute($path, 'w:type'));
     }
 
     /**
@@ -118,4 +120,25 @@ class TableTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(TablePosition::YALIGN_TOP, $doc->getElementAttribute($path, 'w:tblpYSpec'));
         $this->assertEquals(60, $doc->getElementAttribute($path, 'w:tblpY'));
     }
+
+    public function testIndent()
+    {
+        $value = 100;
+        $type = TblWidth::TWIP;
+
+        $tableStyle = new Table();
+        $tableStyle->setIndent(new TblWidthComplexType($value, $type));
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $table = $section->addTable($tableStyle);
+        $table->addRow();
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblInd';
+        $this->assertTrue($doc->elementExists($path));
+        $this->assertSame($value, (int) $doc->getElementAttribute($path, 'w:w'));
+        $this->assertSame($type, $doc->getElementAttribute($path, 'w:type'));
+    }
 }

From 853fcec1b6a20a7c5e75eeac1a33ad33a07ef527 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Tue, 10 Apr 2018 11:18:37 +0200
Subject: [PATCH 280/370] Fix documented unit for image height/width

---
 CHANGELOG.md    | 1 +
 docs/styles.rst | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b39ce1..7dcefac2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ v0.15.0 (?? ??? 2018)
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
+- The default unit for `\PhpOffice\PhpWord\Style\Image` changed from `px` to `pt`.
 
 
 v0.14.0 (29 Dec 2017)
diff --git a/docs/styles.rst b/docs/styles.rst
index 0bda3faf..8cb6fa23 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -149,10 +149,10 @@ Image
 Available Image style options:
 
 - ``alignment``. See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
-- ``height``. Height in pixels.
+- ``height``. Height in *pt*.
 - ``marginLeft``. Left margin in inches, can be negative.
 - ``marginTop``. Top margin in inches, can be negative.
-- ``width``. Width in pixels.
+- ``width``. Width in *pt*.
 - ``wrappingStyle``. Wrapping style, *inline*, *square*, *tight*, *behind*, or *infront*.
 - ``wrapDistanceTop``. Top text wrapping in pixels.
 - ``wrapDistanceBottom``. Bottom text wrapping in pixels.

From 833cf07c1acfe86b4bb5ca9786692a59991f2643 Mon Sep 17 00:00:00 2001
From: Frank Liepert <trainmaster@gmx.net>
Date: Tue, 10 Apr 2018 11:19:15 +0200
Subject: [PATCH 281/370] Consistently format "pt" unit

---
 docs/elements.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/elements.rst b/docs/elements.rst
index 8f33b503..dd398e46 100644
--- a/docs/elements.rst
+++ b/docs/elements.rst
@@ -435,8 +435,8 @@ Available line style attributes:
 - ``dash``. Line types: dash, rounddot, squaredot, dashdot, longdash, longdashdot, longdashdotdot.
 - ``beginArrow``. Start type of arrow: block, open, classic, diamond, oval.
 - ``endArrow``. End type of arrow: block, open, classic, diamond, oval.
-- ``width``. Line-object width in pt.
-- ``height``. Line-object height in pt.
+- ``width``. Line-object width in *pt*.
+- ``height``. Line-object height in *pt*.
 - ``flip``. Flip the line element: true, false.
 
 Chart

From 9bc85347ef074a2e4c3bf983e2b68c235adefc02 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Apr 2018 21:15:36 +0200
Subject: [PATCH 282/370] fix code formatting

---
 CHANGELOG.md                      | 1 +
 src/PhpWord/Shared/Html.php       | 8 ++++----
 tests/PhpWord/Shared/HtmlTest.php | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dcefac2..fb07fcc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ v0.15.0 (?? ??? 2018)
 - Added support for Image text wrapping distance @troosan #1310
 - Added parsing of CSS line-height and text-indent in HTML reader @troosan #1316
 - Added the ability to enable gridlines and axislabels on charts @FrankMeyer #576
+- Added parsing of internal links in HTML reader @lalop #1336
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index e27e706e..7d8ee51f 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -723,10 +723,10 @@ class Html
         }
         self::parseInlineStyle($node, $styles['font']);
 
-        if(strpos($target, '#') === 0) {
-          return $element->addLink(substr($target, 1), $node->textContent, $styles['font'], $styles['paragraph'], true);
-        } else {
-          return $element->addLink($target, $node->textContent, $styles['font'], $styles['paragraph']);
+        if (strpos($target, '#') === 0) {
+            return $element->addLink(substr($target, 1), $node->textContent, $styles['font'], $styles['paragraph'], true);
         }
+
+        return $element->addLink($target, $node->textContent, $styles['font'], $styles['paragraph']);
     }
 }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index c9e4b4b1..9ec2249d 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -453,7 +453,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
         $this->assertEquals('link text', $doc->getElement('/w:document/w:body/w:p/w:hyperlink/w:r/w:t')->nodeValue);
-        
+
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
         $section->addBookmark('bookmark');
@@ -464,7 +464,6 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
         $this->assertTrue($doc->getElement('/w:document/w:body/w:p/w:hyperlink')->hasAttribute('w:anchor'));
         $this->assertEquals('bookmark', $doc->getElement('/w:document/w:body/w:p/w:hyperlink')->getAttribute('w:anchor'));
-        
     }
 
     public function testParseMalformedStyleIsIgnored()

From dd27f668e0143198348d0882ee632e33a1baa111 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Apr 2018 22:42:58 +0200
Subject: [PATCH 283/370] add line height test

[ci skip]
---
 tests/PhpWord/Shared/HtmlTest.php                | 5 +++++
 tests/PhpWord/Writer/Word2007/ElementTest.php    | 2 +-
 tests/PhpWord/Writer/Word2007/Style/FontTest.php | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 9ec2249d..f07b3f99 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -125,6 +125,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $section = $phpWord->addSection();
         Html::addHtml($section, '<p style="line-height: 1.5;">test</p>');
         Html::addHtml($section, '<p style="line-height: 15pt;">test</p>');
+        Html::addHtml($section, '<p style="line-height: 120%;">test</p>');
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:spacing'));
@@ -134,6 +135,10 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:pPr/w:spacing'));
         $this->assertEquals(300, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:line'));
         $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:lineRule'));
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[3]/w:pPr/w:spacing'));
+        $this->assertEquals(Paragraph::LINE_HEIGHT * 1.2, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:line'));
+        $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:lineRule'));
     }
 
     /**
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 979a4337..d365861a 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -256,7 +256,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
-        $style = array('width' => 1000000, 'height' => 1000000);
+        $style = array('width' => 1000000, 'height' => 1000000, 'showAxisLabels' => true, 'showGridX' => true, 'showGridY' => true);
 
         $chartTypes = array('pie', 'doughnut', 'bar', 'line', 'area', 'scatter', 'radar');
         $categories = array('A', 'B', 'C', 'D', 'E');
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index c57f50ab..ccfffbfb 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -43,7 +43,7 @@ class FontTest extends \PHPUnit\Framework\TestCase
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();
         $textrun = $section->addTextRun();
-        $textrun->addText('سلام این یک پاراگراف راست به چپ است', array('rtl' => true));
+        $textrun->addText('سلام این یک پاراگراف راست به چپ است', array('rtl' => true, 'lang' => 'ar-DZ'));
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
 
         $file = 'word/document.xml';

From 85e1e5c280b89b45104ad7c270a9c07cada8d718 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Apr 2018 23:21:02 +0200
Subject: [PATCH 284/370] fix warning

---
 src/PhpWord/ComplexType/TblWidth.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/ComplexType/TblWidth.php b/src/PhpWord/ComplexType/TblWidth.php
index 91dedc3d..0d1a2419 100644
--- a/src/PhpWord/ComplexType/TblWidth.php
+++ b/src/PhpWord/ComplexType/TblWidth.php
@@ -31,8 +31,8 @@ final class TblWidth
     private $value;
 
     /**
-     * @param int $value If omitted, then its value shall be assumed to be 0.
-     * @param string $type If omitted, then its value shall be assumed to be dxa.
+     * @param int $value If omitted, then its value shall be assumed to be 0
+     * @param string $type If omitted, then its value shall be assumed to be dxa
      */
     public function __construct($value = 0, $type = TblWidthSimpleType::TWIP)
     {

From c52c96d6573363f764d7bfba42be3ce998d1dc0e Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 17 Apr 2018 07:34:57 +0200
Subject: [PATCH 285/370] add support for STYLEREF field

---
 samples/Sample_27_Field.php                   | 5 +++++
 src/PhpWord/Element/Field.php                 | 4 ++++
 src/PhpWord/Writer/Word2007/Element/Field.php | 3 +++
 tests/PhpWord/Writer/Word2007/ElementTest.php | 1 +
 4 files changed, 13 insertions(+)

diff --git a/samples/Sample_27_Field.php b/samples/Sample_27_Field.php
index 9c37dffe..4e7a5b22 100644
--- a/samples/Sample_27_Field.php
+++ b/samples/Sample_27_Field.php
@@ -6,15 +6,20 @@ include_once 'Sample_Header.php';
 // New Word document
 echo date('H:i:s'), ' Create new PhpWord object', EOL;
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
+PhpOffice\PhpWord\Style::addTitleStyle(1, array('size' => 14));
 
 // New section
 $section = $phpWord->addSection();
+$section->addTitle('This page demos fields');
 
 // Add Field elements
 // See Element/Field.php for all options
 $section->addText('Date field:');
 $section->addField('DATE', array('dateformat' => 'dddd d MMMM yyyy H:mm:ss'), array('PreserveFormat'));
 
+$section->addText('Style Ref field:');
+$section->addField('STYLEREF', array('StyleIdentifier' => 'Heading 1'));
+
 $section->addText('Page field:');
 $section->addField('PAGE', array('format' => 'Arabic'));
 
diff --git a/src/PhpWord/Element/Field.php b/src/PhpWord/Element/Field.php
index 0e5e28ed..2efc6b0b 100644
--- a/src/PhpWord/Element/Field.php
+++ b/src/PhpWord/Element/Field.php
@@ -78,6 +78,10 @@ class Field extends AbstractElement
             'properties' => array(),
             'options'    => array('PreserveFormat'),
         ),
+        'STYLEREF' => array(
+            'properties' => array('StyleIdentifier' => ''),
+            'options'    => array('PreserveFormat'),
+        ),
     );
 
     /**
diff --git a/src/PhpWord/Writer/Word2007/Element/Field.php b/src/PhpWord/Writer/Word2007/Element/Field.php
index cf3fbd66..e79dd24a 100644
--- a/src/PhpWord/Writer/Word2007/Element/Field.php
+++ b/src/PhpWord/Writer/Word2007/Element/Field.php
@@ -177,6 +177,9 @@ class Field extends Text
                 case 'macroname':
                     $propertiesAndOptions .= $propval . ' ';
                     break;
+                default:
+                    $propertiesAndOptions .= '"' . $propval . '" ';
+                    break;
             }
         }
 
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index d365861a..25c62ecc 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -288,6 +288,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $section->addField('DATE', array(), array('LunarCalendar'));
         $section->addField('DATE', array(), array('SakaEraCalendar'));
         $section->addField('NUMPAGES', array('format' => 'roman', 'numformat' => '0,00'), array('SakaEraCalendar'));
+        $section->addField('STYLEREF', array('StyleIdentifier' => 'Heading 1'));
         $doc = TestHelperDOCX::getDocument($phpWord);
 
         $element = '/w:document/w:body/w:p/w:r/w:instrText';

From b147919a64d86dbdf878130c413c310e4c167200 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 18 Apr 2018 22:34:53 +0200
Subject: [PATCH 286/370] write column width in ODT writer

---
 CHANGELOG.md                                  |  1 +
 src/PhpWord/Element/Table.php                 | 24 +++++++
 src/PhpWord/Style/Table.php                   | 27 ++++++++
 src/PhpWord/Writer/ODText/Element/Table.php   | 63 ++++++++++++++-----
 src/PhpWord/Writer/ODText/Part/Content.php    |  1 +
 src/PhpWord/Writer/ODText/Style/Table.php     | 13 ++++
 src/PhpWord/Writer/Word2007/Element/Table.php | 16 +----
 7 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb07fcc2..7a49f25e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ v0.15.0 (?? ??? 2018)
 - Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
+- Fix missing column with in ODText writer @potofcoffee #413
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 10c4db69..16102119 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -149,4 +149,28 @@ class Table extends AbstractElement
 
         return $columnCount;
     }
+
+    /**
+     * The first declared cell width for each column
+     *
+     * @return int[]
+     */
+    public function findFirstDefinedCellWidths()
+    {
+        $cellWidths = array();
+        if (is_array($this->rows)) {
+            foreach ($this->rows as $row) {
+                $cells = $row->getCells();
+                if (count($cells) <= count($cellWidths)) {
+                    continue;
+                }
+                $cellWidths = array();
+                foreach ($cells as $cell) {
+                    $cellWidths[] = $cell->getWidth();
+                }
+            }
+        }
+
+        return $cellWidths;
+    }
 }
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index feb028da..5d4a0150 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -159,6 +159,13 @@ class Table extends Border
      */
     private $position;
 
+    /**
+     * The width of each column, computed based on the max cell width of each column
+     *
+     * @var int[]
+     */
+    private $columnWidths;
+
     /**
      * Create new table style
      *
@@ -724,4 +731,24 @@ class Table extends Border
 
         return $this;
     }
+
+    /**
+     * Get the columnWidths
+     *
+     * @return number[]
+     */
+    public function getColumnWidths()
+    {
+        return $this->columnWidths;
+    }
+
+    /**
+     * The column widths
+     *
+     * @param int[] $value
+     */
+    public function setColumnWidths(array $value = null)
+    {
+        $this->columnWidths = $value;
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index 8a21ee1b..088330ae 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -17,6 +17,10 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
+use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Row as RowElement;
+use PhpOffice\PhpWord\Element\Table as TableElement;
+
 /**
  * Table element writer
  *
@@ -36,32 +40,59 @@ class Table extends AbstractElement
         }
         $rows = $element->getRows();
         $rowCount = count($rows);
-        $colCount = $element->countColumns();
 
         if ($rowCount > 0) {
             $xmlWriter->startElement('table:table');
             $xmlWriter->writeAttribute('table:name', $element->getElementId());
             $xmlWriter->writeAttribute('table:style', $element->getElementId());
 
-            $xmlWriter->startElement('table:table-column');
-            $xmlWriter->writeAttribute('table:number-columns-repeated', $colCount);
-            $xmlWriter->endElement(); // table:table-column
+            // Write columns
+            $this->writeColumns($xmlWriter, $element);
 
+            // Write rows
             foreach ($rows as $row) {
-                $xmlWriter->startElement('table:table-row');
-                /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
-                foreach ($row->getCells() as $cell) {
-                    $xmlWriter->startElement('table:table-cell');
-                    $xmlWriter->writeAttribute('office:value-type', 'string');
-
-                    $containerWriter = new Container($xmlWriter, $cell);
-                    $containerWriter->write();
-
-                    $xmlWriter->endElement(); // table:table-cell
-                }
-                $xmlWriter->endElement(); // table:table-row
+                $this->writeRow($xmlWriter, $row);
             }
             $xmlWriter->endElement(); // table:table
         }
     }
+
+    /**
+     * Write column.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Table $element
+     */
+    private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
+    {
+        $colCount = $element->countColumns();
+
+        for ($i = 0; $i < $colCount; $i++) {
+            $xmlWriter->startElement('table:table-column');
+            $xmlWriter->writeAttribute('table:style-name', $element->getElementId() . '.' . $i);
+            $xmlWriter->endElement();
+        }
+    }
+
+    /**
+     * Write row.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Row $row
+     */
+    private function writeRow(XMLWriter $xmlWriter, RowElement $row)
+    {
+        $xmlWriter->startElement('table:table-row');
+        /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
+        foreach ($row->getCells() as $cell) {
+            $xmlWriter->startElement('table:table-cell');
+            $xmlWriter->writeAttribute('office:value-type', 'string');
+
+            $containerWriter = new Container($xmlWriter, $cell);
+            $containerWriter->write();
+
+            $xmlWriter->endElement(); // table:table-cell
+        }
+        $xmlWriter->endElement(); // table:table-row
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index a50eea7b..b705bb5e 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -246,6 +246,7 @@ class Content extends AbstractPart
                     $style = Style::getStyle($style);
                 }
                 $style->setStyleName($element->getElementId());
+                $style->setColumnWidths($element->findFirstDefinedCellWidths());
                 $this->autoStyles['Table'][] = $style;
             }
         }
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index 249321cf..f5a3c431 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -45,5 +45,18 @@ class Table extends AbstractStyle
         $xmlWriter->writeAttribute('table:align', 'center');
         $xmlWriter->endElement(); // style:table-properties
         $xmlWriter->endElement(); // style:style
+
+        $cellWidths = $style->getColumnWidths();
+
+        for ($i = 0; $i < count($cellWidths); $i++) {
+            $width = $cellWidths[$i];
+            $xmlWriter->startElement('style:style');
+            $xmlWriter->writeAttribute('style:name', $style->getStyleName() . '.' . $i);
+            $xmlWriter->writeAttribute('style:family', 'table-column');
+            $xmlWriter->startElement('style:table-column-properties');
+            $xmlWriter->writeAttribute('style:column-width', number_format($width * 0.0017638889, 2, '.', '') . 'cm');
+            $xmlWriter->endElement(); // style:table-column-properties
+            $xmlWriter->endElement(); // style:style
+        }
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index 25a48ab2..c365b028 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -76,21 +76,7 @@ class Table extends AbstractElement
      */
     private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
     {
-        $rows = $element->getRows();
-        $rowCount = count($rows);
-
-        $cellWidths = array();
-        for ($i = 0; $i < $rowCount; $i++) {
-            $row = $rows[$i];
-            $cells = $row->getCells();
-            if (count($cells) <= count($cellWidths)) {
-                continue;
-            }
-            $cellWidths = array();
-            foreach ($cells as $cell) {
-                $cellWidths[] = $cell->getWidth();
-            }
-        }
+        $cellWidths = $element->findFirstDefinedCellWidths();
 
         $xmlWriter->startElement('w:tblGrid');
         foreach ($cellWidths as $width) {

From 5ec2c8560efbcc7c0daa888f9025f6e5164ffbd8 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 25 Apr 2018 22:33:48 +0200
Subject: [PATCH 287/370] do not push code coverage after build of develop
 branch

[ci skip]
---
 .travis_shell_after_success.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis_shell_after_success.sh b/.travis_shell_after_success.sh
index 12728526..06feddaa 100644
--- a/.travis_shell_after_success.sh
+++ b/.travis_shell_after_success.sh
@@ -5,7 +5,7 @@ echo "TRAVIS_REPO_SLUG: $TRAVIS_REPO_SLUG"
 echo "TRAVIS_PHP_VERSION: $TRAVIS_PHP_VERSION"
 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
 
-if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then
+if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_BRANCH" != "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then
 
   echo -e "Publishing PHPDoc...\n"
 

From 94be56b0ec6fcbb43d8a48bae9e74d3d93c5beb7 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 25 Apr 2018 23:57:07 +0200
Subject: [PATCH 288/370] fix parsing of link style

---
 samples/Sample_26_Html.php        | 2 +-
 src/PhpWord/Shared/Html.php       | 2 +-
 tests/PhpWord/Shared/HtmlTest.php | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_26_Html.php b/samples/Sample_26_Html.php
index d8763805..e1823c43 100644
--- a/samples/Sample_26_Html.php
+++ b/samples/Sample_26_Html.php
@@ -11,7 +11,7 @@ $html = '<h1>Adding element via HTML</h1>';
 $html .= '<p>Some well-formed HTML snippet needs to be used</p>';
 $html .= '<p>With for example <strong>some<sup>1</sup> <em>inline</em> formatting</strong><sub>1</sub></p>';
 
-$html .= '<p>A link to <a href="http://phpword.readthedocs.io/">Read the docs</a></p>';
+$html .= '<p>A link to <a href="http://phpword.readthedocs.io/" style="text-decoration: underline">Read the docs</a></p>';
 
 $html .= '<p lang="he-IL" style="text-align: right; direction: rtl">היי, זה פסקה מימין לשמאל</p>';
 
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 7d8ee51f..cbdcecd5 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -721,7 +721,7 @@ class Html
                     break;
             }
         }
-        self::parseInlineStyle($node, $styles['font']);
+        $styles['font'] = self::parseInlineStyle($node, $styles['font']);
 
         if (strpos($target, '#') === 0) {
             return $element->addLink(substr($target, 1), $node->textContent, $styles['font'], $styles['paragraph'], true);
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index f07b3f99..b61418e0 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -458,6 +458,8 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink'));
         $this->assertEquals('link text', $doc->getElement('/w:document/w:body/w:p/w:hyperlink/w:r/w:t')->nodeValue);
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:hyperlink/w:r/w:rPr/w:u'));
+        $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:hyperlink/w:r/w:rPr/w:u', 'w:val'));
 
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();

From 96a47ec0ae5a88f752de16226cc950bae2ea760c Mon Sep 17 00:00:00 2001
From: Christian Zosel <christian.zosel@adfinis-sygroup.ch>
Date: Thu, 26 Apr 2018 08:41:00 +0200
Subject: [PATCH 289/370] Drop GitHub pages

First step to fix #1355
---
 .travis.yml                    |  2 --
 .travis_shell_after_success.sh | 39 ----------------------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 .travis_shell_after_success.sh

diff --git a/.travis.yml b/.travis.yml
index 281c2630..52fa9580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,5 @@ script:
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 
 after_script:
-    ## PHPDocumentor
-    - bash .travis_shell_after_success.sh
     ## Scrutinizer
     - if [ -n "$COVERAGE" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
diff --git a/.travis_shell_after_success.sh b/.travis_shell_after_success.sh
deleted file mode 100644
index 06feddaa..00000000
--- a/.travis_shell_after_success.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-echo "--DEBUG--"
-echo "TRAVIS_REPO_SLUG: $TRAVIS_REPO_SLUG"
-echo "TRAVIS_PHP_VERSION: $TRAVIS_PHP_VERSION"
-echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
-
-if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_BRANCH" != "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then
-
-  echo -e "Publishing PHPDoc...\n"
-
-  cp -R build/docs $HOME/docs-latest
-  cp -R build/coverage $HOME/coverage-latest
-
-  cd $HOME
-  git config --global user.email "travis@travis-ci.org"
-  git config --global user.name "travis-ci"
-  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/PHPOffice/PHPWord gh-pages > /dev/null
-
-  cd gh-pages
-  echo "--DEBUG : Suppression"
-  git rm -rf ./docs/$TRAVIS_BRANCH
-
-  echo "--DEBUG : Dossier"
-  mkdir -p docs/$TRAVIS_BRANCH
-  mkdir -p coverage/$TRAVIS_BRANCH
-
-  echo "--DEBUG : Copie"
-  cp -Rf $HOME/docs-latest/* ./docs/$TRAVIS_BRANCH/
-  cp -Rf $HOME/coverage-latest/* ./coverage/$TRAVIS_BRANCH/
-
-  echo "--DEBUG : Git"
-  git add -f .
-  git commit -m "PHPDocumentor (Travis Build: $TRAVIS_BUILD_NUMBER  - Branch: $TRAVIS_BRANCH)"
-  git push -fq origin gh-pages > /dev/null
-
-  echo -e "Published PHPDoc to gh-pages.\n"
-
-fi

From 65b0f062ad05836d939a76b3f62fdae0e0895e0c Mon Sep 17 00:00:00 2001
From: JAEK-S <jake.salgado@gmail.com>
Date: Fri, 11 May 2018 14:50:19 -0600
Subject: [PATCH 290/370] New features when creating charts (#1332)

* add stacked bar and column charts
* add chart colors feature
* adding preliminary chart axis title functionality to XMLwriter
* added percent_stacked to available types array
* Make tick mark and tick label positions configurable
* scrutinizer fixes
* update changelog
---
 CHANGELOG.md                               |   1 +
 samples/Sample_32_Chart.php                |   4 +-
 src/PhpWord/Element/Chart.php              |  16 +-
 src/PhpWord/Style/Chart.php                | 212 +++++++++++++++++++++
 src/PhpWord/Writer/Word2007/Part/Chart.php | 131 +++++++++++--
 tests/PhpWord/Style/ChartTest.php          | 188 ++++++++++++++++++
 6 files changed, 531 insertions(+), 21 deletions(-)
 create mode 100644 tests/PhpWord/Style/ChartTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b5d7767..fdb2b22b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ v0.15.0 (?? ??? 2018)
 - Added the ability to enable gridlines and axislabels on charts @FrankMeyer #576
 - Add support for table indent (tblInd) @Trainmaster #1343
 - Added parsing of internal links in HTML reader @lalop #1336
+- Several improvements to charts @JAEK-S #1332
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/samples/Sample_32_Chart.php b/samples/Sample_32_Chart.php
index 87d6f3e3..c24a6f8e 100644
--- a/samples/Sample_32_Chart.php
+++ b/samples/Sample_32_Chart.php
@@ -16,8 +16,8 @@ $section = $phpWord->addSection();
 $section->addTitle('2D charts', 1);
 $section = $phpWord->addSection(array('colsNum' => 2, 'breakType' => 'continuous'));
 
-$chartTypes = array('pie', 'doughnut', 'bar', 'column', 'line', 'area', 'scatter', 'radar');
-$twoSeries = array('bar', 'column', 'line', 'area', 'scatter', 'radar');
+$chartTypes = array('pie', 'doughnut', 'bar', 'column', 'line', 'area', 'scatter', 'radar', 'stacked_bar', 'percent_stacked_bar', 'stacked_column', 'percent_stacked_column');
+$twoSeries = array('bar', 'column', 'line', 'area', 'scatter', 'radar', 'stacked_bar', 'percent_stacked_bar', 'stacked_column', 'percent_stacked_column');
 $threeSeries = array('bar', 'line');
 $categories = array('A', 'B', 'C', 'D', 'E');
 $series1 = array(1, 3, 2, 5, 4);
diff --git a/src/PhpWord/Element/Chart.php b/src/PhpWord/Element/Chart.php
index 755f45e1..92152c87 100644
--- a/src/PhpWord/Element/Chart.php
+++ b/src/PhpWord/Element/Chart.php
@@ -61,11 +61,12 @@ class Chart extends AbstractElement
      * @param array $categories
      * @param array $values
      * @param array $style
+     * @param null|mixed $seriesName
      */
-    public function __construct($type, $categories, $values, $style = null)
+    public function __construct($type, $categories, $values, $style = null, $seriesName = null)
     {
         $this->setType($type);
-        $this->addSeries($categories, $values);
+        $this->addSeries($categories, $values, $seriesName);
         $this->style = $this->setNewStyle(new ChartStyle(), $style, true);
     }
 
@@ -86,7 +87,7 @@ class Chart extends AbstractElement
      */
     public function setType($value)
     {
-        $enum = array('pie', 'doughnut', 'line', 'bar', 'column', 'area', 'radar', 'scatter');
+        $enum = array('pie', 'doughnut', 'line', 'bar', 'stacked_bar', 'percent_stacked_bar', 'column', 'stacked_column', 'percent_stacked_column', 'area', 'radar', 'scatter');
         $this->type = $this->setEnumVal($value, $enum, 'pie');
     }
 
@@ -95,10 +96,15 @@ class Chart extends AbstractElement
      *
      * @param array $categories
      * @param array $values
+     * @param null|mixed $name
      */
-    public function addSeries($categories, $values)
+    public function addSeries($categories, $values, $name = null)
     {
-        $this->series[] = array('categories' => $categories, 'values' => $values);
+        $this->series[] = array(
+            'categories' => $categories,
+            'values'     => $values,
+            'name'       => $name,
+        );
     }
 
     /**
diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 041736be..5b02e636 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -46,6 +46,60 @@ class Chart extends AbstractStyle
     private $is3d = false;
 
     /**
+     * A list of colors to use in the chart
+     *
+     * @var array
+     */
+    private $colors = array();
+
+    /**
+     * A list of display options for data labels
+     *
+     * @var array
+     */
+    private $dataLabelOptions = array(
+        'showVal'          => true, // value
+        'showCatName'      => true, // category name
+        'showLegendKey'    => false, //show the cart legend
+        'showSerName'      => false, // series name
+        'showPercent'      => false,
+        'showLeaderLines'  => false,
+        'showBubbleSize'   => false,
+    );
+
+    /**
+     * A string that tells the writer where to write chart labels or to skip
+     * "nextTo" - sets labels next to the axis (bar graphs on the left) (default)
+     * "low" - labels on the left side of the graph
+     * "high" - labels on the right side of the graph
+     *
+     * @var string
+     */
+    private $categoryLabelPosition = 'nextTo';
+
+    /**
+     * A string that tells the writer where to write chart labels or to skip
+     * "nextTo" - sets labels next to the axis (bar graphs on the bottom) (default)
+     * "low" - labels are below the graph
+     * "high" - labels above the graph
+     *
+     * @var string
+     */
+    private $valueLabelPosition = 'nextTo';
+
+    /**
+     * @var string
+     */
+    private $categoryAxisTitle;
+
+    /**
+     * @var string
+     */
+    private $valueAxisTitle;
+
+    private $majorTickMarkPos = 'none';
+
+    /*
      * Show labels for axis
      *
      * @var bool
@@ -146,6 +200,28 @@ class Chart extends AbstractStyle
     }
 
     /**
+     * Get the list of colors to use in a chart.
+     *
+     * @return array
+     */
+    public function getColors()
+    {
+        return $this->colors;
+    }
+
+    /**
+     * Set the colors to use in a chart.
+     *
+     * @param array $value a list of colors to use in the chart
+     */
+    public function setColors($value = array())
+    {
+        $this->colors = $value;
+
+        return $this;
+    }
+
+    /*
      * Show labels for axis
      *
      * @return bool
@@ -169,6 +245,31 @@ class Chart extends AbstractStyle
     }
 
     /**
+     * get the list of options for data labels
+     *
+     * @return array
+     */
+    public function getDataLabelOptions()
+    {
+        return $this->dataLabelOptions;
+    }
+
+    /**
+     * Set values for data label options.
+     * This will only change values for options defined in $this->dataLabelOptions, and cannot create new ones.
+     *
+     * @param array $values [description]
+     */
+    public function setDataLabelOptions($values = array())
+    {
+        foreach (array_keys($this->dataLabelOptions) as $option) {
+            if (isset($values[$option])) {
+                $this->dataLabelOptions[$option] = $this->setBoolVal($values[$option], $this->dataLabelOptions[$option]);
+            }
+        }
+    }
+
+    /*
      * Show Gridlines for Y-Axis
      *
      * @return bool
@@ -192,6 +293,117 @@ class Chart extends AbstractStyle
     }
 
     /**
+     * Get the categoryLabelPosition setting
+     *
+     * @return string
+     */
+    public function getCategoryLabelPosition()
+    {
+        return $this->categoryLabelPosition;
+    }
+
+    /**
+     * Set the categoryLabelPosition setting
+     * "none" - skips writing  labels
+     * "nextTo" - sets labels next to the  (bar graphs on the left)
+     * "low" - labels on the left side of the graph
+     * "high" - labels on the right side of the graph
+     *
+     * @param mixed $labelPosition
+     * @return self
+     */
+    public function setCategoryLabelPosition($labelPosition)
+    {
+        $enum = array('nextTo', 'low', 'high');
+        $this->categoryLabelPosition = $this->setEnumVal($labelPosition, $enum, $this->categoryLabelPosition);
+
+        return $this;
+    }
+
+    /**
+     * Get the valueAxisLabelPosition setting
+     *
+     * @return string
+     */
+    public function getValueLabelPosition()
+    {
+        return $this->valueLabelPosition;
+    }
+
+    /**
+     * Set the valueLabelPosition setting
+     * "none" - skips writing labels
+     * "nextTo" - sets labels next to the value
+     * "low" - sets labels are below the graph
+     * "high" - sets labels above the graph
+     *
+     * @param string
+     * @param mixed $labelPosition
+     */
+    public function setValueLabelPosition($labelPosition)
+    {
+        $enum = array('nextTo', 'low', 'high');
+        $this->valueLabelPosition = $this->setEnumVal($labelPosition, $enum, $this->valueLabelPosition);
+
+        return $this;
+    }
+
+    /**
+     * Get the categoryAxisTitle
+     * @return string
+     */
+    public function getCategoryAxisTitle()
+    {
+        return $this->categoryAxisTitle;
+    }
+
+    /**
+     * Set the title that appears on the category side of the chart
+     * @param string $axisTitle
+     */
+    public function setCategoryAxisTitle($axisTitle)
+    {
+        $this->categoryAxisTitle = $axisTitle;
+
+        return $this;
+    }
+
+    /**
+     * Get the valueAxisTitle
+     * @return string
+     */
+    public function getValueAxisTitle()
+    {
+        return $this->valueAxisTitle;
+    }
+
+    /**
+     * Set the title that appears on the value side of the chart
+     * @param string $axisTitle
+     */
+    public function setValueAxisTitle($axisTitle)
+    {
+        $this->valueAxisTitle = $axisTitle;
+
+        return $this;
+    }
+
+    public function getMajorTickPosition()
+    {
+        return $this->majorTickMarkPos;
+    }
+
+    /**
+     * set the position for major tick marks
+     * @param string $position [description]
+     */
+    public function setMajorTickPosition($position)
+    {
+        $enum = array('in', 'out', 'cross', 'none');
+        $this->majorTickMarkPos = $this->setEnumVal($position, $enum, $this->majorTickMarkPos);
+    }
+
+    /*
      * Show Gridlines for X-Axis
      *
      * @return bool
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 2aeccca0..17c1fd54 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -41,14 +41,18 @@ class Chart extends AbstractPart
      * @var array
      */
     private $types = array(
-        'pie'       => array('type' => 'pie', 'colors' => 1),
-        'doughnut'  => array('type' => 'doughnut', 'colors' => 1, 'hole' => 75, 'no3d' => true),
-        'bar'       => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar'),
-        'column'    => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col'),
-        'line'      => array('type' => 'line', 'colors' => 0, 'axes' => true),
-        'area'      => array('type' => 'area', 'colors' => 0, 'axes' => true),
-        'radar'     => array('type' => 'radar', 'colors' => 0, 'axes' => true, 'radar' => 'standard', 'no3d' => true),
-        'scatter'   => array('type' => 'scatter', 'colors' => 0, 'axes' => true, 'scatter' => 'marker', 'no3d' => true),
+        'pie'                    => array('type' => 'pie', 'colors' => 1),
+        'doughnut'               => array('type' => 'doughnut', 'colors' => 1, 'hole' => 75, 'no3d' => true),
+        'bar'                    => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'clustered'),
+        'stacked_bar'            => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'stacked'),
+        'percent_stacked_bar'    => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'bar', 'grouping' => 'percentStacked'),
+        'column'                 => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'clustered'),
+        'stacked_column'         => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'stacked'),
+        'percent_stacked_column' => array('type' => 'bar', 'colors' => 0, 'axes' => true, 'bar' => 'col', 'grouping' => 'percentStacked'),
+        'line'                   => array('type' => 'line', 'colors' => 0, 'axes' => true),
+        'area'                   => array('type' => 'area', 'colors' => 0, 'axes' => true),
+        'radar'                  => array('type' => 'radar', 'colors' => 0, 'axes' => true, 'radar' => 'standard', 'no3d' => true),
+        'scatter'                => array('type' => 'scatter', 'colors' => 0, 'axes' => true, 'scatter' => 'marker', 'no3d' => true),
     );
 
     /**
@@ -145,7 +149,7 @@ class Chart extends AbstractPart
         }
         if (isset($this->options['bar'])) {
             $xmlWriter->writeElementBlock('c:barDir', 'val', $this->options['bar']); // bar|col
-            $xmlWriter->writeElementBlock('c:grouping', 'val', 'clustered'); // 3d; standard = percentStacked
+            $xmlWriter->writeElementBlock('c:grouping', 'val', $this->options['grouping']); // 3d; standard = percentStacked
         }
         if (isset($this->options['radar'])) {
             $xmlWriter->writeElementBlock('c:radarStyle', 'val', $this->options['radar']);
@@ -157,6 +161,8 @@ class Chart extends AbstractPart
         // Series
         $this->writeSeries($xmlWriter, isset($this->options['scatter']));
 
+        $xmlWriter->writeElementBlock('c:overlap', 'val', '100');
+
         // Axes
         if (isset($this->options['axes'])) {
             $xmlWriter->writeElementBlock('c:axId', 'val', 1);
@@ -183,6 +189,8 @@ class Chart extends AbstractPart
     private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
     {
         $series = $this->element->getSeries();
+        $style = $this->element->getStyle();
+        $colors = $style->getColors();
 
         $index = 0;
         foreach ($series as $seriesItem) {
@@ -194,6 +202,32 @@ class Chart extends AbstractPart
             $xmlWriter->writeElementBlock('c:idx', 'val', $index);
             $xmlWriter->writeElementBlock('c:order', 'val', $index);
 
+            if (!is_null($seriesItem['name']) && $seriesItem['name'] != '') {
+                $xmlWriter->startElement('c:tx');
+                $xmlWriter->startElement('c:strRef');
+                $xmlWriter->startElement('c:strCache');
+                $xmlWriter->writeElementBlock('c:ptCount', 'val', 1);
+                $xmlWriter->startElement('c:pt');
+                $xmlWriter->writeAttribute('idx', 0);
+                $xmlWriter->startElement('c:v');
+                $xmlWriter->writeRaw($seriesItem['name']);
+                $xmlWriter->endElement(); // c:v
+                $xmlWriter->endElement(); // c:pt
+                $xmlWriter->endElement(); // c:strCache
+                $xmlWriter->endElement(); // c:strRef
+                $xmlWriter->endElement(); // c:tx
+            }
+
+            // The c:dLbls was added to make word charts look more like the reports in SurveyGizmo
+            // This section needs to be made configurable before a pull request is made
+            $xmlWriter->startElement('c:dLbls');
+
+            foreach ($style->getDataLabelOptions() as $option => $val) {
+                $xmlWriter->writeElementBlock("c:{$option}", 'val', (int) $val);
+            }
+
+            $xmlWriter->endElement(); // c:dLbls
+
             if (isset($this->options['scatter'])) {
                 $this->writeShape($xmlWriter);
             }
@@ -204,6 +238,26 @@ class Chart extends AbstractPart
             } else {
                 $this->writeSeriesItem($xmlWriter, 'cat', $categories);
                 $this->writeSeriesItem($xmlWriter, 'val', $values);
+
+                // setting the chart colors was taken from https://github.com/PHPOffice/PHPWord/issues/494
+                if (is_array($colors) && count($colors)) {
+                    // This is a workaround to make each series in a stack chart use a different color
+                    if ($this->options['type'] == 'bar' && stristr($this->options['grouping'], 'stacked')) {
+                        array_shift($colors);
+                    }
+                    $colorIndex = 0;
+                    foreach ($colors as $color) {
+                        $xmlWriter->startElement('c:dPt');
+                        $xmlWriter->writeElementBlock('c:idx', 'val', $colorIndex);
+                        $xmlWriter->startElement('c:spPr');
+                        $xmlWriter->startElement('a:solidFill');
+                        $xmlWriter->writeElementBlock('a:srgbClr', 'val', $color);
+                        $xmlWriter->endElement(); // a:solidFill
+                        $xmlWriter->endElement(); // c:spPr
+                        $xmlWriter->endElement(); // c:dPt
+                        $colorIndex++;
+                    }
+                }
             }
 
             $xmlWriter->endElement(); // c:ser
@@ -230,14 +284,19 @@ class Chart extends AbstractPart
 
         $xmlWriter->startElement($itemType);
         $xmlWriter->startElement($itemLit);
+        $xmlWriter->writeElementBlock('c:ptCount', 'val', count($values));
 
         $index = 0;
         foreach ($values as $value) {
             $xmlWriter->startElement('c:pt');
             $xmlWriter->writeAttribute('idx', $index);
-            $xmlWriter->startElement('c:v');
-            $xmlWriter->text($value);
-            $xmlWriter->endElement(); // c:v
+            if (\PhpOffice\PhpWord\Settings::isOutputEscapingEnabled()) {
+                $xmlWriter->writeElement('c:v', $value);
+            } else {
+                $xmlWriter->startElement('c:v');
+                $xmlWriter->writeRaw($value);
+                $xmlWriter->endElement(); // c:v
+            }
             $xmlWriter->endElement(); // c:pt
             $index++;
         }
@@ -266,15 +325,33 @@ class Chart extends AbstractPart
 
         $xmlWriter->writeElementBlock('c:axId', 'val', $axisId);
         $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);
+
+        $categoryAxisTitle = $style->getCategoryAxisTitle();
+        $valueAxisTitle = $style->getValueAxisTitle();
+
+        if ($axisType == 'c:catAx') {
+            if (isset($categoryAxisTitle)) {
+                $this->writeAxisTitle($xmlWriter, $categoryAxisTitle);
+            }
+        } elseif ($axisType == 'c:valAx') {
+            if (isset($valueAxisTitle)) {
+                $this->writeAxisTitle($xmlWriter, $valueAxisTitle);
+            }
+        }
+
         $xmlWriter->writeElementBlock('c:crossAx', 'val', $axisCross);
         $xmlWriter->writeElementBlock('c:auto', 'val', 1);
 
         if (isset($this->options['axes'])) {
             $xmlWriter->writeElementBlock('c:delete', 'val', 0);
-            $xmlWriter->writeElementBlock('c:majorTickMark', 'val', 'none');
+            $xmlWriter->writeElementBlock('c:majorTickMark', 'val', $style->getMajorTickPosition());
             $xmlWriter->writeElementBlock('c:minorTickMark', 'val', 'none');
             if ($style->showAxisLabels()) {
-                $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'nextTo');
+                if ($axisType == 'c:catAx') {
+                    $xmlWriter->writeElementBlock('c:tickLblPos', 'val', $style->getCategoryLabelPosition());
+                } else {
+                    $xmlWriter->writeElementBlock('c:tickLblPos', 'val', $style->getValueLabelPosition());
+                }
             } else {
                 $xmlWriter->writeElementBlock('c:tickLblPos', 'val', 'none');
             }
@@ -312,4 +389,30 @@ class Chart extends AbstractPart
         $xmlWriter->endElement(); // a:ln
         $xmlWriter->endElement(); // c:spPr
     }
+
+    private function writeAxisTitle(XMLWriter $xmlWriter, $title)
+    {
+        $xmlWriter->startElement('c:title'); //start c:title
+        $xmlWriter->startElement('c:tx'); //start c:tx
+        $xmlWriter->startElement('c:rich'); // start c:rich
+        $xmlWriter->writeElement('a:bodyPr');
+        $xmlWriter->writeElement('a:lstStyle');
+        $xmlWriter->startElement('a:p');
+        $xmlWriter->startElement('a:pPr');
+        $xmlWriter->writeElement('a:defRPr');
+        $xmlWriter->endElement(); // end a:pPr
+        $xmlWriter->startElement('a:r');
+        $xmlWriter->writeElementBlock('a:rPr', 'lang', 'en-US');
+
+        $xmlWriter->startElement('a:t');
+        $xmlWriter->writeRaw($title);
+        $xmlWriter->endElement(); //end a:t
+
+        $xmlWriter->endElement(); // end a:r
+        $xmlWriter->endElement(); //end a:p
+        $xmlWriter->endElement(); //end c:rich
+        $xmlWriter->endElement(); // end c:tx
+        $xmlWriter->writeElementBlock('c:overlay', 'val', '0');
+        $xmlWriter->endElement(); // end c:title
+    }
 }
diff --git a/tests/PhpWord/Style/ChartTest.php b/tests/PhpWord/Style/ChartTest.php
new file mode 100644
index 00000000..9929a8f5
--- /dev/null
+++ b/tests/PhpWord/Style/ChartTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see       https://github.com/PHPOffice/PHPWord
+ * @copyright 2010-2017 PHPWord contributors
+ * @license   http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * Test class for PhpOffice\PhpWord\Style\Chart
+ *
+ * @coversDefaultClass          \PhpOffice\PhpWord\Style\Chart
+ * @runTestsInSeparateProcesses
+ */
+class ChartTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Testing getter and setter for chart width
+     */
+    public function testSetGetWidth()
+    {
+        $chart = new Chart();
+
+        $this->assertEquals($chart->getWidth(), 1000000);
+
+        $chart->setWidth(200);
+
+        $this->assertEquals($chart->getWidth(), 200);
+    }
+
+    /**
+     * Testing getter and setter for chart height
+     */
+    public function testSetGetHeight()
+    {
+        $chart = new Chart();
+
+        $this->assertEquals($chart->getHeight(), 1000000);
+
+        $chart->setHeight(200);
+
+        $this->assertEquals($chart->getHeight(), 200);
+    }
+
+    /**
+     * Testing getter and setter for is3d
+     */
+    public function testSetIs3d()
+    {
+        $chart = new Chart();
+
+        $this->assertEquals($chart->is3d(), false);
+
+        $chart->set3d(true);
+
+        $this->assertEquals($chart->is3d(), true);
+    }
+
+    /**
+     * Testing getter and setter for chart colors
+     */
+    public function testSetGetColors()
+    {
+        $chart = new Chart();
+
+        $this->assertInternalType('array', $chart->getColors());
+
+        $this->assertEquals(count($chart->getColors()), 0);
+
+        $chart->setColors(array('FFFFFFFF', 'FF000000', 'FFFF0000'));
+
+        $this->assertEquals($chart->getColors(), array('FFFFFFFF', 'FF000000', 'FFFF0000'));
+    }
+
+    /**
+     * Testing getter and setter for dataLabelOptions
+     */
+    public function testSetGetDataLabelOptions()
+    {
+        $chart = new Chart();
+
+        $originalDataLabelOptions = array(
+            'showVal'          => true,
+            'showCatName'      => true,
+            'showLegendKey'    => false,
+            'showSerName'      => false,
+            'showPercent'      => false,
+            'showLeaderLines'  => false,
+            'showBubbleSize'   => false,
+        );
+
+        $this->assertEquals($chart->getDataLabelOptions(), $originalDataLabelOptions);
+
+        $changedDataLabelOptions = array(
+            'showVal'          => false,
+            'showCatName'      => false,
+            'showLegendKey'    => true,
+            'showSerName'      => true,
+            'showPercent'      => true,
+            'showLeaderLines'  => true,
+            'showBubbleSize'   => true,
+        );
+
+        $chart->setDataLabelOptions(
+            array(
+                'showVal'          => false,
+                'showCatName'      => false,
+                'showLegendKey'    => true,
+                'showSerName'      => true,
+                'showPercent'      => true,
+                'showLeaderLines'  => true,
+                'showBubbleSize'   => true,
+            )
+        );
+        $this->assertEquals($chart->getDataLabelOptions(), $changedDataLabelOptions);
+    }
+
+    /**
+     * Testing categoryLabelPosition getter and setter
+     */
+    public function testSetGetCategoryLabelPosition()
+    {
+        $chart = new Chart();
+
+        $this->assertEquals($chart->getCategoryLabelPosition(), 'nextTo');
+
+        $chart->setCategoryLabelPosition('high');
+
+        $this->assertEquals($chart->getCategoryLabelPosition(), 'high');
+    }
+
+    /**
+     * Testing valueLabelPosition getter and setter
+     */
+    public function testSetGetValueLabelPosition()
+    {
+        $chart = new Chart();
+
+        $this->assertEquals($chart->getValueLabelPosition(), 'nextTo');
+
+        $chart->setValueLabelPosition('low');
+
+        $this->assertEquals($chart->getValueLabelPosition(), 'low');
+    }
+
+    /**
+     * Testing categoryAxisTitle getter and setter
+     */
+    public function testSetGetCategoryAxisTitle()
+    {
+        $chart = new Chart();
+
+        $chart->getCategoryAxisTitle();
+
+        $this->assertEquals($chart->getCategoryAxisTitle(), null);
+
+        $chart->setCategoryAxisTitle('Test Category Axis Title');
+
+        $this->assertEquals($chart->getCategoryAxisTitle(), 'Test Category Axis Title');
+    }
+
+    /**
+     * Testing valueAxisTitle getter and setter
+     */
+    public function testSetGetValueAxisTitle()
+    {
+        $chart = new Chart();
+
+        $chart->getValueAxisTitle();
+
+        $this->assertEquals($chart->getValueAxisTitle(), null);
+
+        $chart->setValueAxisTitle('Test Value Axis Title');
+
+        $this->assertEquals($chart->getValueAxisTitle(), 'Test Value Axis Title');
+    }
+}

From e47ce1b4fc493ecfa7d5b5cd60c425d54cd78a3b Mon Sep 17 00:00:00 2001
From: Christian Zosel <christian@zosel.ch>
Date: Sat, 19 May 2018 12:39:30 +0200
Subject: [PATCH 291/370] Coveralls integration

---
 .travis.yml   | 6 +++---
 composer.json | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52fa9580..d79a7dce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,6 @@ script:
     ## PHPDocumentor
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 
-after_script:
-    ## Scrutinizer
-    - if [ -n "$COVERAGE" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml ; fi
+after_success:
+    ## Coveralls
+    - if [ -z "$COVERAGE" ]; then travis_retry php vendor/bin/php-coveralls -v ; fi
diff --git a/composer.json b/composer.json
index 742e4bc8..e4d5927e 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,8 @@
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "phpoffice/common": "^0.2"
+        "phpoffice/common": "^0.2",
+        "php-coveralls/php-coveralls": "1.1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.0",

From 453ddf078b16f996900317e8b5fc4294d71b09f0 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 20 May 2018 14:37:59 +0200
Subject: [PATCH 292/370] Do not try to read document protection if not present

---
 src/PhpWord/Reader/Word2007/AbstractPart.php | 2 ++
 src/PhpWord/Reader/Word2007/Settings.php     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 48a84ff2..6cdf2b3a 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -588,6 +588,8 @@ abstract class AbstractPart
                     return $possibleAttribute;
                 }
             }
+
+            return null;
         }
 
         return $attributes;
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index 5cfe5453..dbf34623 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -109,7 +109,9 @@ class Settings extends AbstractPart
         $documentProtection = $phpWord->getSettings()->getDocumentProtection();
 
         $edit = $xmlReader->getAttribute('w:edit', $node);
-        $documentProtection->setEditing($edit);
+        if ($edit !== null) {
+            $documentProtection->setEditing($edit);
+        }
     }
 
     /**

From 2480103b49c937da2c36a3573e5ab61f9469d8e6 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 20 May 2018 17:13:04 +0200
Subject: [PATCH 293/370] run coveralls when running build with code coverage

---
 .travis.yml   | 2 +-
 composer.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d79a7dce..bd85b2d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,4 +56,4 @@ script:
 
 after_success:
     ## Coveralls
-    - if [ -z "$COVERAGE" ]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+    - if [ -n "$COVERAGE" ]; then travis_retry php vendor/bin/php-coveralls -v ; fi
diff --git a/composer.json b/composer.json
index e4d5927e..c29e901a 100644
--- a/composer.json
+++ b/composer.json
@@ -61,8 +61,7 @@
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "phpoffice/common": "^0.2",
-        "php-coveralls/php-coveralls": "1.1.0"
+        "phpoffice/common": "^0.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.0",
@@ -73,7 +72,8 @@
         "phploc/phploc": "2.* || 3.* || 4.*",
         "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
-        "mpdf/mpdf": "5.* || 6.* || 7.*"
+        "mpdf/mpdf": "5.* || 6.* || 7.*",
+        "php-coveralls/php-coveralls": "1.1.0 || ^2.0"
     },
     "suggest": {
         "ext-zip": "Allows writing OOXML and ODF",

From 254064150d1515768ab576085ff0feda5f00d9c7 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 20 May 2018 20:59:34 +0200
Subject: [PATCH 294/370] disable external code coverage

---
 .scrutinizer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 291a6d60..2b395afd 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -19,7 +19,7 @@ tools:
         config:
             ruleset: phpmd.xml.dist
     external_code_coverage:
-        enabled: true
+        enabled: false
         timeout: 1200
     php_cpd: true
     # php_sim: # Temporarily disabled to allow focus on things other than duplicates

From 0b27bb927dc1af20510b0aa55e54ae74f1060692 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 20 May 2018 22:08:53 +0200
Subject: [PATCH 295/370] update changelog

[ci skip]
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b5d7767..69f0c811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@ v0.15.0 (?? ??? 2018)
 - Remove zend-stdlib dependency @Trainmaster #1284
 - The default unit for `\PhpOffice\PhpWord\Style\Image` changed from `px` to `pt`.
 
+### Miscelaneous
+- Drop GitHub pages, switch to coveralls for code coverage analysis @czosel #1360
 
 v0.14.0 (29 Dec 2017)
 ----------------------

From e6501eb9ff75d6de13768507d531c2327bae0e97 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 20 May 2018 23:45:03 +0200
Subject: [PATCH 296/370] Update coverage badge

[skip ci]
[skip Scrutinizer]
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 59fc3c44..7531a6bc 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
 [![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
 [![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?s=b5997ce59ac2816b4514f3a38de9900f6d492c1d)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
-[![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/coverage.png?s=742a98745725c562955440edc8d2c39d7ff5ae25)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
+[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
 [![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
 [![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
 [![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord)

From 90d4d30dd327d19aed30293e5ebebe8cd657ea2c Mon Sep 17 00:00:00 2001
From: woutersioen <wouter.sioen@gmail.com>
Date: Wed, 23 May 2018 09:18:24 +0200
Subject: [PATCH 297/370] Fix calls to the getEndingNotes method in the samples

This call requires both an array of writes and the filename, which was
missing in both method calls.
---
 samples/Sample_07_TemplateCloneRow.php | 2 +-
 samples/Sample_23_TemplateBlock.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/Sample_07_TemplateCloneRow.php b/samples/Sample_07_TemplateCloneRow.php
index e845362c..81253d0a 100644
--- a/samples/Sample_07_TemplateCloneRow.php
+++ b/samples/Sample_07_TemplateCloneRow.php
@@ -56,7 +56,7 @@ $templateProcessor->setValue('userPhone#3', '+1 428 889 775');
 echo date('H:i:s'), ' Saving the result document...', EOL;
 $templateProcessor->saveAs('results/Sample_07_TemplateCloneRow.docx');
 
-echo getEndingNotes(array('Word2007' => 'docx'));
+echo getEndingNotes(array('Word2007' => 'docx'), 'results/Sample_07_TemplateCloneRow.docx');
 if (!CLI) {
     include_once 'Sample_Footer.php';
 }
diff --git a/samples/Sample_23_TemplateBlock.php b/samples/Sample_23_TemplateBlock.php
index 2b7e9f68..ed986618 100644
--- a/samples/Sample_23_TemplateBlock.php
+++ b/samples/Sample_23_TemplateBlock.php
@@ -14,7 +14,7 @@ $templateProcessor->deleteBlock('DELETEME');
 echo date('H:i:s'), ' Saving the result document...', EOL;
 $templateProcessor->saveAs('results/Sample_23_TemplateBlock.docx');
 
-echo getEndingNotes(array('Word2007' => 'docx'));
+echo getEndingNotes(array('Word2007' => 'docx'), 'results/Sample_23_TemplateBlock.docx');
 if (!CLI) {
     include_once 'Sample_Footer.php';
 }

From 58c6c52ee94b5b1821f9c2fad7ee415fd4fca1c6 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 23 May 2018 18:22:54 +0200
Subject: [PATCH 298/370] merged with local version

---
 src/PhpWord/Shared/Html.php       | 51 +++++++++++++++++++++++++++--
 tests/PhpWord/Shared/HtmlTest.php | 54 +++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index cbdcecd5..b308ec3e 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -22,6 +22,7 @@ use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
+use PhpOffice\PhpWord\Settings;
 
 /**
  * Common Html functions
@@ -32,6 +33,7 @@ class Html
 {
     private static $listIndex = 0;
     private static $xpath;
+    private static $options;
 
     /**
      * Add HTML parts.
@@ -44,13 +46,17 @@ class Html
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
      * @param bool $preserveWhiteSpace If false, the whitespaces between nodes will be removed
+     * @param array $options:
+     *                + IMG_SRC_SEARCH: optional to speed up images loading from remote url when files can be found locally
+     *                + IMG_SRC_REPLACE: optional to speed up images loading from remote url when files can be found locally
      */
-    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true)
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null )
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
          * which could be applied when such an element occurs in the parseNode function.
          */
+        self::$options = $options;
 
         // Preprocess: remove all line ends, decode HTML entity,
         // fix ampersand and angle brackets and add body tag for HTML fragments
@@ -141,6 +147,7 @@ class Html
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
             'span'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
+            'font'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   null,           null),
             'tr'        => array('Row',         $node,  $element,   $styles,    null,   null,           null),
             'td'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
@@ -296,8 +303,9 @@ class Html
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
      */
-    private static function parseTable($node, $element, &$styles)
+    private static function parseTable($node, $element, &$styles )
     {
+
         $elementStyles = self::parseInlineStyle($node, $styles['table']);
 
         $newElement = $element->addTable($elementStyles);
@@ -648,6 +656,45 @@ class Html
                     break;
             }
         }
+        if( strpos( $src, "data:image" ) !== false ){
+  				if( ! is_dir( self::$imgdir ) )
+  					mkdir( self::$imgdir ) ;
+
+  				$match = array();
+  				preg_match( '/data:image\/(\w+);base64,(.+)/', $src, $match );
+
+  				$src = $imgFile = self::$imgdir . uniqid() . "." . $match[1];
+
+  				$ifp = fopen( $imgFile, "wb");
+
+  			  fwrite($ifp, base64_decode( $match[2] ) );
+  			  fclose($ifp);
+
+  			}
+  			$src= urldecode($src);
+
+  			if( ! is_file( $src )
+            && !is_null(self::$options)
+            && isset(self::$options['IMG_SRC_SEARCH'])
+            && isset(self::$options['IMG_SRC_REPLACE'])){
+  				$src = str_replace( self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src );
+  			}
+
+  			if(! is_file($src)){
+  				if($imgBlob=file_get_contents($src)){
+            $tmpDir= Settings::getTempDir().'/';
+  					if( ! is_dir( $tmpDir ) )
+  						mkdir( $tmpDir ) ;
+  					$match = array();
+  					preg_match( '/.+\.(\w+)$/', $src, $match );
+  					$src = $tmpDir . uniqid() . "." . $match[1];
+
+  					$ifp = fopen( $src, "wb");
+
+  				  fwrite($ifp, $imgBlob );
+  				  fclose($ifp);
+  				}
+  			}
         $newElement = $element->addImage($src, $style);
 
         return $newElement;
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index b61418e0..63295d62 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -115,6 +115,20 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
     }
+    /**
+     * Test font
+     */
+    public function testParseFont()
+    {
+        $html = '<font style="font-family: Arial;">test</font>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr'));
+        //TODO check style
+    }
 
     /**
      * Test line-height style
@@ -447,6 +461,46 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
     }
 
+    /**
+     * Test parsing of remote img
+     */
+    public function testParseRemoteImage()
+    {
+        $src = 'https://phpword.readthedocs.io/en/latest/_images/phpword.png';
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/><img src="' . $src . '" style="float: left;"/></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+    /**
+     * Test parsing of remote img that can be found locally
+     */
+    public function testParseRemoteLocalImage()
+    {
+        $src = 'https://fakedomain.io/images/firefox.png';
+        $localPath = __DIR__ . '/../_files/images/';
+        $options= [
+          'IMG_SRC_SEARCH'=> 'https://fakedomain.io/images/',
+          'IMG_SRC_REPLACE'=> $localPath
+        ];
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/></p>';
+        Html::addHtml($section, $html, false, true, $options);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+
     public function testParseLink()
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();

From d54cc6efeea1a43419d9b97a759a796c1124aa6e Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 23 May 2018 18:35:12 +0200
Subject: [PATCH 299/370] fix lint

---
 samples/resources/Sample_30_ReadHTML.html | 6 ++++++
 tests/PhpWord/Shared/HtmlTest.php         | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index 5593298b..ea982218 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -11,5 +11,11 @@
 <ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>
 <p>Ordered (numbered) list:</p>
 <ol><li>Item 1</li><li>Item 2</li></ol>
+
+
+<p style="line-height:2">Double height</p>
+
+<h2>Includes images</h2>
+<img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
 </body>
 </html>
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 63295d62..9b5def85 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -485,10 +485,10 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     {
         $src = 'https://fakedomain.io/images/firefox.png';
         $localPath = __DIR__ . '/../_files/images/';
-        $options= [
+        $options= array(
           'IMG_SRC_SEARCH'=> 'https://fakedomain.io/images/',
           'IMG_SRC_REPLACE'=> $localPath
-        ];
+        );
 
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();

From a228811a611fe015c3bdb916d33ec579aa5697b4 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 23 May 2018 18:48:28 +0200
Subject: [PATCH 300/370] fixes

---
 src/PhpWord/Shared/Html.php       | 66 +++++++++++++++----------------
 tests/PhpWord/Shared/HtmlTest.php |  8 ++--
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index b308ec3e..24f695c7 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -20,9 +20,9 @@ namespace PhpOffice\PhpWord\Shared;
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
-use PhpOffice\PhpWord\Settings;
 
 /**
  * Common Html functions
@@ -50,7 +50,7 @@ class Html
      *                + IMG_SRC_SEARCH: optional to speed up images loading from remote url when files can be found locally
      *                + IMG_SRC_REPLACE: optional to speed up images loading from remote url when files can be found locally
      */
-    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null )
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null)
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
@@ -303,9 +303,8 @@ class Html
      *
      * @todo As soon as TableItem, RowItem and CellItem support relative width and height
      */
-    private static function parseTable($node, $element, &$styles )
+    private static function parseTable($node, $element, &$styles)
     {
-
         $elementStyles = self::parseInlineStyle($node, $styles['table']);
 
         $newElement = $element->addTable($elementStyles);
@@ -656,45 +655,46 @@ class Html
                     break;
             }
         }
-        if( strpos( $src, "data:image" ) !== false ){
-  				if( ! is_dir( self::$imgdir ) )
-  					mkdir( self::$imgdir ) ;
+        if (strpos($src, 'data:image') !== false) {
+            if (!is_dir(self::$imgdir)) {
+                mkdir(self::$imgdir);
+            }
 
-  				$match = array();
-  				preg_match( '/data:image\/(\w+);base64,(.+)/', $src, $match );
+            $match = array();
+            preg_match('/data:image\/(\w+);base64,(.+)/', $src, $match);
 
-  				$src = $imgFile = self::$imgdir . uniqid() . "." . $match[1];
+            $src = $imgFile = self::$imgdir . uniqid() . '.' . $match[1];
 
-  				$ifp = fopen( $imgFile, "wb");
+            $ifp = fopen($imgFile, 'wb');
 
-  			  fwrite($ifp, base64_decode( $match[2] ) );
-  			  fclose($ifp);
+            fwrite($ifp, base64_decode($match[2]));
+            fclose($ifp);
+        }
+        $src = urldecode($src);
 
-  			}
-  			$src= urldecode($src);
-
-  			if( ! is_file( $src )
+        if (!is_file($src)
             && !is_null(self::$options)
             && isset(self::$options['IMG_SRC_SEARCH'])
-            && isset(self::$options['IMG_SRC_REPLACE'])){
-  				$src = str_replace( self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src );
-  			}
+            && isset(self::$options['IMG_SRC_REPLACE'])) {
+            $src = str_replace(self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src);
+        }
 
-  			if(! is_file($src)){
-  				if($imgBlob=file_get_contents($src)){
-            $tmpDir= Settings::getTempDir().'/';
-  					if( ! is_dir( $tmpDir ) )
-  						mkdir( $tmpDir ) ;
-  					$match = array();
-  					preg_match( '/.+\.(\w+)$/', $src, $match );
-  					$src = $tmpDir . uniqid() . "." . $match[1];
+        if (!is_file($src)) {
+            if ($imgBlob = file_get_contents($src)) {
+                $tmpDir = Settings::getTempDir() . '/';
+                if (!is_dir($tmpDir)) {
+                    mkdir($tmpDir);
+                }
+                $match = array();
+                preg_match('/.+\.(\w+)$/', $src, $match);
+                $src = $tmpDir . uniqid() . '.' . $match[1];
 
-  					$ifp = fopen( $src, "wb");
+                $ifp = fopen($src, 'wb');
 
-  				  fwrite($ifp, $imgBlob );
-  				  fclose($ifp);
-  				}
-  			}
+                fwrite($ifp, $imgBlob);
+                fclose($ifp);
+            }
+        }
         $newElement = $element->addImage($src, $style);
 
         return $newElement;
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 9b5def85..8c42544d 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -115,6 +115,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:u'));
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
     }
+
     /**
      * Test font
      */
@@ -478,6 +479,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $baseXpath = '/w:document/w:body/w:p/w:r';
         $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
     }
+
     /**
      * Test parsing of remote img that can be found locally
      */
@@ -485,9 +487,9 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
     {
         $src = 'https://fakedomain.io/images/firefox.png';
         $localPath = __DIR__ . '/../_files/images/';
-        $options= array(
-          'IMG_SRC_SEARCH'=> 'https://fakedomain.io/images/',
-          'IMG_SRC_REPLACE'=> $localPath
+        $options = array(
+          'IMG_SRC_SEARCH'  => 'https://fakedomain.io/images/',
+          'IMG_SRC_REPLACE' => $localPath,
         );
 
         $phpWord = new \PhpOffice\PhpWord\PhpWord();

From 46b7bea0975eb70a4cd6d8469d7fa859e277ec6e Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Thu, 24 May 2018 07:19:45 +0200
Subject: [PATCH 301/370] increased test coverage of new lines

---
 src/PhpWord/Shared/Html.php       |  9 ++-------
 tests/PhpWord/Shared/HtmlTest.php | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 24f695c7..97b27018 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -656,14 +656,12 @@ class Html
             }
         }
         if (strpos($src, 'data:image') !== false) {
-            if (!is_dir(self::$imgdir)) {
-                mkdir(self::$imgdir);
-            }
+            $tmpDir = Settings::getTempDir() . '/';
 
             $match = array();
             preg_match('/data:image\/(\w+);base64,(.+)/', $src, $match);
 
-            $src = $imgFile = self::$imgdir . uniqid() . '.' . $match[1];
+            $src = $imgFile = $tmpDir . uniqid() . '.' . $match[1];
 
             $ifp = fopen($imgFile, 'wb');
 
@@ -682,9 +680,6 @@ class Html
         if (!is_file($src)) {
             if ($imgBlob = file_get_contents($src)) {
                 $tmpDir = Settings::getTempDir() . '/';
-                if (!is_dir($tmpDir)) {
-                    mkdir($tmpDir);
-                }
                 $match = array();
                 preg_match('/.+\.(\w+)$/', $src, $match);
                 $src = $tmpDir . uniqid() . '.' . $match[1];
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 8c42544d..6925e3c2 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -480,6 +480,22 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
     }
 
+    /**
+     * Test parsing embedded image
+     */
+    public function testParseEmbeddedImage()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="data:image/jpeg;base64,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" name="Imagen 12" align="bottom" width="208" height="183" border="0"/></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+
     /**
      * Test parsing of remote img that can be found locally
      */

From a89e4c93a78c964bd3b7e6dc5f1ab38bb0d18525 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Fri, 25 May 2018 08:01:17 +0200
Subject: [PATCH 302/370] added exception control to file_get_contents error

---
 samples/resources/Sample_30_ReadHTML.html |  6 +++++-
 samples/results/.gitignore                |  0
 src/PhpWord/Shared/Html.php               | 10 ++++++++--
 tests/PhpWord/Shared/HtmlTest.php         | 14 ++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 samples/results/.gitignore

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index ea982218..b3d2fad2 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -12,10 +12,14 @@
 <p>Ordered (numbered) list:</p>
 <ol><li>Item 1</li><li>Item 2</li></ol>
 
-
 <p style="line-height:2">Double height</p>
 
 <h2>Includes images</h2>
 <img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
+
+<img src="https://localhost/gev/desarrollo/actividades/pruebas_14/5b064503587f7.jpeg" name="Imagen 12" align="bottom" width="208" height="183" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b064503589db.png" name="Imagen 13" align="bottom" width="143" height="202" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b0645035aac8.jpeg" name="Imagen 14" align="bottom" width="194" height="188" border="0"/>
+
 </body>
 </html>
diff --git a/samples/results/.gitignore b/samples/results/.gitignore
old mode 100644
new mode 100755
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 97b27018..23172769 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -655,6 +655,7 @@ class Html
                     break;
             }
         }
+        $origin_src= $src;
         if (strpos($src, 'data:image') !== false) {
             $tmpDir = Settings::getTempDir() . '/';
 
@@ -678,7 +679,7 @@ class Html
         }
 
         if (!is_file($src)) {
-            if ($imgBlob = file_get_contents($src)) {
+            if ($imgBlob = @file_get_contents($src)) {
                 $tmpDir = Settings::getTempDir() . '/';
                 $match = array();
                 preg_match('/.+\.(\w+)$/', $src, $match);
@@ -690,7 +691,12 @@ class Html
                 fclose($ifp);
             }
         }
-        $newElement = $element->addImage($src, $style);
+
+        if (is_file($src)){
+          $newElement = $element->addImage($src, $style);
+        }else{
+          throw new \Exception("Could not load image $origin_src");
+        }
 
         return $newElement;
     }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 6925e3c2..481b5d75 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -519,6 +519,20 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
     }
 
+    /**
+     * Test parsing of remote img that can be found locally
+     */
+    public function testCouldNotLoadImage()
+    {
+        $src = 'https://fakedomain.io/images/firefox.png';
+        $this->expectException(\Exception::class);
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/></p>';
+        Html::addHtml($section, $html, false, true);
+    }
+
     public function testParseLink()
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();

From 65a594d2713b6ff876ca0a1d230404a0d160b6c9 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Fri, 25 May 2018 09:29:58 +0200
Subject: [PATCH 303/370] cs-fixer fixes

---
 src/PhpWord/Shared/Html.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 23172769..58ce2412 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -655,7 +655,7 @@ class Html
                     break;
             }
         }
-        $origin_src= $src;
+        $originSrc = $src;
         if (strpos($src, 'data:image') !== false) {
             $tmpDir = Settings::getTempDir() . '/';
 
@@ -692,10 +692,10 @@ class Html
             }
         }
 
-        if (is_file($src)){
-          $newElement = $element->addImage($src, $style);
-        }else{
-          throw new \Exception("Could not load image $origin_src");
+        if (is_file($src)) {
+            $newElement = $element->addImage($src, $style);
+        } else {
+            throw new \Exception("Could not load image $originSrc");
         }
 
         return $newElement;

From 0c9626cedd0efe20de858c96cc9ba3fb2e2d78f1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 27 May 2018 20:38:25 +0200
Subject: [PATCH 304/370] add .gitattributes

---
 .gitattributes | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..f3d033a7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,21 @@
+# build config
+/.scrutinizer.yml export-ignore
+/.travis.yml export-ignore
+/php_cs.dist export-ignore
+/phpmd.xml.dist export-ignore
+/phpstan.neon export-ignore
+
+/composer.lock export-ignore
+
+# git files
+/.gitignore export-ignore
+/.gitattributes export-ignore
+
+# project directories
+/build export-ignore
+/docs export-ignore
+/samples export-ignore
+
+# tests
+/phpunit.xml.dist export-ignore
+/tests export-ignore
\ No newline at end of file

From da604a80c43241b28c7cf6d07977f1533a70d39c Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 27 May 2018 20:53:42 +0200
Subject: [PATCH 305/370] use annotation instead

---
 tests/PhpWord/Shared/HtmlTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 481b5d75..32f4bf46 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -521,11 +521,12 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
 
     /**
      * Test parsing of remote img that can be found locally
+     *
+     * @expectedException \Exception
      */
     public function testCouldNotLoadImage()
     {
         $src = 'https://fakedomain.io/images/firefox.png';
-        $this->expectException(\Exception::class);
 
         $phpWord = new \PhpOffice\PhpWord\PhpWord();
         $section = $phpWord->addSection();

From c22f7eab5e2a9e764946ddf77c8f82d21811871a Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 27 May 2018 21:27:45 +0200
Subject: [PATCH 306/370] add check on opened file

---
 src/PhpWord/Shared/Html.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 58ce2412..239cfd1d 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -666,8 +666,10 @@ class Html
 
             $ifp = fopen($imgFile, 'wb');
 
-            fwrite($ifp, base64_decode($match[2]));
-            fclose($ifp);
+            if ($ifp !== false) {
+                fwrite($ifp, base64_decode($match[2]));
+                fclose($ifp);
+            }
         }
         $src = urldecode($src);
 
@@ -687,8 +689,10 @@ class Html
 
                 $ifp = fopen($src, 'wb');
 
-                fwrite($ifp, $imgBlob);
-                fclose($ifp);
+                if ($ifp !== false) {
+                    fwrite($ifp, $imgBlob);
+                    fclose($ifp);
+                }
             }
         }
 

From 82f3a2ab44f9de047087e5307fdb9269fb346e0c Mon Sep 17 00:00:00 2001
From: Edvin Hultberg <hultberg@users.noreply.github.com>
Date: Thu, 31 May 2018 00:21:08 +0200
Subject: [PATCH 307/370] Update documentation for Style::add*Style methods
 (#1383)

* Update documentation for Style::add*Style methods
* remove phpDocumentor, simplify dependencies
---
 .travis.yml                             |  4 ++--
 composer.json                           |  7 +++----
 src/PhpWord/Element/AbstractElement.php |  2 +-
 src/PhpWord/PhpWord.php                 |  4 ++--
 src/PhpWord/Style.php                   | 20 ++++++++++----------
 src/PhpWord/Style/Font.php              |  2 +-
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd85b2d7..c72dd8c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ before_script:
     - composer self-update
     - travis_wait composer install --prefer-source
     ## PHPDocumentor
-    - mkdir -p build/docs
+    ##- mkdir -p build/docs
     - mkdir -p build/coverage
 
 script:
@@ -52,7 +52,7 @@ script:
     ## PHPLOC
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phploc src/ ; fi
     ## PHPDocumentor
-    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
+    ##- if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 
 after_success:
     ## Coveralls
diff --git a/composer.json b/composer.json
index c29e901a..dd3a2de8 100644
--- a/composer.json
+++ b/composer.json
@@ -65,14 +65,13 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.0",
-        "phpdocumentor/phpdocumentor":"2.*",
-        "squizlabs/php_codesniffer": "^2.7",
-        "friendsofphp/php-cs-fixer": "^2.0",
+        "squizlabs/php_codesniffer": "^2.9",
+        "friendsofphp/php-cs-fixer": "^2.2",
         "phpmd/phpmd": "2.*",
         "phploc/phploc": "2.* || 3.* || 4.*",
         "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
-        "mpdf/mpdf": "5.* || 6.* || 7.*",
+        "mpdf/mpdf": "5.7.4 || 6.* || 7.*",
         "php-coveralls/php-coveralls": "1.1.0 || ^2.0"
     },
     "suggest": {
diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
index 5ff85b8f..e3e54ed4 100644
--- a/src/PhpWord/Element/AbstractElement.php
+++ b/src/PhpWord/Element/AbstractElement.php
@@ -347,7 +347,7 @@ abstract class AbstractElement
      *
      * @param \PhpOffice\PhpWord\Element\AbstractElement $container
      */
-    public function setParentContainer(AbstractElement $container)
+    public function setParentContainer(self $container)
     {
         $this->parentContainer = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
         $this->parent = $container;
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
index b5cc0c51..a78df2c4 100644
--- a/src/PhpWord/PhpWord.php
+++ b/src/PhpWord/PhpWord.php
@@ -35,10 +35,10 @@ use PhpOffice\PhpWord\Exception\Exception;
  * @method int addChart(Element\Chart $chart)
  * @method int addComment(Element\Comment $comment)
  *
- * @method Style\Paragraph addParagraphStyle(string $styleName, array $styles)
+ * @method Style\Paragraph addParagraphStyle(string $styleName, mixed $styles)
  * @method Style\Font addFontStyle(string $styleName, mixed $fontStyle, mixed $paragraphStyle = null)
  * @method Style\Font addLinkStyle(string $styleName, mixed $styles)
- * @method Style\Font addTitleStyle(int $depth, mixed $fontStyle, mixed $paragraphStyle = null)
+ * @method Style\Font addTitleStyle(mixed $depth, mixed $fontStyle, mixed $paragraphStyle = null)
  * @method Style\Table addTableStyle(string $styleName, mixed $styleTable, mixed $styleFirstRow = null)
  * @method Style\Numbering addNumberingStyle(string $styleName, mixed $styles)
  */
diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php
index 47242621..62783b63 100644
--- a/src/PhpWord/Style.php
+++ b/src/PhpWord/Style.php
@@ -39,7 +39,7 @@ class Style
      * Add paragraph style
      *
      * @param string $styleName
-     * @param array $styles
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public static function addParagraphStyle($styleName, $styles)
@@ -51,8 +51,8 @@ class Style
      * Add font style
      *
      * @param string $styleName
-     * @param array $fontStyle
-     * @param array $paragraphStyle
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $fontStyle
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $paragraphStyle
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addFontStyle($styleName, $fontStyle, $paragraphStyle = null)
@@ -64,7 +64,7 @@ class Style
      * Add link style
      *
      * @param string $styleName
-     * @param array $styles
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addLinkStyle($styleName, $styles)
@@ -76,7 +76,7 @@ class Style
      * Add numbering style
      *
      * @param string $styleName
-     * @param array $styleValues
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styleValues
      * @return \PhpOffice\PhpWord\Style\Numbering
      * @since 0.10.0
      */
@@ -88,14 +88,14 @@ class Style
     /**
      * Add title style
      *
-     * @param int $depth
-     * @param array $fontStyle
-     * @param array $paragraphStyle
+     * @param int|null $depth Provide null to set title font
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $fontStyle
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $paragraphStyle
      * @return \PhpOffice\PhpWord\Style\Font
      */
     public static function addTitleStyle($depth, $fontStyle, $paragraphStyle = null)
     {
-        if ($depth == null) {
+        if (empty($depth)) {
             $styleName = 'Title';
         } else {
             $styleName = "Heading_{$depth}";
@@ -141,7 +141,7 @@ class Style
     /**
      * Set default paragraph style
      *
-     * @param array $styles Paragraph style definition
+     * @param array|\PhpOffice\PhpWord\Style\AbstractStyle $styles Paragraph style definition
      * @return \PhpOffice\PhpWord\Style\Paragraph
      */
     public static function setDefaultParagraphStyle($styles)
diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
index c58cee49..e9f3c9d6 100644
--- a/src/PhpWord/Style/Font.php
+++ b/src/PhpWord/Style/Font.php
@@ -264,7 +264,7 @@ class Font extends AbstractStyle
      * Create new font style
      *
      * @param string $type Type of font
-     * @param array $paragraph Paragraph styles definition
+     * @param array|string|\PhpOffice\PhpWord\Style\AbstractStyle $paragraph Paragraph styles definition
      */
     public function __construct($type = 'text', $paragraph = null)
     {

From e76487172b78af26e44b250f85d41fce541f5084 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 31 May 2018 00:31:41 +0200
Subject: [PATCH 308/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfcce5a4..e7b7ed68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for table indent (tblInd) @Trainmaster #1343
 - Added parsing of internal links in HTML reader @lalop #1336
 - Several improvements to charts @JAEK-S #1332
+- Add parsing of html image in base64 format @jgpATs2w #1382
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238

From 1a06173e1b933cbb8945949aca3d6a90179b496e Mon Sep 17 00:00:00 2001
From: javier <jgp@sens2web.es>
Date: Thu, 31 May 2018 01:28:14 +0200
Subject: [PATCH 309/370] Add parsing of html image in base64 format (#1382)

* increased test coverage of new lines
* added exception control to file_get_contents error
* update changelog
---
 CHANGELOG.md                              |  1 +
 samples/resources/Sample_30_ReadHTML.html | 10 +++
 samples/results/.gitignore                |  0
 src/PhpWord/Shared/Html.php               | 56 ++++++++++++++-
 tests/PhpWord/Shared/HtmlTest.php         | 87 +++++++++++++++++++++++
 5 files changed, 152 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 samples/results/.gitignore

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfcce5a4..e7b7ed68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ v0.15.0 (?? ??? 2018)
 - Add support for table indent (tblInd) @Trainmaster #1343
 - Added parsing of internal links in HTML reader @lalop #1336
 - Several improvements to charts @JAEK-S #1332
+- Add parsing of html image in base64 format @jgpATs2w #1382
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index 5593298b..b3d2fad2 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -11,5 +11,15 @@
 <ul><li>Item 1</li><li>Item 2</li><ul><li>Item 2.1</li><li>Item 2.1</li></ul></ul>
 <p>Ordered (numbered) list:</p>
 <ol><li>Item 1</li><li>Item 2</li></ol>
+
+<p style="line-height:2">Double height</p>
+
+<h2>Includes images</h2>
+<img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
+
+<img src="https://localhost/gev/desarrollo/actividades/pruebas_14/5b064503587f7.jpeg" name="Imagen 12" align="bottom" width="208" height="183" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b064503589db.png" name="Imagen 13" align="bottom" width="143" height="202" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b0645035aac8.jpeg" name="Imagen 14" align="bottom" width="194" height="188" border="0"/>
+
 </body>
 </html>
diff --git a/samples/results/.gitignore b/samples/results/.gitignore
old mode 100644
new mode 100755
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index cbdcecd5..239cfd1d 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -20,6 +20,7 @@ namespace PhpOffice\PhpWord\Shared;
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
+use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\SimpleType\Jc;
 use PhpOffice\PhpWord\SimpleType\NumberFormat;
 
@@ -32,6 +33,7 @@ class Html
 {
     private static $listIndex = 0;
     private static $xpath;
+    private static $options;
 
     /**
      * Add HTML parts.
@@ -44,13 +46,17 @@ class Html
      * @param string $html The code to parse
      * @param bool $fullHTML If it's a full HTML, no need to add 'body' tag
      * @param bool $preserveWhiteSpace If false, the whitespaces between nodes will be removed
+     * @param array $options:
+     *                + IMG_SRC_SEARCH: optional to speed up images loading from remote url when files can be found locally
+     *                + IMG_SRC_REPLACE: optional to speed up images loading from remote url when files can be found locally
      */
-    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true)
+    public static function addHtml($element, $html, $fullHTML = false, $preserveWhiteSpace = true, $options = null)
     {
         /*
          * @todo parse $stylesheet for default styles.  Should result in an array based on id, class and element,
          * which could be applied when such an element occurs in the parseNode function.
          */
+        self::$options = $options;
 
         // Preprocess: remove all line ends, decode HTML entity,
         // fix ampersand and angle brackets and add body tag for HTML fragments
@@ -141,6 +147,7 @@ class Html
             'sup'       => array('Property',    null,   null,       $styles,    null,   'superScript',  true),
             'sub'       => array('Property',    null,   null,       $styles,    null,   'subScript',    true),
             'span'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
+            'font'      => array('Span',        $node,  null,       $styles,    null,   null,           null),
             'table'     => array('Table',       $node,  $element,   $styles,    null,   null,           null),
             'tr'        => array('Row',         $node,  $element,   $styles,    null,   null,           null),
             'td'        => array('Cell',        $node,  $element,   $styles,    null,   null,           null),
@@ -648,7 +655,52 @@ class Html
                     break;
             }
         }
-        $newElement = $element->addImage($src, $style);
+        $originSrc = $src;
+        if (strpos($src, 'data:image') !== false) {
+            $tmpDir = Settings::getTempDir() . '/';
+
+            $match = array();
+            preg_match('/data:image\/(\w+);base64,(.+)/', $src, $match);
+
+            $src = $imgFile = $tmpDir . uniqid() . '.' . $match[1];
+
+            $ifp = fopen($imgFile, 'wb');
+
+            if ($ifp !== false) {
+                fwrite($ifp, base64_decode($match[2]));
+                fclose($ifp);
+            }
+        }
+        $src = urldecode($src);
+
+        if (!is_file($src)
+            && !is_null(self::$options)
+            && isset(self::$options['IMG_SRC_SEARCH'])
+            && isset(self::$options['IMG_SRC_REPLACE'])) {
+            $src = str_replace(self::$options['IMG_SRC_SEARCH'], self::$options['IMG_SRC_REPLACE'], $src);
+        }
+
+        if (!is_file($src)) {
+            if ($imgBlob = @file_get_contents($src)) {
+                $tmpDir = Settings::getTempDir() . '/';
+                $match = array();
+                preg_match('/.+\.(\w+)$/', $src, $match);
+                $src = $tmpDir . uniqid() . '.' . $match[1];
+
+                $ifp = fopen($src, 'wb');
+
+                if ($ifp !== false) {
+                    fwrite($ifp, $imgBlob);
+                    fclose($ifp);
+                }
+            }
+        }
+
+        if (is_file($src)) {
+            $newElement = $element->addImage($src, $style);
+        } else {
+            throw new \Exception("Could not load image $originSrc");
+        }
 
         return $newElement;
     }
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index b61418e0..32f4bf46 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -116,6 +116,21 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('single', $doc->getElementAttribute('/w:document/w:body/w:p/w:r/w:rPr/w:u', 'w:val'));
     }
 
+    /**
+     * Test font
+     */
+    public function testParseFont()
+    {
+        $html = '<font style="font-family: Arial;">test</font>';
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr'));
+        //TODO check style
+    }
+
     /**
      * Test line-height style
      */
@@ -447,6 +462,78 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertStringMatchesFormat('%Smso-position-horizontal:left%S', $doc->getElementAttribute($baseXpath . '[2]/w:pict/v:shape', 'style'));
     }
 
+    /**
+     * Test parsing of remote img
+     */
+    public function testParseRemoteImage()
+    {
+        $src = 'https://phpword.readthedocs.io/en/latest/_images/phpword.png';
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/><img src="' . $src . '" style="float: left;"/></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+
+    /**
+     * Test parsing embedded image
+     */
+    public function testParseEmbeddedImage()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="data:image/jpeg;base64,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" name="Imagen 12" align="bottom" width="208" height="183" border="0"/></p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+
+    /**
+     * Test parsing of remote img that can be found locally
+     */
+    public function testParseRemoteLocalImage()
+    {
+        $src = 'https://fakedomain.io/images/firefox.png';
+        $localPath = __DIR__ . '/../_files/images/';
+        $options = array(
+          'IMG_SRC_SEARCH'  => 'https://fakedomain.io/images/',
+          'IMG_SRC_REPLACE' => $localPath,
+        );
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/></p>';
+        Html::addHtml($section, $html, false, true, $options);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $baseXpath = '/w:document/w:body/w:p/w:r';
+        $this->assertTrue($doc->elementExists($baseXpath . '/w:pict/v:shape'));
+    }
+
+    /**
+     * Test parsing of remote img that can be found locally
+     *
+     * @expectedException \Exception
+     */
+    public function testCouldNotLoadImage()
+    {
+        $src = 'https://fakedomain.io/images/firefox.png';
+
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p><img src="' . $src . '" width="150" height="200" style="float: right;"/></p>';
+        Html::addHtml($section, $html, false, true);
+    }
+
     public function testParseLink()
     {
         $phpWord = new \PhpOffice\PhpWord\PhpWord();

From aa271091016a2ae8a793b404fcb170d37b87bbd3 Mon Sep 17 00:00:00 2001
From: Omar Piani <omar.piani@gmail.com>
Date: Thu, 31 May 2018 11:43:20 +0200
Subject: [PATCH 310/370] Update Language.php

---
 src/PhpWord/Style/Language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 4e9220fd..21c416af 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -46,6 +46,9 @@ final class Language extends AbstractStyle
 
     const HE_IL = 'he-IL';
     const HE_IL_ID = 1037;
+    
+    const IT_IT = 'it-IT';
+    const IT_IT_ID = 1040;
 
     const JA_JP = 'ja-JP';
     const JA_JP_ID = 1041;

From 0bd7c0b301494f27e07b5984a5c24ac2d3f934b0 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 31 May 2018 19:50:43 +0200
Subject: [PATCH 311/370] Add constants for  Italian

---
 src/PhpWord/Style/Language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 21c416af..5284bbf3 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -46,7 +46,7 @@ final class Language extends AbstractStyle
 
     const HE_IL = 'he-IL';
     const HE_IL_ID = 1037;
-    
+
     const IT_IT = 'it-IT';
     const IT_IT_ID = 1040;
 

From 4e37afa15da62cdd695a18db2a40d86615086e9d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 31 May 2018 20:10:49 +0200
Subject: [PATCH 312/370] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb1cb5c..221377df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@ v0.15.0 (?? ??? 2018)
 - Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
-- Fix missing column with in ODText writer @potofcoffee #413
+- Fix missing column width in ODText writer @potofcoffee #413
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284

From d9ddc162a362cae5ef3842e5d44e052aa946a1e9 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 18 Apr 2018 22:34:53 +0200
Subject: [PATCH 313/370] write column width in ODT writer

---
 CHANGELOG.md                                  |  1 +
 src/PhpWord/Element/Table.php                 | 24 +++++++
 src/PhpWord/Style/Table.php                   | 27 ++++++++
 src/PhpWord/Writer/ODText/Element/Table.php   | 63 ++++++++++++++-----
 src/PhpWord/Writer/ODText/Part/Content.php    |  1 +
 src/PhpWord/Writer/ODText/Style/Table.php     | 13 ++++
 src/PhpWord/Writer/Word2007/Element/Table.php | 16 +----
 7 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7b7ed68..868a4eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ v0.15.0 (?? ??? 2018)
 - Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
+- Fix missing column with in ODText writer @potofcoffee #413
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 10c4db69..16102119 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -149,4 +149,28 @@ class Table extends AbstractElement
 
         return $columnCount;
     }
+
+    /**
+     * The first declared cell width for each column
+     *
+     * @return int[]
+     */
+    public function findFirstDefinedCellWidths()
+    {
+        $cellWidths = array();
+        if (is_array($this->rows)) {
+            foreach ($this->rows as $row) {
+                $cells = $row->getCells();
+                if (count($cells) <= count($cellWidths)) {
+                    continue;
+                }
+                $cellWidths = array();
+                foreach ($cells as $cell) {
+                    $cellWidths[] = $cell->getWidth();
+                }
+            }
+        }
+
+        return $cellWidths;
+    }
 }
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
index b622c78b..0f7bf7dc 100644
--- a/src/PhpWord/Style/Table.php
+++ b/src/PhpWord/Style/Table.php
@@ -163,6 +163,13 @@ class Table extends Border
     /** @var TblWidthComplexType|null */
     private $indent;
 
+    /**
+     * The width of each column, computed based on the max cell width of each column
+     *
+     * @var int[]
+     */
+    private $columnWidths;
+
     /**
      * Create new table style
      *
@@ -748,4 +755,24 @@ class Table extends Border
 
         return $this;
     }
+
+    /**
+     * Get the columnWidths
+     *
+     * @return number[]
+     */
+    public function getColumnWidths()
+    {
+        return $this->columnWidths;
+    }
+
+    /**
+     * The column widths
+     *
+     * @param int[] $value
+     */
+    public function setColumnWidths(array $value = null)
+    {
+        $this->columnWidths = $value;
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
index 8a21ee1b..088330ae 100644
--- a/src/PhpWord/Writer/ODText/Element/Table.php
+++ b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -17,6 +17,10 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
+use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Row as RowElement;
+use PhpOffice\PhpWord\Element\Table as TableElement;
+
 /**
  * Table element writer
  *
@@ -36,32 +40,59 @@ class Table extends AbstractElement
         }
         $rows = $element->getRows();
         $rowCount = count($rows);
-        $colCount = $element->countColumns();
 
         if ($rowCount > 0) {
             $xmlWriter->startElement('table:table');
             $xmlWriter->writeAttribute('table:name', $element->getElementId());
             $xmlWriter->writeAttribute('table:style', $element->getElementId());
 
-            $xmlWriter->startElement('table:table-column');
-            $xmlWriter->writeAttribute('table:number-columns-repeated', $colCount);
-            $xmlWriter->endElement(); // table:table-column
+            // Write columns
+            $this->writeColumns($xmlWriter, $element);
 
+            // Write rows
             foreach ($rows as $row) {
-                $xmlWriter->startElement('table:table-row');
-                /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
-                foreach ($row->getCells() as $cell) {
-                    $xmlWriter->startElement('table:table-cell');
-                    $xmlWriter->writeAttribute('office:value-type', 'string');
-
-                    $containerWriter = new Container($xmlWriter, $cell);
-                    $containerWriter->write();
-
-                    $xmlWriter->endElement(); // table:table-cell
-                }
-                $xmlWriter->endElement(); // table:table-row
+                $this->writeRow($xmlWriter, $row);
             }
             $xmlWriter->endElement(); // table:table
         }
     }
+
+    /**
+     * Write column.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Table $element
+     */
+    private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
+    {
+        $colCount = $element->countColumns();
+
+        for ($i = 0; $i < $colCount; $i++) {
+            $xmlWriter->startElement('table:table-column');
+            $xmlWriter->writeAttribute('table:style-name', $element->getElementId() . '.' . $i);
+            $xmlWriter->endElement();
+        }
+    }
+
+    /**
+     * Write row.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Row $row
+     */
+    private function writeRow(XMLWriter $xmlWriter, RowElement $row)
+    {
+        $xmlWriter->startElement('table:table-row');
+        /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
+        foreach ($row->getCells() as $cell) {
+            $xmlWriter->startElement('table:table-cell');
+            $xmlWriter->writeAttribute('office:value-type', 'string');
+
+            $containerWriter = new Container($xmlWriter, $cell);
+            $containerWriter->write();
+
+            $xmlWriter->endElement(); // table:table-cell
+        }
+        $xmlWriter->endElement(); // table:table-row
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index a50eea7b..b705bb5e 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -246,6 +246,7 @@ class Content extends AbstractPart
                     $style = Style::getStyle($style);
                 }
                 $style->setStyleName($element->getElementId());
+                $style->setColumnWidths($element->findFirstDefinedCellWidths());
                 $this->autoStyles['Table'][] = $style;
             }
         }
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index 249321cf..f5a3c431 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -45,5 +45,18 @@ class Table extends AbstractStyle
         $xmlWriter->writeAttribute('table:align', 'center');
         $xmlWriter->endElement(); // style:table-properties
         $xmlWriter->endElement(); // style:style
+
+        $cellWidths = $style->getColumnWidths();
+
+        for ($i = 0; $i < count($cellWidths); $i++) {
+            $width = $cellWidths[$i];
+            $xmlWriter->startElement('style:style');
+            $xmlWriter->writeAttribute('style:name', $style->getStyleName() . '.' . $i);
+            $xmlWriter->writeAttribute('style:family', 'table-column');
+            $xmlWriter->startElement('style:table-column-properties');
+            $xmlWriter->writeAttribute('style:column-width', number_format($width * 0.0017638889, 2, '.', '') . 'cm');
+            $xmlWriter->endElement(); // style:table-column-properties
+            $xmlWriter->endElement(); // style:style
+        }
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
index 25a48ab2..c365b028 100644
--- a/src/PhpWord/Writer/Word2007/Element/Table.php
+++ b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -76,21 +76,7 @@ class Table extends AbstractElement
      */
     private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
     {
-        $rows = $element->getRows();
-        $rowCount = count($rows);
-
-        $cellWidths = array();
-        for ($i = 0; $i < $rowCount; $i++) {
-            $row = $rows[$i];
-            $cells = $row->getCells();
-            if (count($cells) <= count($cellWidths)) {
-                continue;
-            }
-            $cellWidths = array();
-            foreach ($cells as $cell) {
-                $cellWidths[] = $cell->getWidth();
-            }
-        }
+        $cellWidths = $element->findFirstDefinedCellWidths();
 
         $xmlWriter->startElement('w:tblGrid');
         foreach ($cellWidths as $width) {

From da43a880e36fc43c6d715cfbb5adb89eee02350f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 3 Jun 2018 00:22:08 +0200
Subject: [PATCH 314/370] Address scrutinizer issues

---
 src/PhpWord/Element/Table.php              | 36 ++++++++++------------
 src/PhpWord/Writer/ODText/Part/Content.php |  1 +
 src/PhpWord/Writer/ODText/Style/Table.php  |  3 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
index 16102119..44fe3744 100644
--- a/src/PhpWord/Element/Table.php
+++ b/src/PhpWord/Element/Table.php
@@ -135,15 +135,14 @@ class Table extends AbstractElement
     public function countColumns()
     {
         $columnCount = 0;
-        if (is_array($this->rows)) {
-            $rowCount = count($this->rows);
-            for ($i = 0; $i < $rowCount; $i++) {
-                /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
-                $row = $this->rows[$i];
-                $cellCount = count($row->getCells());
-                if ($columnCount < $cellCount) {
-                    $columnCount = $cellCount;
-                }
+
+        $rowCount = count($this->rows);
+        for ($i = 0; $i < $rowCount; $i++) {
+            /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
+            $row = $this->rows[$i];
+            $cellCount = count($row->getCells());
+            if ($columnCount < $cellCount) {
+                $columnCount = $cellCount;
             }
         }
 
@@ -158,16 +157,15 @@ class Table extends AbstractElement
     public function findFirstDefinedCellWidths()
     {
         $cellWidths = array();
-        if (is_array($this->rows)) {
-            foreach ($this->rows as $row) {
-                $cells = $row->getCells();
-                if (count($cells) <= count($cellWidths)) {
-                    continue;
-                }
-                $cellWidths = array();
-                foreach ($cells as $cell) {
-                    $cellWidths[] = $cell->getWidth();
-                }
+
+        foreach ($this->rows as $row) {
+            $cells = $row->getCells();
+            if (count($cells) <= count($cellWidths)) {
+                continue;
+            }
+            $cellWidths = array();
+            foreach ($cells as $cell) {
+                $cellWidths[] = $cell->getWidth();
             }
         }
 
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
index b705bb5e..99ee9353 100644
--- a/src/PhpWord/Writer/ODText/Part/Content.php
+++ b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -239,6 +239,7 @@ class Content extends AbstractPart
                 $style->setStyleName('fr' . $element->getMediaIndex());
                 $this->autoStyles['Image'][] = $style;
             } elseif ($element instanceof Table) {
+                /** @var \PhpOffice\PhpWord\Style\Table $style */
                 $style = $element->getStyle();
                 if ($style === null) {
                     $style = new TableStyle();
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
index f5a3c431..5ddee25a 100644
--- a/src/PhpWord/Writer/ODText/Style/Table.php
+++ b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -47,8 +47,9 @@ class Table extends AbstractStyle
         $xmlWriter->endElement(); // style:style
 
         $cellWidths = $style->getColumnWidths();
+        $countCellWidths = count($cellWidths);
 
-        for ($i = 0; $i < count($cellWidths); $i++) {
+        for ($i = 0; $i < $countCellWidths; $i++) {
             $width = $cellWidths[$i];
             $xmlWriter->startElement('style:style');
             $xmlWriter->writeAttribute('style:name', $style->getStyleName() . '.' . $i);

From 5b9719071e1454bdbd4faa5940ba81636334ca73 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 3 Jun 2018 22:36:30 +0200
Subject: [PATCH 315/370] remove unused imports

---
 samples/Sample_01_SimpleText.php                    | 1 -
 tests/PhpWord/Style/PaperTest.php                   | 1 -
 tests/PhpWord/Writer/Word2007/Part/SettingsTest.php | 1 -
 3 files changed, 3 deletions(-)

diff --git a/samples/Sample_01_SimpleText.php b/samples/Sample_01_SimpleText.php
index 5a3393b3..8af44d20 100644
--- a/samples/Sample_01_SimpleText.php
+++ b/samples/Sample_01_SimpleText.php
@@ -1,6 +1,5 @@
 <?php
 use PhpOffice\PhpWord\Style\Font;
-use PhpOffice\PhpWord\Style\Paragraph;
 
 include_once 'Sample_Header.php';
 
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index 688f31af..f8f00701 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -17,7 +17,6 @@
 
 namespace PhpOffice\PhpWord\Style;
 
-use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 8201d746..8d080f33 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -20,7 +20,6 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;

From fe647f6e5520b16dfe33b19ce9a2a8c8be05e3d1 Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 13 Jun 2018 17:41:17 +0200
Subject: [PATCH 316/370] fix when style line-height size comes in decimal
 number

---
 samples/resources/Sample_30_ReadHTML.html | 9 ++++++---
 src/PhpWord/Shared/Html.php               | 2 +-
 tests/PhpWord/Shared/ConverterTest.php    | 1 +
 tests/PhpWord/Shared/HtmlTest.php         | 5 +++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index b3d2fad2..3ccbb5f2 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -17,9 +17,12 @@
 <h2>Includes images</h2>
 <img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
 
-<img src="https://localhost/gev/desarrollo/actividades/pruebas_14/5b064503587f7.jpeg" name="Imagen 12" align="bottom" width="208" height="183" border="0"/>
-<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b064503589db.png" name="Imagen 13" align="bottom" width="143" height="202" border="0"/>
-<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b0645035aac8.jpeg" name="Imagen 14" align="bottom" width="194" height="188" border="0"/>
+<h2>Nested p and i</h2>
+<p class="western" align="right" style="font-weight: normal; line-height: 0.17in; orphans: 0; widows: 0">
+  Contenido
+  <font size="2" style="font-size: 9pt"><i>B.O. de la Provincia de Barcelona</i></font>
+  <font size="2" style="font-size: 9pt">, 6-9-1939, citado en Díaz Plaja, F.: "España 1939-1979",</font>
+</p>
 
 </body>
 </html>
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 58ce2412..f5a7e567 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -530,7 +530,7 @@ class Html
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
                 case 'line-height':
-                    if (preg_match('/([0-9]+[a-z]+)/', $cValue, $matches)) {
+                    if (preg_match('/([0-9]+\.?[0-9]*[a-z]+)/', $cValue, $matches)) {
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
                         $spacing = Converter::cssToTwip($matches[1]) / \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
                     } elseif (preg_match('/([0-9]+)%/', $cValue, $matches)) {
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
index 3798a07b..fbe92c25 100644
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ b/tests/PhpWord/Shared/ConverterTest.php
@@ -126,6 +126,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(10, Converter::cssToPoint('10pt'));
         $this->assertEquals(7.5, Converter::cssToPoint('10px'));
         $this->assertEquals(720, Converter::cssToPoint('10in'));
+        $this->assertEquals(7.2, Converter::cssToPoint('0.1in'));
         $this->assertEquals(120, Converter::cssToPoint('10pc'));
         $this->assertEquals(28.346457, Converter::cssToPoint('10mm'), '', 0.000001);
         $this->assertEquals(283.464567, Converter::cssToPoint('10cm'), '', 0.000001);
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 481b5d75..ac273ad0 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -141,6 +141,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         Html::addHtml($section, '<p style="line-height: 1.5;">test</p>');
         Html::addHtml($section, '<p style="line-height: 15pt;">test</p>');
         Html::addHtml($section, '<p style="line-height: 120%;">test</p>');
+        Html::addHtml($section, '<p style="line-height: 0.17in;">test</p>');
 
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:spacing'));
@@ -154,6 +155,10 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[3]/w:pPr/w:spacing'));
         $this->assertEquals(Paragraph::LINE_HEIGHT * 1.2, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:line'));
         $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:lineRule'));
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[4]/w:pPr/w:spacing'));
+        $this->assertEquals(244.8, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:line'));
+        $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:lineRule'));
     }
 
     /**

From c93880b1250b06a73b557617f693c3cfd30dd59d Mon Sep 17 00:00:00 2001
From: Javier Garcia <jgp@sens2web.es>
Date: Wed, 13 Jun 2018 18:14:13 +0200
Subject: [PATCH 317/370] clean sample resource

---
 samples/resources/Sample_30_ReadHTML.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index 3ccbb5f2..0ff1a414 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -17,12 +17,5 @@
 <h2>Includes images</h2>
 <img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
 
-<h2>Nested p and i</h2>
-<p class="western" align="right" style="font-weight: normal; line-height: 0.17in; orphans: 0; widows: 0">
-  Contenido
-  <font size="2" style="font-size: 9pt"><i>B.O. de la Provincia de Barcelona</i></font>
-  <font size="2" style="font-size: 9pt">, 6-9-1939, citado en Díaz Plaja, F.: "España 1939-1979",</font>
-</p>
-
 </body>
 </html>

From 94cf1aecb6fa9dce566a4b88aeb282b33e9cc5b7 Mon Sep 17 00:00:00 2001
From: Jonathan Jefferies <jjok@users.noreply.github.com>
Date: Fri, 13 Jul 2018 23:12:34 +0100
Subject: [PATCH 318/370] Require `ext-zip` for development (#1419)

* Require `ext-zip` for development
* Require `ext-gd` for development
---
 composer.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/composer.json b/composer.json
index dd3a2de8..9a14618e 100644
--- a/composer.json
+++ b/composer.json
@@ -64,6 +64,8 @@
         "phpoffice/common": "^0.2"
     },
     "require-dev": {
+        "ext-zip": "*",
+        "ext-gd": "*",
         "phpunit/phpunit": "^4.8.36 || ^5.0",
         "squizlabs/php_codesniffer": "^2.9",
         "friendsofphp/php-cs-fixer": "^2.2",

From 536a1b89d73c1f7a14322839cd5598eddb3d1cfc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 00:50:01 +0200
Subject: [PATCH 319/370] disable entity loader

---
 composer.json                           | 2 +-
 src/PhpWord/Shared/Html.php             | 1 +
 src/PhpWord/TemplateProcessor.php       | 1 +
 tests/PhpWord/_includes/XmlDocument.php | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9a14618e..4bba86b3 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
     "require-dev": {
         "ext-zip": "*",
         "ext-gd": "*",
-        "phpunit/phpunit": "^4.8.36 || ^5.0",
+        "phpunit/phpunit": "^4.8.36 || ^7.0",
         "squizlabs/php_codesniffer": "^2.9",
         "friendsofphp/php-cs-fixer": "^2.2",
         "phpmd/phpmd": "2.*",
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 239cfd1d..a4281678 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -71,6 +71,7 @@ class Html
         }
 
         // Load DOM
+        libxml_disable_entity_loader(true);
         $dom = new \DOMDocument();
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 72446ae7..946d6691 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -113,6 +113,7 @@ class TemplateProcessor
      */
     protected function transformSingleXml($xml, $xsltProcessor)
     {
+        libxml_disable_entity_loader(true);
         $domDocument = new \DOMDocument();
         if (false === $domDocument->loadXML($xml)) {
             throw new Exception('Could not load the given XML document.');
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 8c937bf5..81de7eff 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -76,8 +76,10 @@ class XmlDocument
         $this->file = $file;
 
         $file = $this->path . '/' . $file;
+        libxml_disable_entity_loader(false);
         $this->dom = new \DOMDocument();
         $this->dom->load($file);
+        libxml_disable_entity_loader(true);
 
         return $this->dom;
     }

From 96b21badaf99442f2a1de5a1b2298ae371d0e901 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 00:54:41 +0200
Subject: [PATCH 320/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdd78870..d2b009dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ v0.15.0 (?? ??? 2018)
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
 - Fix missing column width in ODText writer @potofcoffee #413
+- Disable entity loader before parsing XML to avoid XXE injection @Tom4t0 #1427
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284

From 4c4c6f43ca446c0998f925f52b3b1aa3fe5289bb Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 00:59:54 +0200
Subject: [PATCH 321/370] remove options not compatible with latest phpunit
 version

---
 phpunit.xml.dist | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 015dd2ed..17fcfa39 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,8 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
     <testsuites>
         <testsuite name="PhpWord Test Suite">
             <directory>./tests/PhpWord</directory>
@@ -22,7 +21,7 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="./build/coverage" charset="UTF-8" highlight="true" />
+        <log type="coverage-html" target="./build/coverage" />
         <log type="coverage-clover" target="./build/logs/clover.xml" />
     </logging>
 </phpunit>
\ No newline at end of file

From 3906be19ee92729a4e12bdbd499f031aae12bf03 Mon Sep 17 00:00:00 2001
From: smaug1985 <smaug1985b@gmail.com>
Date: Sat, 14 Jul 2018 02:13:45 +0200
Subject: [PATCH 322/370] Added Support for Indentation  & Tabs on RTF Writer.
 (#1405)

* Added Support for Indentation  & Tabs on RTF Writer.
* add decimal tab writer + tests
* Update CHANGELOG.md
---
 CHANGELOG.md                                 |  1 +
 src/PhpWord/Writer/RTF/Style/Indentation.php | 45 ++++++++++++++++
 src/PhpWord/Writer/RTF/Style/Paragraph.php   | 40 ++++++++++++++
 src/PhpWord/Writer/RTF/Style/Tab.php         | 49 +++++++++++++++++
 tests/PhpWord/Writer/RTF/StyleTest.php       | 55 +++++++++++++++++++-
 5 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 src/PhpWord/Writer/RTF/Style/Indentation.php
 create mode 100644 src/PhpWord/Writer/RTF/Style/Tab.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2b009dc..03387b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ v0.15.0 (?? ??? 2018)
 - Added parsing of internal links in HTML reader @lalop #1336
 - Several improvements to charts @JAEK-S #1332
 - Add parsing of html image in base64 format @jgpATs2w #1382
+- Added Support for Indentation & Tabs on RTF Writer. @smaug1985 #1405
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/src/PhpWord/Writer/RTF/Style/Indentation.php b/src/PhpWord/Writer/RTF/Style/Indentation.php
new file mode 100644
index 00000000..5c80af0c
--- /dev/null
+++ b/src/PhpWord/Writer/RTF/Style/Indentation.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2018 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\RTF\Style;
+
+/**
+ * RTF indentation style writer
+ *
+ * @since 0.11.0
+ */
+class Indentation extends AbstractStyle
+{
+    /**
+     * Write style
+     *
+     * @return string
+     */
+    public function write()
+    {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Indentation) {
+            return;
+        }
+
+        $content = '\fi' . $style->getFirstLine();
+        $content .= '\li' . $style->getLeft();
+        $content .= '\ri' . $style->getRight();
+
+        return $content . ' ';
+    }
+}
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index 3b8690cd..cb50a31b 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -64,9 +64,49 @@ class Paragraph extends AbstractStyle
         if (isset($alignments[$style->getAlignment()])) {
             $content .= $alignments[$style->getAlignment()];
         }
+        $content .= $this->writeIndentation($style->getIndentation());
         $content .= $this->getValueIf($spaceBefore !== null, '\sb' . $spaceBefore);
         $content .= $this->getValueIf($spaceAfter !== null, '\sa' . $spaceAfter);
 
+        $styles = $style->getStyleValues();
+        $content .= $this->writeTabs($styles['tabs']);
+
+        return $content;
+    }
+
+    /**
+     * Writes an \PhpOffice\PhpWord\Style\Indentation
+     *
+     * @param null|\PhpOffice\PhpWord\Style\Indentation $indent
+     * @return string
+     */
+    private function writeIndentation($indent = null)
+    {
+        if (isset($indent) && $indent instanceof \PhpOffice\PhpWord\Style\Indentation) {
+            $writer = new Indentation($indent);
+
+            return $writer->write();
+        }
+
+        return '';
+    }
+
+    /**
+     * Writes tabs
+     *
+     * @param \PhpOffice\PhpWord\Style\Tab[] $tabs
+     * @return string
+     */
+    private function writeTabs($tabs = null)
+    {
+        $content = '';
+        if (!empty($tabs)) {
+            foreach ($tabs as $tab) {
+                $styleWriter = new Tab($tab);
+                $content .= $styleWriter->write();
+            }
+        }
+
         return $content;
     }
 
diff --git a/src/PhpWord/Writer/RTF/Style/Tab.php b/src/PhpWord/Writer/RTF/Style/Tab.php
new file mode 100644
index 00000000..fe1f9363
--- /dev/null
+++ b/src/PhpWord/Writer/RTF/Style/Tab.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2018 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Writer\RTF\Style;
+
+/**
+ * Line numbering style writer
+ *
+ * @since 0.10.0
+ */
+class Tab extends AbstractStyle
+{
+    /**
+     * Write style.
+     */
+    public function write()
+    {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Tab) {
+            return;
+        }
+        $tabs = array(
+            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_RIGHT   => '\tqr',
+            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_CENTER  => '\tqc',
+            \PhpOffice\PhpWord\Style\Tab::TAB_STOP_DECIMAL => '\tqdec',
+        );
+        $content = '';
+        if (isset($tabs[$style->getType()])) {
+            $content .= $tabs[$style->getType()];
+        }
+        $content .= '\tx' . $style->getPosition();
+
+        return $content;
+    }
+}
diff --git a/tests/PhpWord/Writer/RTF/StyleTest.php b/tests/PhpWord/Writer/RTF/StyleTest.php
index 5f04f1a8..317014c6 100644
--- a/tests/PhpWord/Writer/RTF/StyleTest.php
+++ b/tests/PhpWord/Writer/RTF/StyleTest.php
@@ -17,7 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\RTF;
 
+use PhpOffice\PhpWord\Writer\RTF;
 use PhpOffice\PhpWord\Writer\RTF\Style\Border;
+use PHPUnit\Framework\Assert;
 
 /**
  * Test class for PhpOffice\PhpWord\Writer\RTF\Style subnamespace
@@ -29,7 +31,7 @@ class StyleTest extends \PHPUnit\Framework\TestCase
      */
     public function testEmptyStyles()
     {
-        $styles = array('Font', 'Paragraph', 'Section');
+        $styles = array('Font', 'Paragraph', 'Section', 'Tab', 'Indentation');
         foreach ($styles as $style) {
             $objectClass = 'PhpOffice\\PhpWord\\Writer\\RTF\\Style\\' . $style;
             $object = new $objectClass();
@@ -55,4 +57,55 @@ class StyleTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals($expected, $content);
     }
+
+    public function testIndentation()
+    {
+        $indentation = new \PhpOffice\PhpWord\Style\Indentation();
+        $indentation->setLeft(1);
+        $indentation->setRight(2);
+        $indentation->setFirstLine(3);
+
+        $indentWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Indentation($indentation);
+        $indentWriter->setParentWriter(new RTF());
+        $result = $indentWriter->write();
+
+        Assert::assertEquals('\fi3\li1\ri2 ', $result);
+    }
+
+    public function testRightTab()
+    {
+        $tabRight = new \PhpOffice\PhpWord\Style\Tab();
+        $tabRight->setType(\PhpOffice\PhpWord\Style\Tab::TAB_STOP_RIGHT);
+        $tabRight->setPosition(5);
+
+        $tabWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Tab($tabRight);
+        $tabWriter->setParentWriter(new RTF());
+        $result = $tabWriter->write();
+
+        Assert::assertEquals('\tqr\tx5', $result);
+    }
+
+    public function testCenterTab()
+    {
+        $tabRight = new \PhpOffice\PhpWord\Style\Tab();
+        $tabRight->setType(\PhpOffice\PhpWord\Style\Tab::TAB_STOP_CENTER);
+
+        $tabWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Tab($tabRight);
+        $tabWriter->setParentWriter(new RTF());
+        $result = $tabWriter->write();
+
+        Assert::assertEquals('\tqc\tx0', $result);
+    }
+
+    public function testDecimalTab()
+    {
+        $tabRight = new \PhpOffice\PhpWord\Style\Tab();
+        $tabRight->setType(\PhpOffice\PhpWord\Style\Tab::TAB_STOP_DECIMAL);
+
+        $tabWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Tab($tabRight);
+        $tabWriter->setParentWriter(new RTF());
+        $result = $tabWriter->write();
+
+        Assert::assertEquals('\tqdec\tx0', $result);
+    }
 }

From e028aef6d2cb6dd27a24be6334c14c38f5849dbc Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 02:26:47 +0200
Subject: [PATCH 323/370] update to final phpoffice/common version

---
 CHANGELOG.md  | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b39ce1..1f1e194b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ v0.15.0 (?? ??? 2018)
 - Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
+- Support reading of w:drawing for documents produced by word 2011+ @gthomas2 #464 #1324
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/composer.json b/composer.json
index 6dc9be2c..1844e82e 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
         "php": "^5.3.3 || ^7.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
-        "phpoffice/common": "dev-develop"
+        "phpoffice/common": "^0.2.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.0",

From adc1428607d73018ec0d088196953e99c9045c58 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 02:51:08 +0200
Subject: [PATCH 324/370] use PasswordEncoder from phpoffice/common instead

---
 src/PhpWord/Metadata/Protection.php           |   2 +-
 .../Shared/Microsoft/PasswordEncoder.php      | 235 ------------------
 src/PhpWord/Writer/Word2007/Part/Settings.php |   2 +-
 .../Shared/Microsoft/PasswordEncoderTest.php  |  91 -------
 .../Writer/Word2007/Part/SettingsTest.php     |   2 +-
 5 files changed, 3 insertions(+), 329 deletions(-)
 delete mode 100644 src/PhpWord/Shared/Microsoft/PasswordEncoder.php
 delete mode 100644 tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php

diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 584ed83e..197f8022 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -17,7 +17,7 @@
 
 namespace PhpOffice\PhpWord\Metadata;
 
-use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
+use PhpOffice\Common\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\DocProtect;
 
 /**
diff --git a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php b/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
deleted file mode 100644
index fc0c7ecd..00000000
--- a/src/PhpWord/Shared/Microsoft/PasswordEncoder.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
- * This file is part of PHPWord - A pure PHP library for reading and writing
- * word processing documents.
- *
- * PHPWord is free software distributed under the terms of the GNU Lesser
- * General Public License version 3 as published by the Free Software Foundation.
- *
- * For the full copyright and license information, please read the LICENSE
- * file that was distributed with this source code. For the full list of
- * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
- *
- * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
- */
-
-namespace PhpOffice\PhpWord\Shared\Microsoft;
-
-/**
- * Password encoder for microsoft office applications
- */
-class PasswordEncoder
-{
-    const ALGORITHM_MD2 = 'MD2';
-    const ALGORITHM_MD4 = 'MD4';
-    const ALGORITHM_MD5 = 'MD5';
-    const ALGORITHM_SHA_1 = 'SHA-1';
-    const ALGORITHM_SHA_256 = 'SHA-256';
-    const ALGORITHM_SHA_384 = 'SHA-384';
-    const ALGORITHM_SHA_512 = 'SHA-512';
-    const ALGORITHM_RIPEMD = 'RIPEMD';
-    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
-    const ALGORITHM_MAC = 'MAC';
-    const ALGORITHM_HMAC = 'HMAC';
-
-    /**
-     * Mapping between algorithm name and algorithm ID
-     *
-     * @var array
-     * @see https://msdn.microsoft.com/en-us/library/documentformat.openxml.wordprocessing.writeprotection.cryptographicalgorithmsid(v=office.14).aspx
-     */
-    private static $algorithmMapping = array(
-        self::ALGORITHM_MD2        => array(1, 'md2'),
-        self::ALGORITHM_MD4        => array(2, 'md4'),
-        self::ALGORITHM_MD5        => array(3, 'md5'),
-        self::ALGORITHM_SHA_1      => array(4, 'sha1'),
-        self::ALGORITHM_MAC        => array(5, ''), // 'mac' -> not possible with hash()
-        self::ALGORITHM_RIPEMD     => array(6, 'ripemd'),
-        self::ALGORITHM_RIPEMD_160 => array(7, 'ripemd160'),
-        self::ALGORITHM_HMAC       => array(9, ''), //'hmac' -> not possible with hash()
-        self::ALGORITHM_SHA_256    => array(12, 'sha256'),
-        self::ALGORITHM_SHA_384    => array(13, 'sha384'),
-        self::ALGORITHM_SHA_512    => array(14, 'sha512'),
-    );
-
-    private static $initialCodeArray = array(
-        0xE1F0,
-        0x1D0F,
-        0xCC9C,
-        0x84C0,
-        0x110C,
-        0x0E10,
-        0xF1CE,
-        0x313E,
-        0x1872,
-        0xE139,
-        0xD40F,
-        0x84F9,
-        0x280C,
-        0xA96A,
-        0x4EC3,
-    );
-
-    private static $encryptionMatrix = array(
-        array(0xAEFC, 0x4DD9, 0x9BB2, 0x2745, 0x4E8A, 0x9D14, 0x2A09),
-        array(0x7B61, 0xF6C2, 0xFDA5, 0xEB6B, 0xC6F7, 0x9DCF, 0x2BBF),
-        array(0x4563, 0x8AC6, 0x05AD, 0x0B5A, 0x16B4, 0x2D68, 0x5AD0),
-        array(0x0375, 0x06EA, 0x0DD4, 0x1BA8, 0x3750, 0x6EA0, 0xDD40),
-        array(0xD849, 0xA0B3, 0x5147, 0xA28E, 0x553D, 0xAA7A, 0x44D5),
-        array(0x6F45, 0xDE8A, 0xAD35, 0x4A4B, 0x9496, 0x390D, 0x721A),
-        array(0xEB23, 0xC667, 0x9CEF, 0x29FF, 0x53FE, 0xA7FC, 0x5FD9),
-        array(0x47D3, 0x8FA6, 0x0F6D, 0x1EDA, 0x3DB4, 0x7B68, 0xF6D0),
-        array(0xB861, 0x60E3, 0xC1C6, 0x93AD, 0x377B, 0x6EF6, 0xDDEC),
-        array(0x45A0, 0x8B40, 0x06A1, 0x0D42, 0x1A84, 0x3508, 0x6A10),
-        array(0xAA51, 0x4483, 0x8906, 0x022D, 0x045A, 0x08B4, 0x1168),
-        array(0x76B4, 0xED68, 0xCAF1, 0x85C3, 0x1BA7, 0x374E, 0x6E9C),
-        array(0x3730, 0x6E60, 0xDCC0, 0xA9A1, 0x4363, 0x86C6, 0x1DAD),
-        array(0x3331, 0x6662, 0xCCC4, 0x89A9, 0x0373, 0x06E6, 0x0DCC),
-        array(0x1021, 0x2042, 0x4084, 0x8108, 0x1231, 0x2462, 0x48C4),
-    );
-
-    private static $passwordMaxLength = 15;
-
-    /**
-     * Create a hashed password that MS Word will be able to work with
-     * @see https://blogs.msdn.microsoft.com/vsod/2010/04/05/how-to-set-the-editing-restrictions-in-word-using-open-xml-sdk-2-0/
-     *
-     * @param string $password
-     * @param string $algorithmName
-     * @param string $salt
-     * @param int $spinCount
-     * @return string
-     */
-    public static function hashPassword($password, $algorithmName = self::ALGORITHM_SHA_1, $salt = null, $spinCount = 10000)
-    {
-        $origEncoding = mb_internal_encoding();
-        mb_internal_encoding('UTF-8');
-
-        $password = mb_substr($password, 0, min(self::$passwordMaxLength, mb_strlen($password)));
-
-        //   Get the single-byte values by iterating through the Unicode characters of the truncated password.
-        //   For each character, if the low byte is not equal to 0, take it. Otherwise, take the high byte.
-        $passUtf8 = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
-        $byteChars = array();
-
-        for ($i = 0; $i < mb_strlen($password); $i++) {
-            $byteChars[$i] = ord(substr($passUtf8, $i * 2, 1));
-
-            if ($byteChars[$i] == 0) {
-                $byteChars[$i] = ord(substr($passUtf8, $i * 2 + 1, 1));
-            }
-        }
-
-        // build low-order word and hig-order word and combine them
-        $combinedKey = self::buildCombinedKey($byteChars);
-        // build reversed hexadecimal string
-        $hex = str_pad(strtoupper(dechex($combinedKey & 0xFFFFFFFF)), 8, '0', \STR_PAD_LEFT);
-        $reversedHex = $hex[6] . $hex[7] . $hex[4] . $hex[5] . $hex[2] . $hex[3] . $hex[0] . $hex[1];
-
-        $generatedKey = mb_convert_encoding($reversedHex, 'UCS-2LE', 'UTF-8');
-
-        // Implementation Notes List:
-        //   Word requires that the initial hash of the password with the salt not be considered in the count.
-        //   The initial hash of salt + key is not included in the iteration count.
-        $algorithm = self::getAlgorithm($algorithmName);
-        $generatedKey = hash($algorithm, $salt . $generatedKey, true);
-
-        for ($i = 0; $i < $spinCount; $i++) {
-            $generatedKey = hash($algorithm, $generatedKey . pack('CCCC', $i, $i >> 8, $i >> 16, $i >> 24), true);
-        }
-        $generatedKey = base64_encode($generatedKey);
-
-        mb_internal_encoding($origEncoding);
-
-        return $generatedKey;
-    }
-
-    /**
-     * Get algorithm from self::$algorithmMapping
-     *
-     * @param string $algorithmName
-     * @return string
-     */
-    private static function getAlgorithm($algorithmName)
-    {
-        $algorithm = self::$algorithmMapping[$algorithmName][1];
-        if ($algorithm == '') {
-            $algorithm = 'sha1';
-        }
-
-        return $algorithm;
-    }
-
-    /**
-     * Returns the algorithm ID
-     *
-     * @param string $algorithmName
-     * @return int
-     */
-    public static function getAlgorithmId($algorithmName)
-    {
-        return self::$algorithmMapping[$algorithmName][0];
-    }
-
-    /**
-     * Build combined key from low-order word and high-order word
-     *
-     * @param array $byteChars byte array representation of password
-     * @return int
-     */
-    private static function buildCombinedKey($byteChars)
-    {
-        $byteCharsLength = count($byteChars);
-        // Compute the high-order word
-        // Initialize from the initial code array (see above), depending on the passwords length.
-        $highOrderWord = self::$initialCodeArray[$byteCharsLength - 1];
-
-        // For each character in the password:
-        //   For every bit in the character, starting with the least significant and progressing to (but excluding)
-        //   the most significant, if the bit is set, XOR the key’s high-order word with the corresponding word from
-        //   the Encryption Matrix
-        for ($i = 0; $i < $byteCharsLength; $i++) {
-            $tmp = self::$passwordMaxLength - $byteCharsLength + $i;
-            $matrixRow = self::$encryptionMatrix[$tmp];
-            for ($intBit = 0; $intBit < 7; $intBit++) {
-                if (($byteChars[$i] & (0x0001 << $intBit)) != 0) {
-                    $highOrderWord = ($highOrderWord ^ $matrixRow[$intBit]);
-                }
-            }
-        }
-
-        // Compute low-order word
-        // Initialize with 0
-        $lowOrderWord = 0;
-        // For each character in the password, going backwards
-        for ($i = $byteCharsLength - 1; $i >= 0; $i--) {
-            // low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR character
-            $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteChars[$i]);
-        }
-        // Lastly, low-order word = (((low-order word SHR 14) AND 0x0001) OR (low-order word SHL 1) AND 0x7FFF)) XOR strPassword length XOR 0xCE4B.
-        $lowOrderWord = (((($lowOrderWord >> 14) & 0x0001) | (($lowOrderWord << 1) & 0x7FFF)) ^ $byteCharsLength ^ 0xCE4B);
-
-        // Combine the Low and High Order Word
-        return self::int32(($highOrderWord << 16) + $lowOrderWord);
-    }
-
-    /**
-     * Simulate behaviour of (signed) int32
-     *
-     * @codeCoverageIgnore
-     * @param int $value
-     * @return int
-     */
-    private static function int32($value)
-    {
-        $value = ($value & 0xFFFFFFFF);
-
-        if ($value & 0x80000000) {
-            $value = -((~$value & 0xFFFFFFFF) + 1);
-        }
-
-        return $value;
-    }
-}
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
index 42d3a5d5..b764642a 100644
--- a/src/PhpWord/Writer/Word2007/Part/Settings.php
+++ b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -17,9 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\Common\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
-use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\Style\Language;
 
 /**
diff --git a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php b/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
deleted file mode 100644
index 5a050c54..00000000
--- a/tests/PhpWord/Shared/Microsoft/PasswordEncoderTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * This file is part of PHPWord - A pure PHP library for reading and writing
- * word processing documents.
- *
- * PHPWord is free software distributed under the terms of the GNU Lesser
- * General Public License version 3 as published by the Free Software Foundation.
- *
- * For the full copyright and license information, please read the LICENSE
- * file that was distributed with this source code. For the full list of
- * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
- *
- * @see         https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2018 PHPWord contributors
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
- */
-
-namespace PhpOffice\PhpWord\Shared;
-
-use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test class for PhpOffice\PhpWord\Shared\Html
- * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
- */
-class PasswordEncoderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * Test that a password can be hashed without specifying any additional parameters
-     */
-    public function testEncodePassword()
-    {
-        //given
-        $password = 'test';
-
-        //when
-        $hashPassword = PasswordEncoder::hashPassword($password);
-
-        //then
-        TestCase::assertEquals('M795/MAlmGU8RIsY9Q9uDLHC7bk=', $hashPassword);
-    }
-
-    /**
-     * Test that a password can be hashed with a custom salt
-     */
-    public function testEncodePasswordWithSalt()
-    {
-        //given
-        $password = 'test';
-        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
-
-        //when
-        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_SHA_1, $salt);
-
-        //then
-        TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
-    }
-
-    /**
-     * Test that the encoder falls back on SHA-1 if a non supported algorithm is given
-     */
-    public function testDafaultsToSha1IfUnsupportedAlgorithm()
-    {
-        //given
-        $password = 'test';
-        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
-
-        //when
-        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_MAC, $salt);
-
-        //then
-        TestCase::assertEquals('QiDOcpia1YzSVJPiKPwWebl9p/0=', $hashPassword);
-    }
-
-    /**
-     * Test that the encoder falls back on SHA-1 if a non supported algorithm is given
-     */
-    public function testEncodePasswordWithNullAsciiCodeInPassword()
-    {
-        //given
-        $password = 'test' . chr(0);
-        $salt = base64_decode('uq81pJRRGFIY5U+E9gt8tA==');
-
-        //when
-        $hashPassword = PasswordEncoder::hashPassword($password, PasswordEncoder::ALGORITHM_MAC, $salt, 1);
-
-        //then
-        TestCase::assertEquals('rDV9sgdDsztoCQlvRCb1lF2wxNg=', $hashPassword);
-    }
-}
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 8d080f33..8a21e827 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -17,10 +17,10 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Part;
 
+use PhpOffice\Common\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;
 use PhpOffice\PhpWord\TestHelperDOCX;

From 32907215ed33096f2761d15619fae36b34e3239d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 02:54:17 +0200
Subject: [PATCH 325/370] fix phpstan issues

---
 phpstan.neon                                  |  2 +-
 src/PhpWord/Element/Title.php                 | 14 ++++++--------
 src/PhpWord/Shared/Html.php                   |  2 +-
 src/PhpWord/Writer/Word2007/Element/Title.php |  1 +
 src/PhpWord/Writer/Word2007/Part/Chart.php    |  4 ++--
 tests/PhpWord/Writer/HTML/ElementTest.php     |  6 +++---
 tests/PhpWord/_includes/XmlDocument.php       |  6 +++---
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index 5ae6d0f2..666c63b9 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,7 @@
 includes:
 	- vendor/phpstan/phpstan/conf/config.level1.neon
 parameters:
-	memory-limit: 200000
+	memory-limit: 20000000
 	autoload_directories:
 		- tests
 	autoload_files:
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index 569cea92..eb261b1f 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -61,14 +61,12 @@ class Title extends AbstractElement
      */
     public function __construct($text, $depth = 1)
     {
-        if (isset($text)) {
-            if (is_string($text)) {
-                $this->text = CommonText::toUTF8($text);
-            } elseif ($text instanceof TextRun) {
-                $this->text = $text;
-            } else {
-                throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
-            }
+        if (is_string($text)) {
+            $this->text = CommonText::toUTF8($text);
+        } elseif ($text instanceof TextRun) {
+            $this->text = $text;
+        } else {
+            throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
         }
 
         $this->depth = $depth;
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index a4281678..f725c366 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -75,7 +75,7 @@ class Html
         $dom = new \DOMDocument();
         $dom->preserveWhiteSpace = $preserveWhiteSpace;
         $dom->loadXML($html);
-        self::$xpath = new \DOMXpath($dom);
+        self::$xpath = new \DOMXPath($dom);
         $node = $dom->getElementsByTagName('body');
 
         self::parseNode($node->item(0), $element);
diff --git a/src/PhpWord/Writer/Word2007/Element/Title.php b/src/PhpWord/Writer/Word2007/Element/Title.php
index 858ecfef..6a05a34d 100644
--- a/src/PhpWord/Writer/Word2007/Element/Title.php
+++ b/src/PhpWord/Writer/Word2007/Element/Title.php
@@ -47,6 +47,7 @@ class Title extends AbstractElement
             $xmlWriter->endElement();
         }
 
+        $bookmarkRId = null;
         if ($element->getDepth() !== 0) {
             $rId = $element->getRelationId();
             $bookmarkRId = $element->getPhpWord()->addBookmark();
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 17c1fd54..5a3ef276 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -330,11 +330,11 @@ class Chart extends AbstractPart
         $valueAxisTitle = $style->getValueAxisTitle();
 
         if ($axisType == 'c:catAx') {
-            if (isset($categoryAxisTitle)) {
+            if (!is_null($categoryAxisTitle)) {
                 $this->writeAxisTitle($xmlWriter, $categoryAxisTitle);
             }
         } elseif ($axisType == 'c:valAx') {
-            if (isset($valueAxisTitle)) {
+            if (!is_null($valueAxisTitle)) {
                 $this->writeAxisTitle($xmlWriter, $valueAxisTitle);
             }
         }
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 90044b92..b76ddded 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -70,7 +70,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $text2->setTrackChange(new TrackChange(TrackChange::DELETED, 'another author', new \DateTime()));
 
         $dom = $this->getAsHTML($phpWord);
-        $xpath = new \DOMXpath($dom);
+        $xpath = new \DOMXPath($dom);
 
         $this->assertTrue($xpath->query('/html/body/p[1]/ins')->length == 1);
         $this->assertTrue($xpath->query('/html/body/p[2]/del')->length == 1);
@@ -94,7 +94,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $cell22->addText('second cell');
 
         $dom = $this->getAsHTML($phpWord);
-        $xpath = new \DOMXpath($dom);
+        $xpath = new \DOMXPath($dom);
 
         $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 1);
         $this->assertEquals('2', $xpath->query('/html/body/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
@@ -123,7 +123,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $row3->addCell(500)->addText('third cell being spanned');
 
         $dom = $this->getAsHTML($phpWord);
-        $xpath = new \DOMXpath($dom);
+        $xpath = new \DOMXPath($dom);
 
         $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 2);
         $this->assertEquals('3', $xpath->query('/html/body/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index 81de7eff..7062ebbf 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -37,9 +37,9 @@ class XmlDocument
     private $dom;
 
     /**
-     * DOMXpath object
+     * DOMXPath object
      *
-     * @var \DOMXpath
+     * @var \DOMXPath
      */
     private $xpath;
 
@@ -98,7 +98,7 @@ class XmlDocument
         }
 
         if (null === $this->xpath) {
-            $this->xpath = new \DOMXpath($this->dom);
+            $this->xpath = new \DOMXPath($this->dom);
             $this->xpath->registerNamespace('w14', 'http://schemas.microsoft.com/office/word/2010/wordml');
         }
 

From 6475812e828be030a39adc8c8d9a925bd9d163b7 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 03:28:09 +0200
Subject: [PATCH 326/370] fix documentation

---
 src/PhpWord/Element/OLEObject.php            |  2 +-
 src/PhpWord/Element/PreserveText.php         |  6 ++----
 src/PhpWord/Element/Title.php                |  2 --
 src/PhpWord/Metadata/Protection.php          |  6 +++---
 src/PhpWord/Reader/Word2007/Settings.php     | 10 +++++-----
 src/PhpWord/Writer/RTF/Style/Indentation.php |  2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/PhpWord/Element/OLEObject.php b/src/PhpWord/Element/OLEObject.php
index c0c7f217..1a17b747 100644
--- a/src/PhpWord/Element/OLEObject.php
+++ b/src/PhpWord/Element/OLEObject.php
@@ -83,7 +83,7 @@ class OLEObject extends AbstractElement
             $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
             $this->icon = realpath(__DIR__ . "/../resources/{$ext}.png");
 
-            return $this;
+            return;
         }
 
         throw new InvalidObjectException();
diff --git a/src/PhpWord/Element/PreserveText.php b/src/PhpWord/Element/PreserveText.php
index 1ce2dcdd..374f1a99 100644
--- a/src/PhpWord/Element/PreserveText.php
+++ b/src/PhpWord/Element/PreserveText.php
@@ -29,7 +29,7 @@ class PreserveText extends AbstractElement
     /**
      * Text content
      *
-     * @var string
+     * @var string|array
      */
     private $text;
 
@@ -64,8 +64,6 @@ class PreserveText extends AbstractElement
         if (isset($matches[0])) {
             $this->text = $matches;
         }
-
-        return $this;
     }
 
     /**
@@ -91,7 +89,7 @@ class PreserveText extends AbstractElement
     /**
      * Get Text content
      *
-     * @return string
+     * @return string|array
      */
     public function getText()
     {
diff --git a/src/PhpWord/Element/Title.php b/src/PhpWord/Element/Title.php
index eb261b1f..d01f7f33 100644
--- a/src/PhpWord/Element/Title.php
+++ b/src/PhpWord/Element/Title.php
@@ -74,8 +74,6 @@ class Title extends AbstractElement
         if (array_key_exists($styleName, Style::getStyles())) {
             $this->style = str_replace('_', '', $styleName);
         }
-
-        return $this;
     }
 
     /**
diff --git a/src/PhpWord/Metadata/Protection.php b/src/PhpWord/Metadata/Protection.php
index 197f8022..15aa3ff1 100644
--- a/src/PhpWord/Metadata/Protection.php
+++ b/src/PhpWord/Metadata/Protection.php
@@ -113,7 +113,7 @@ class Protection
     /**
      * Set password
      *
-     * @param $password
+     * @param string $password
      * @return self
      */
     public function setPassword($password)
@@ -136,7 +136,7 @@ class Protection
     /**
      * Set count for hash iterations
      *
-     * @param $spinCount
+     * @param int $spinCount
      * @return self
      */
     public function setSpinCount($spinCount)
@@ -159,7 +159,7 @@ class Protection
     /**
      * Set algorithm
      *
-     * @param $algorithm
+     * @param string $algorithm
      * @return self
      */
     public function setAlgorithm($algorithm)
diff --git a/src/PhpWord/Reader/Word2007/Settings.php b/src/PhpWord/Reader/Word2007/Settings.php
index dbf34623..3084943b 100644
--- a/src/PhpWord/Reader/Word2007/Settings.php
+++ b/src/PhpWord/Reader/Word2007/Settings.php
@@ -81,7 +81,7 @@ class Settings extends AbstractPart
      *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
-     * @param \DOMNode $node
+     * @param \DOMElement $node
      */
     protected function setThemeFontLang(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
@@ -102,7 +102,7 @@ class Settings extends AbstractPart
      *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
-     * @param \DOMNode $node
+     * @param \DOMElement $node
      */
     protected function setDocumentProtection(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
@@ -119,7 +119,7 @@ class Settings extends AbstractPart
      *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
-     * @param \DOMNode $node
+     * @param \DOMElement $node
      */
     protected function setProofState(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
@@ -141,7 +141,7 @@ class Settings extends AbstractPart
      *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
-     * @param \DOMNode $node
+     * @param \DOMElement $node
      */
     protected function setZoom(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
@@ -158,7 +158,7 @@ class Settings extends AbstractPart
      *
      * @param XMLReader $xmlReader
      * @param PhpWord $phpWord
-     * @param \DOMNode $node
+     * @param \DOMElement $node
      */
     protected function setRevisionView(XMLReader $xmlReader, PhpWord $phpWord, \DOMElement $node)
     {
diff --git a/src/PhpWord/Writer/RTF/Style/Indentation.php b/src/PhpWord/Writer/RTF/Style/Indentation.php
index 5c80af0c..dd52230e 100644
--- a/src/PhpWord/Writer/RTF/Style/Indentation.php
+++ b/src/PhpWord/Writer/RTF/Style/Indentation.php
@@ -33,7 +33,7 @@ class Indentation extends AbstractStyle
     {
         $style = $this->getStyle();
         if (!$style instanceof \PhpOffice\PhpWord\Style\Indentation) {
-            return;
+            return '';
         }
 
         $content = '\fi' . $style->getFirstLine();

From 54155bf5a99102378f7c399ea60f898fa2abeeff Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 17:16:24 +0200
Subject: [PATCH 327/370] Update Sample_30_ReadHTML.html

---
 samples/resources/Sample_30_ReadHTML.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/samples/resources/Sample_30_ReadHTML.html b/samples/resources/Sample_30_ReadHTML.html
index 0ff1a414..b3d2fad2 100644
--- a/samples/resources/Sample_30_ReadHTML.html
+++ b/samples/resources/Sample_30_ReadHTML.html
@@ -17,5 +17,9 @@
 <h2>Includes images</h2>
 <img src="https://phpword.readthedocs.io/en/latest/_images/phpword.png" alt=""/>
 
+<img src="https://localhost/gev/desarrollo/actividades/pruebas_14/5b064503587f7.jpeg" name="Imagen 12" align="bottom" width="208" height="183" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b064503589db.png" name="Imagen 13" align="bottom" width="143" height="202" border="0"/>
+<img src="http://localhost/gev/desarrollo/actividades/pruebas_14/5b0645035aac8.jpeg" name="Imagen 14" align="bottom" width="194" height="188" border="0"/>
+
 </body>
 </html>

From 87498e43e18f31e3161256ac0f70092c86718914 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 17:21:30 +0200
Subject: [PATCH 328/370] Allow passing short lang code

---
 CHANGELOG.md                         |  3 ++-
 src/PhpWord/Style/Language.php       | 17 ++++++++++-------
 tests/PhpWord/Style/LanguageTest.php | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03387b37..56a1d9ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.15.0 (?? ??? 2018)
+v0.15.0 (14 Jul 2018)
 ----------------------
 ### Added
 - Parsing of `align` HTML attribute - @troosan #1231
@@ -25,6 +25,7 @@ v0.15.0 (?? ??? 2018)
 - Several improvements to charts @JAEK-S #1332
 - Add parsing of html image in base64 format @jgpATs2w #1382
 - Added Support for Indentation & Tabs on RTF Writer. @smaug1985 #1405
+- Allows decimal numbers in HTML line-height style @jgpATs2w #1413
 
 ### Fixed
 - Fix reading of docx default style - @troosan #1238
diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 4a50a595..d7a76f78 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -123,8 +123,7 @@ final class Language extends AbstractStyle
      */
     public function setLatin($latin)
     {
-        $this->validateLocale($latin);
-        $this->latin = $latin;
+        $this->latin = $this->validateLocale($latin);
 
         return $this;
     }
@@ -173,8 +172,7 @@ final class Language extends AbstractStyle
      */
     public function setEastAsia($eastAsia)
     {
-        $this->validateLocale($eastAsia);
-        $this->eastAsia = $eastAsia;
+        $this->eastAsia = $this->validateLocale($eastAsia);
 
         return $this;
     }
@@ -198,8 +196,7 @@ final class Language extends AbstractStyle
      */
     public function setBidirectional($bidirectional)
     {
-        $this->validateLocale($bidirectional);
-        $this->bidirectional = $bidirectional;
+        $this->bidirectional = $this->validateLocale($bidirectional);
 
         return $this;
     }
@@ -218,12 +215,18 @@ final class Language extends AbstractStyle
      * Validates that the language passed is in the format xx-xx
      *
      * @param string $locale
-     * @return bool
+     * @return string
      */
     private function validateLocale($locale)
     {
+        if (strlen($locale) === 2) {
+            return strtolower($locale) . '-' . strtoupper($locale);
+        }
+
         if ($locale !== null && strstr($locale, '-') === false) {
             throw new \InvalidArgumentException($locale . ' is not a valid language code');
         }
+
+        return $locale;
     }
 }
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
index 99741cea..3bf516f8 100644
--- a/tests/PhpWord/Style/LanguageTest.php
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWord\Style;
 
+use PHPUnit\Framework\Assert;
+
 /**
  * Test class for PhpOffice\PhpWord\Style\Language
  *
@@ -56,7 +58,20 @@ class LanguageTest extends \PHPUnit\Framework\TestCase
      */
     public function testWrongLanguage()
     {
+        $language = new Language();
+        $language->setLatin('fra');
+    }
+
+    /**
+     * Tests that a language can be set with just a 2 char code
+     */
+    public function testShortLanguage()
+    {
+        //when
         $language = new Language();
         $language->setLatin('fr');
+
+        //then
+        Assert::assertEquals('fr-FR', $language->getLatin());
     }
 }

From 8fa1d4f2244c081ee009b16dddf9a69296c8adfe Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 17:47:34 +0200
Subject: [PATCH 329/370] run checks with php 7.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c72dd8c2..db77ff05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ php:
 
 matrix:
     include:
-        - php: 5.6
+        - php: 7.0
           env: COVERAGE=1
 
 cache:

From 4c9e75088a9f0794ec038d1f4cfccc268cdaea08 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 14 Jul 2018 18:36:29 +0200
Subject: [PATCH 330/370] alias for develop branch

[ci skip]
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9f0e8a43..5d8a855b 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.15-dev"
+            "dev-develop": "0.16-dev"
         }
     }
 }

From 198165ce5984c4b94550e15efb4a57f8e84997ff Mon Sep 17 00:00:00 2001
From: Nicolas Dermine <nicolas.dermine@gmail.com>
Date: Mon, 16 Jul 2018 19:49:30 +0200
Subject: [PATCH 331/370] allow to override TemplateProcessor#ensureUtf8Encoded

the method is `protected`,
but since it is called with `self` instead of `static`
it does not allow for subclasses to override it
---
 src/PhpWord/TemplateProcessor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 946d6691..74cd4639 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -217,10 +217,10 @@ class TemplateProcessor
 
         if (is_array($replace)) {
             foreach ($replace as &$item) {
-                $item = self::ensureUtf8Encoded($item);
+                $item = static::ensureUtf8Encoded($item);
             }
         } else {
-            $replace = self::ensureUtf8Encoded($replace);
+            $replace = static::ensureUtf8Encoded($replace);
         }
 
         if (Settings::isOutputEscapingEnabled()) {

From 0c3eb4bafc9b28313fb31c48c6bfc958a362b47f Mon Sep 17 00:00:00 2001
From: Tom-Magill <41332981+Tom-Magill@users.noreply.github.com>
Date: Tue, 17 Jul 2018 14:10:02 +0100
Subject: [PATCH 332/370] Update Chart.php

---
 src/PhpWord/Style/Chart.php | 58 +++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 5b02e636..5c96afd2 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -51,6 +51,20 @@ class Chart extends AbstractStyle
      * @var array
      */
     private $colors = array();
+    
+     /**
+     * Chart title
+     *
+     * @var string
+     */
+    private $title = null;
+
+    /**
+     * Chart legend visibility
+     *
+     * @var bool
+     */
+    private $showLegend = false;
 
     /**
      * A list of display options for data labels
@@ -220,6 +234,50 @@ class Chart extends AbstractStyle
 
         return $this;
     }
+    
+    /**
+     * Get the chart title
+     *
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Set the chart title
+     *
+     * @param string $value 
+     */
+    public function setTitle($value = null)
+    {
+        $this->title = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get chart legend visibility
+     *
+     * @return bool
+     */
+    public function getShowLegend()
+    {
+        return $this->showLegend;
+    }
+
+    /**
+     * Set chart legend visibility
+     *
+     * @param bool $value 
+     */
+    public function setShowLegend($value = false)
+    {
+        $this->showLegend = $value;
+
+        return $this;
+    }
 
     /*
      * Show labels for axis

From 139242612d750f0258472cf0bbc1f7044610785d Mon Sep 17 00:00:00 2001
From: Tom-Magill <41332981+Tom-Magill@users.noreply.github.com>
Date: Tue, 17 Jul 2018 14:11:55 +0100
Subject: [PATCH 333/370] Update Chart.php

---
 src/PhpWord/Writer/Word2007/Part/Chart.php | 32 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index 5a3ef276..e14a708b 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -105,8 +105,6 @@ class Chart extends AbstractPart
     {
         $xmlWriter->startElement('c:chart');
 
-        $xmlWriter->writeElementBlock('c:autoTitleDeleted', 'val', 1);
-
         $this->writePlotArea($xmlWriter);
 
         $xmlWriter->endElement(); // c:chart
@@ -130,6 +128,36 @@ class Chart extends AbstractPart
         $type = $this->element->getType();
         $style = $this->element->getStyle();
         $this->options = $this->types[$type];
+        
+        $title = $style->getTitle();        
+        $showLegend = $style->getShowLegend();
+
+        //Chart title
+        if($title){            
+            $xmlWriter->startElement('c:title');
+            $xmlWriter->startElement('c:tx');
+            $xmlWriter->startElement('c:rich');
+            $xmlWriter->writeRaw('
+                <a:bodyPr/>
+                <a:lstStyle/>
+                <a:p>
+                <a:pPr>
+                <a:defRPr/></a:pPr><a:r><a:rPr/><a:t>'.$title.'</a:t></a:r>
+                <a:endParaRPr/>
+                </a:p>');
+
+            $xmlWriter->endElement(); // c:rich
+            $xmlWriter->endElement(); // c:tx
+            $xmlWriter->endElement(); // c:title
+
+        }else{
+            $xmlWriter->writeElementBlock('c:autoTitleDeleted', 'val', 1);
+        }
+
+        //Chart legend
+        if($showLegend){
+            $xmlWriter->writeRaw('<c:legend><c:legendPos val="r"/></c:legend>');
+        }
 
         $xmlWriter->startElement('c:plotArea');
         $xmlWriter->writeElement('c:layout');

From 8c62cea580e5d9aa7b5c496ccad98114b7466422 Mon Sep 17 00:00:00 2001
From: Humberto Pereira <humberto.pereira@prixxtecnologia.com.br>
Date: Tue, 17 Jul 2018 21:10:53 -0400
Subject: [PATCH 334/370] Fix Writer losing text when Title contains a TextRun
 instead a string.

---
 src/PhpWord/Writer/HTML/Element/Title.php |  2 +-
 tests/PhpWord/Writer/HTML/ElementTest.php | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Title.php b/src/PhpWord/Writer/HTML/Element/Title.php
index 7307ce0c..04ed61f5 100644
--- a/src/PhpWord/Writer/HTML/Element/Title.php
+++ b/src/PhpWord/Writer/HTML/Element/Title.php
@@ -45,7 +45,7 @@ class Title extends AbstractElement
                 $text = $this->escaper->escapeHtml($text);
             }
         } elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
-            $writer = new Container($this->parentWriter, $this->element);
+            $writer = new Container($this->parentWriter, $text);
             $text = $writer->write();
         }
 
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index b76ddded..7a6397ef 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpWord\Writer\HTML;
 
 use PhpOffice\PhpWord\Element\Text as TextElement;
+use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\TrackChange;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Writer\HTML;
@@ -138,4 +139,22 @@ class ElementTest extends \PHPUnit\Framework\TestCase
 
         return $dom;
     }
+
+    public function testWriteTitleTextRun()
+    {
+        $expected = 'Title with TextRun';
+
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+
+        $textRun = new TextRun();
+        $textRun->addText($expected);
+
+        $section->addTitle($textRun);
+
+        $htmlWriter = new HTML($phpWord);
+        $content = $htmlWriter->getContent();
+
+        $this->assertTrue(strpos($content, $expected) !== false);
+    }
 }

From e07c6559a9d1bdac676f00e2c290cb2c99e1a7e0 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 19 Jul 2018 00:52:22 +0200
Subject: [PATCH 335/370] adapt test

---
 tests/PhpWord/TemplateProcessorTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 770428cb..ea739561 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -260,6 +260,7 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
         // and the placeholders have been replaced correctly
         $phpWord = IOFactory::load($templatePath);
         $sections = $phpWord->getSections();
+        /** @var \PhpOffice\PhpWord\Element\TextRun[] $actualElements */
         $actualElements = $sections[0]->getElements();
         unlink($templatePath);
         $expectedElements = array(
@@ -271,7 +272,7 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
         foreach ($expectedElements as $i => $expectedElement) {
             $this->assertEquals(
                 $expectedElement,
-                $actualElements[$i]->getText()
+                $actualElements[$i]->getElement(0)->getText()
             );
         }
     }

From 1951db58c18e6a0492db5a1b46dd5963c12b052f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 19 Jul 2018 01:16:25 +0200
Subject: [PATCH 336/370] update changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a166345c..d822357c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+v0.16.0 (xx xxx 2018)
+----------------------
+### Added
+
+### Fixed
+- Fix regex in `cloneBlock` function @nicoder #1269
+
 v0.15.0 (14 Jul 2018)
 ----------------------
 ### Added

From d09da0b6f23b5bde65ced648377190291c2b9535 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 19 Jul 2018 02:01:40 +0200
Subject: [PATCH 337/370] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d822357c..abf34834 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ v0.16.0 (xx xxx 2018)
 
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269
+- HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
 
 v0.15.0 (14 Jul 2018)
 ----------------------

From e61c40e71d8670d3334afeb6e2478d8ee8ef1325 Mon Sep 17 00:00:00 2001
From: Abubakkar Rangara <>
Date: Tue, 24 Jul 2018 13:59:16 +0100
Subject: [PATCH 338/370] Adding table layout to the generated HTML if element
 has layout style. This is useful when using creating PDF from PHPWord (e.g.
 using dompdf), otherwise the PDF does not contain any layout for table.

---
 src/PhpWord/Writer/HTML/Element/Table.php |  4 +++-
 tests/PhpWord/Writer/HTML/ElementTest.php | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 844066f4..068f489a 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -39,7 +39,9 @@ class Table extends AbstractElement
         $rows = $this->element->getRows();
         $rowCount = count($rows);
         if ($rowCount > 0) {
-            $content .= '<table>' . PHP_EOL;
+            $tableStyle = $this->element->getStyle();
+            $tableLayout = $tableStyle === null ? '' : $tableStyle->getLayout();
+            $content .= '<table'. (empty($tableLayout) ? '' : ' style="table-layout: '.$tableLayout.'"') .'>'. PHP_EOL;
             for ($i = 0; $i < $rowCount; $i++) {
                 /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
                 $rowStyle = $rows[$i]->getStyle();
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 7a6397ef..1f286c5f 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -157,4 +157,23 @@ class ElementTest extends \PHPUnit\Framework\TestCase
 
         $this->assertTrue(strpos($content, $expected) !== false);
     }
+
+    /**
+     * Tests writing table with layout
+     */
+    public function testWriteTableLayout()
+    {
+        $phpWord = new PhpWord();
+        $section = $phpWord->addSection();
+        $section->addTable();
+        $table = $section->addTable(array('layout' => 'fixed'));
+
+        $row1 = $table->addRow();
+        $row1->addCell()->addText('fixed layout table');
+
+        $dom = $this->getAsHTML($phpWord);
+        $xpath = new \DOMXPath($dom);
+
+        $this->assertEquals('table-layout: fixed', $xpath->query('/html/body/table')->item(0)->attributes->getNamedItem('style')->textContent);
+    }
 }

From 4b9ae18d5aefee34bb631b96a752dfca6be56b4d Mon Sep 17 00:00:00 2001
From: Abubakkar Rangara <>
Date: Tue, 24 Jul 2018 14:23:23 +0100
Subject: [PATCH 339/370] Adding table layout to the generated HTML - fixed
 php-cs-fixer error

---
 src/PhpWord/Writer/HTML/Element/Table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 068f489a..50c5a777 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -41,7 +41,7 @@ class Table extends AbstractElement
         if ($rowCount > 0) {
             $tableStyle = $this->element->getStyle();
             $tableLayout = $tableStyle === null ? '' : $tableStyle->getLayout();
-            $content .= '<table'. (empty($tableLayout) ? '' : ' style="table-layout: '.$tableLayout.'"') .'>'. PHP_EOL;
+            $content .= '<table' . (empty($tableLayout) ? '' : ' style="table-layout: ' . $tableLayout . '"') . '>' . PHP_EOL;
             for ($i = 0; $i < $rowCount; $i++) {
                 /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
                 $rowStyle = $rows[$i]->getStyle();

From 677e3f6a19bcd5d3f4a81e6a0059bbce773e8ee7 Mon Sep 17 00:00:00 2001
From: Maxim Bulygin <maxim.bulygin@fcg.aero>
Date: Tue, 31 Jul 2018 18:25:29 +0300
Subject: [PATCH 340/370] writer / word2007 / support valign and watermark
 withouth paragraph

---
 src/PhpWord/Writer/Word2007/Element/Image.php | 8 ++++++--
 src/PhpWord/Writer/Word2007/Style/Frame.php   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/Word2007/Element/Image.php b/src/PhpWord/Writer/Word2007/Element/Image.php
index 3614ec18..5bebb89c 100644
--- a/src/PhpWord/Writer/Word2007/Element/Image.php
+++ b/src/PhpWord/Writer/Word2007/Element/Image.php
@@ -103,7 +103,9 @@ class Image extends AbstractElement
         $style->setPositioning('absolute');
         $styleWriter = new ImageStyleWriter($xmlWriter, $style);
 
-        $xmlWriter->startElement('w:p');
+        if (!$this->withoutP) {
+            $xmlWriter->startElement('w:p');
+        }
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:pict');
         $xmlWriter->startElement('v:shape');
@@ -118,6 +120,8 @@ class Image extends AbstractElement
         $xmlWriter->endElement(); // v:shape
         $xmlWriter->endElement(); // w:pict
         $xmlWriter->endElement(); // w:r
-        $xmlWriter->endElement(); // w:p
+        if (!$this->withoutP) {
+            $xmlWriter->endElement(); // w:p
+        }
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index ea5abf78..10e5b151 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -61,6 +61,7 @@ class Frame extends AbstractStyle
             'hPos'      => 'mso-position-horizontal',
             'vPos'      => 'mso-position-vertical',
             'hPosRelTo' => 'mso-position-horizontal-relative',
+            'vPosRelTo' => 'mso-position-vertical-relative',
         );
         $posStyles = $this->getStyles($style, $properties);
 

From 683d91990ff53f46c2ad3dd8ceaeeffc28a62ce1 Mon Sep 17 00:00:00 2001
From: vblinden <vblinden@users.noreply.github.com>
Date: Mon, 3 Sep 2018 12:30:05 +0200
Subject: [PATCH 341/370] Added Dutch (nl-NL)

---
 src/PhpWord/Style/Language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index d7a76f78..8a3b0315 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -64,6 +64,9 @@ final class Language extends AbstractStyle
 
     const PT_BR = 'pt-BR';
     const PT_BR_ID = 1046;
+    
+    const NL_NL = 'nl-NL';
+    const NL_NL_ID = 1043;
 
     /**
      * Language ID, used for RTF document generation

From d8c0441975e2032ba86bb82ecdfc754d15c92cd9 Mon Sep 17 00:00:00 2001
From: vblinden <vblinden@users.noreply.github.com>
Date: Mon, 3 Sep 2018 13:32:00 +0200
Subject: [PATCH 342/370] Fix indenting

---
 src/PhpWord/Style/Language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/Style/Language.php b/src/PhpWord/Style/Language.php
index 8a3b0315..412a76a7 100644
--- a/src/PhpWord/Style/Language.php
+++ b/src/PhpWord/Style/Language.php
@@ -64,7 +64,7 @@ final class Language extends AbstractStyle
 
     const PT_BR = 'pt-BR';
     const PT_BR_ID = 1046;
-    
+
     const NL_NL = 'nl-NL';
     const NL_NL_ID = 1043;
 

From 7f55816ebaa2777cefd759f6628e7753c91e0faf Mon Sep 17 00:00:00 2001
From: Martin Hanzl <martin.hanzl@edookit.com>
Date: Thu, 11 Oct 2018 08:55:38 +0200
Subject: [PATCH 343/370] detect actual filename of document xml (prevent
 mismatching document22.xml as in #1253)

---
 src/PhpWord/TemplateProcessor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 7a5eaf55..86c9e1c9 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -507,7 +507,13 @@ class TemplateProcessor
      */
     protected function getMainPartName()
     {
-        return 'word/document.xml';
+        $contentTypes = $this->zipClass->getFromName('[Content_Types].xml');
+
+        $pattern = '~PartName="\/(word\/document.*?\.xml)" ContentType="application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document\.main\+xml"~';
+
+        preg_match($pattern, $contentTypes, $m);
+        
+        return (array_key_exists(1, $m) ? $m[1] : 'word/document.xml');
     }
 
     /**

From 7eb19c8f76c6a0a4ba56bc779d3f6024dc172822 Mon Sep 17 00:00:00 2001
From: Martin Hanzl <martin.hanzl@edookit.com>
Date: Thu, 11 Oct 2018 09:40:12 +0200
Subject: [PATCH 344/370] add test case for issue #1253

---
 tests/PhpWord/TemplateProcessorTest.php         |  10 ++++++++++
 .../_files/templates/document22-xml.docx        | Bin 0 -> 11126 bytes
 2 files changed, 10 insertions(+)
 create mode 100644 tests/PhpWord/_files/templates/document22-xml.docx

diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index ea739561..2b3a9fd1 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -276,4 +276,14 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
             );
         }
     }
+
+    public function testMainPartNameDetection()
+    {
+        $templatePath = 'templates/document22-xml.docx';
+        $templateProcessor = new TemplateProcessor($templatePath);
+
+        $variables = array('test');
+
+        $this->assertEquals($variables, $templateProcessor->getVariables());
+    }
 }
diff --git a/tests/PhpWord/_files/templates/document22-xml.docx b/tests/PhpWord/_files/templates/document22-xml.docx
new file mode 100644
index 0000000000000000000000000000000000000000..206d80f46063d4f9ec4594b191bbd6f493879b8e
GIT binary patch
literal 11126
zcmeHtWmH_t)@|eNjT1s}cW(&p65L$^1b27WK+_N)I01rNaF+zPAi*IJJOp=paLzq9
z$@$K^@BP2u9%Jv(yQ=1@+Er^-RnJ;Vaxkz!06YK@z``e|a06?grT_&15W@igH~>Uw
zT`_w*7jruoLp4tab7y^K4_h0uTv%w@YydRif3N@Q9;k&VD0Z`AhE|w(>QdP?3nOyv
zLC=U%c|m<i{eX9uD0mAZMv3deO`)_6RkFfldMn-E;<-%Bu=cwCeB8_$O;=2Qt~m(f
z=()uTgr!y&=o6~$Hb}EJZi7$825wS2pfYK|AupoRN_BeLp`3p-F8l6F1Exr^W+Q;@
z`?-C{5qhU_SS`ZS*QD8ChT!jxa#^}Iu!+3Q_Mu!QE9|g&N#e!PwG8db)q>9oM<f%I
z`QMQu@#4^6DQru1<s7CelJ8*8s7d;Olg&)lOzC7RG?I0~FFo^clzr8$;1Gga>QKfR
zq$5XW(r&b>RGJMez#$-*?JG8&Wy1rg1pYgU&ZS0BH~a?6J>FWhr#m>RgM*L9;g&>d
z_Xkk=E#jWDgJb-s4aUTG6I)`rQ*r(TH<it<?vfM;5${2MtrXxEmQ2hY>zt4ypdP2@
z;suV<zgbB4z(R0oOzi4|bBR5W4CR4^hEC=-&MeH2&;MoLe>Lg;{qY%KIYk&Y)UXO{
z&*ejxcuY}+=IsJdh!+&Y;gC2d1{E`;rfNl6FEAjU44cK(>iWEJRM{XiQ}b=2(0lKZ
zj~}y*XHT<vQ!MpUI7!U)^g3U*Hm$?RC_rZOb9ZEEiC!kS#A*!<Wy<2?g!2=co>A5g
z;ZU=?bF!iP`bS<ez~~gr2~po+u*KzZw8U;~@%8Z-eM@wxw85wQa?2Qp@?LN~QX)8Z
zqo58&MOI%TcupJ5(}G3#YpSf!)5y$FMx>m`RDXOgIZny$OG$qrmA4m@o#81=bFc5l
z5Sf-kD=(3EHGfiqD=tW$Wk}*<06YNTOAP?vKJ<dSy^|S>i>0}(`JYd=$E9gcXViY4
z8`y?1b1%I0LkE1?&AfwGXH&16SZ7&{F8G<<wkk(F_+27_L|~2}Ist1bv71)lq8mXS
zu4SNpQ#-Y8cp1zUOAHuC3S!p39Yt-u3kZ`qy1rPVSiYu}z-QhIhy70ei7j?6%~A0S
zAj*foYy4f=a8JYZBmke4NJNxka(W}e`VF(+MJJqx0W7V!@G6BLX<e;w#P+3E#&tE}
zk+Vw_`7BQXV~D6hwTy4iO6E5-nZ-%hLQ+u@E3%-RcdgG!O`ittrKlvH07w+ZXpR`L
z1+3)Le7ovy%zkicfJov|3HJyF2j2ybHcAo9guW}2A(nKpC*DIr!|V(FZfWgxG%kFb
zQc!**jYm#zr3wlDmY6T^OqrZUD9cUA%*QlXm#(-(uUcCile>SG(Uw>*niJ5*Vw&!%
zSlh!T$RL;ak*P?QX{WI@Oj%ytNIfs4*tFOGqgt#$lDa4tfd?EhS+uUoER~vD{nTDr
z<-mw4AC+49(zdo8TT)^HGGd&YY=q0al}BTC32h{ys#AVYk-09+mmzlZ0LKaT7q3;_
z<tdbtnxD0Z%?hKd*^()(AVypQV{=#%NGUz~SZ6vCg{hB#l90idi<1amVt&2;8b@-o
zwMh6ubh&yJqk~?i_<(c5%&5Avs&oyxSij5fg>ObP1A?z#VEnlEI#}uKyfqv^D(|oa
zQ+phCzquE<LcO{Dc8!nGULJD9dGb0-=>E38f}V{$*7I(7O(^TR-`yU*|LsL3$*i$M
zilp5drlSMeUf^5Km|!J-CZcLhczXoQ!p;oKE@N0z557tkXgCjBbR@=bmxLyg`V__;
z+?2r@P?WPS)LSIIxJIH7<d=ympYu!Uftom`Dvs$AiL$#hjA)HWU+qF24PKg_TBxR0
zHJFgI2uI2BL@Zc41d&q;FG#s#(pxmdR#h9kow0ySQ~~PQwnX)CCv63QA1@eqA#y?$
z2f}uoR84Q|h2MaqWV|gk;rc_u-kFe#L%14IEuh2HmpbF$i4ZHn;-cFQr&cgh;yXnv
zVCG~CiKc6IRMa%C&Z%oVGMvv-r-su<AhoDM%>_UTL<F1G;8@c&F2nQ4(5@r)`vihk
z;BnP8RJcahtQ#j;bu6+LyQEv3xUR(q)DNj+y<e7+zr|9w9!`&Wrcw}-#KV$PRld3f
z+mxoPb`8N*mz_M`CvDBwnKN!EHZ#L@L6g?t5gd@b*aHufrc3ZB>A^0QY<N#G!nSG-
za}=jpt5x#kB@t@tEew$^78Ka&cMpKRuu+@I4I#~~5GJg%%jX4tSL9;h#~xU3J>`rS
z;;@^F{)#PN%xVP}6ZN7Bu@0IyDVb2mEg4CZNryX_Ze8VTt^D$<2`3nQiwNxo8L4Q;
zums=uf@)Dm0X0$v*{}iUNG(*C1>8083dwA$YbB|7!<;p!>e$uG;78n!r>WrRqWaoh
z^k$e}ae4i;bE{Pg=@)#3S=fjt@tXz&LK}5u-Qn#E;jpo*A$|EP%H<j3r~;iEDqn{6
z?AdgtwTFd29v{u+c^McKK=X>KQ;ce$*U28sA|*DK@7o>AZyM!JN#qi9NPSe1C$FTz
z%{LxI^5M0$HuXec^bb?zqkE0P8!w+*w}Fy8xN1UZsM@C~=PAl+u6II)fp=l1h5j^4
z1J)#9MQOS>$T#)InugwKhE@Oe$#Fw|JBoEn1LFXIla#^`XdzO}0=mtWBX_F73swwe
zYUg#K&a1<XIqQfYno*$DoO6ryK!{<*AKYW@VpO+@s~3^%)Kq)9F7%3l-h&+*Yz4r;
zsK}RUfHM_=)4xibH;@p~!X1<Mei@ER6U^f?=)^vKLtm&!`H^O%bh1%GrCzr64&z*>
z2oXYh456LbMfS5!TFF}3^4O8;Qj3sXR2H4o0*TY`nr1FG*F(e@P$rSk<197>w6rF`
z!6qqw1vvHJmRX`)%{-(u21$v!39)V*Mzp-n;DVRN8PIxz>b7JRlJtTJyKVQ%?c5nh
zKeVPTeYoZ-G2X5%ShSktuUlljs>?ZV+Gw5Rpu`FZYpt{fh{<n+S7=i0HENc2<!u^o
z`VdW99SIj_1|({hqB@^4XaEM|mt2QLO2&8iYc=vX-fOqo)l46y+m&s4*x8RAe}8H1
z@B*f}->78bfU$77lrL;^ic#wIqGjEya`Ut&gL|CU8k<Xp<WvJSEXkb)@K%JE(f80l
zm#oMCQf6;doxm^vKm!s0fc4js<!tWaVr6IH{J31zYUta|^J2C|WpAo8&R1KbI7U(0
z)zPiGDVt*mCqNWJ{K@D*c2zX<;iN^HTT0kWAbsExo-aG!@{Qxh+l2PJ>-D44nw9Zn
zqCtpWPj@tD-20v=)<%P#+7hrfiFP=ph@MPS#QEf>iV9};#{7{$aBN55hsKU*kG1p>
z1ej<ZH8SrU&Ln`w0OGfmSJN<oL#kysr6H1WNiiJtPh&p25V_j{VY%4%^(cdk^Gb`;
zdHU7W+2otEjEqMj=hGN*%i)sBBY9aNV(7ASXcOEXI6}K<9SRQBx8oFbK?tpjtb%Ke
zAoIS?)%25=KyGAJ>l~4waM;xEFc!;v{5@>}GmALHnnus%-%dDgB;Ictopc4RZ??P(
zCDpQupM5GMwsPaglq5ohpxEV1-bZ`(;pQDA!mY6YUd%pVoQ~CN1xu7c&G|fHpo<QT
zUl&%Ug$RzsK3-%-S=BNm$Dv-9KhHyna;Md)URV#t6^$D0^|k8w2yBWpC0P|tW(5%H
z^N*vs%42K%@PmVvwG<W#Is)TvMBfu!x`oUMkaW9I)>bX${;OSr2Ai!r6uKK$7<%6=
zjIo~H)&h56BN6>+b1v6n!<u|W3fsVf9Q5Ly@3@w_G7J`hlM5WBiR50IN_&1p$I;DH
zM{uSb`FY7V797R4*9n$M_6f9TV&lcy+%Od?X@$hp!J;z8K3hm?ljg#S@5D-l)0d&<
zVZd$xV+|IoDT52-RM&mbR?0nIw?`}J;<!d?I7@P>DcBu;yG~BTBE`HjS?0V$9AKl5
zhX6uK^beT=`^==(z4Xm@YYg_{f%pq6EEAd2C$>kAY1tt!1Diy3>RXw<bW04)daZ@E
zJwdmFZF@1CulJhYX3{7R&zc$WdNa_?eak$L4D^{8VYcCoxk&P9wM@K%*DPmWfk9nh
zBYS#3O|~|#muEh&CP;Sa?7}^_9N8_HQ@<{H%s{_bW6V~P*w*<96_kj*u~Je&h_y9a
zF*g38YJZY%u4FEQ)_cf$R}~+Y&n5dJ(pBsdfA#`5mQbl?Cc4_N1z-P1x;BA4n%o>6
zPKS_=1FzL|y*I3)kchj`=N))$Ssm8F$gXqBqry+G_@BgC@YH-aA~}$W_E#KaqjFZG
zR!!583F80{Ib70r9={6NI7S^E`<}(ja<MCJ!|S6q@I(?MH?jWq@JM<e)zU{WD>j_x
zi!qDK4}@Ex@)G;s2|Q0%hST&QhTOse0N8&K_~nBjqGoJjWB$nCR`A}dc~)SUy~LKk
z>8#?F@lG;hNsiK)>34XbM4iN`u?xhbvF>(@>J-oIJFS5>t+kOF{ImA`af<ErmOHP;
z)_W_?Ss9FhS#SY|WaNh~TZpY}6WZxVE-K81MTfmo#%%-W*7oMT=($+{th+9446PNh
zs3s*+ga#2h#}}FCmwPQ=q5ORl34UbNFNQi4tcjE*X&7gj#pr*IIDDGZ(4-;i=W1g8
z4sGqOM=n;}B1ioRiPf!?W$W?V5zsTJgO8F=J;E43#-A^d`e?sCY2Y6^U^|qgK&~&e
z(IdP?sN}_nR{&5%^?u?X{X&%2`xY}~-1O=l3nPzZX@iD!g=F5^bfEnByraHKa#a+Q
z18E!IV0bFn>^+d_oUB`|Ki9xH@8phFtOAfbQA9SESG8t<b{<9g9zKJqR9ogLL0oC^
zmWYfTzm#!f8pMXzj>JmsNX9srTyi95wIE9Nstz7Q0i7+q=TM9g>D$}y{q7bGzBI`(
z`X(eOsOAwgLL7KP;L+Dqx^1!Mp#xK=0z#4N8_QK{o1d_oLj;Nn(Du({@A_M-Nxav;
zRv7fpOub1|nz`RfY6xgv{yEYBz%ziZ?QJ5`!$==K+`zv^+TGkl^_STiGTtc*!-fgJ
z(!2s<Y^<Nf!_{tLico8b$bK%IHd5CqPd)Um{B-+?b(u8FX|fFaQ;wU&S<t5)G%e`-
z>6ozEA~H{%un(_>2akOmZ0YHkne^YmmdysG%%0rXeC82k%*+Pf(k0Q$5S^51zX20l
zf2@GYK&2D=+#5%rKMvN!d(v)q)PeI-vx~e(sm@LBi{{JG13F|^{R0O%zu@?R@?~~$
zT)KXKv&-=-)eo5-si^`HTh9sF1zny!Ng4l$71GIp<ZAwY@H@?%^4#-ccbb^?j`jP1
zLnz_pg$nE{UGZ39nj#>F>TrM)62WsLMW60Tl*-#CH#U{~3x~qcTb#)g901_{9tQBU
z>mFCRfE~GXu7_^Reb6c}0f<m$_NGcs_72W0#tshuk_(|8<idv%|J_#^c+d{|88FN+
zw9>tUIqef~iX^`NNwVc$S_fe`L>CZyY@>gYaD^ON#XtQcjrnr4*L~%iPn*BIg?HXK
zx~SU7w1=K@Ob0Se(&D7Y+q7{sNj67@MmM}y3nD!n-0OZvB<bPtKyk<u?&$`F{uhXm
zxp3X4NrT*)MEIyLE(y4MxMHy@9Zak{sGTIXxdMHm8ARf4WFjy=^)uh9(`V4`NAId{
zB0N36zwGlvu3xgI@)%e%#gK)?*H0W%tq`tY?xSnW9w=ip44Q#Y;+OPZ6`<=;aX>p>
zh~d(c+Dd)K(6c}|Y8&1cXzvL~W!k)<W9ZS(6dxOC`{+5i2mg)mvia<`{?wR*ARjm1
z#ph;-jd>C|=8FK7HzUVnl1u-|LXpz@YjXcXhI-omu}h03scw@hmfu|sVLRm2qd5KY
z!PT$;^gmtA)ZXcj>6k2+`hR`x|BGfx;Bm!ZR)SE&&=b<Ru7!Aj+#~^up2;e9tb6Tk
z{nu=&J)zmmVetwdQbUmrG}psV&2`Isg@U$121}o}>*!l8D$7~<DFlpqV3=a*PuMAl
z^)A>_H;Op%>`IF|O`t}s1?Q+_Uz&w#(Lkn&b>TlT7lDDY?}hX71XduZI<UHpLTG}7
z5M52w;sUE6>K)f-rs+$g<@W2y^k4Dka>lUF$~(V$eGfW&-$aFC$`Dxo;(e%IG?j~t
zsSXq}mC{&wsv*XdbS8bOQ6QDaho{ZMYdF#mTlN{QPxSRP$mt&>V)ur9%T6S)twhLZ
zE11A5<zX=-eflnbZ0(eueIDPPH=LhaB!*;A3!twm_w_oS#DC69-(M;AO_Dfl{}usP
zn1>Xt*!8qOJiASzJ+|sn{sVq?D?`q*;h-WY{sR!*!h3Y~hnA<f>eY44x2)g2^n@`T
zw2uq`Y&Ze{7!QN-hf?M2;%Q_4$ELqEW7ci00qbENkkafA)lF`>j<JY)^JB(hPB1eW
z<cpRNA3{J$z|6!@ksK|cV(^SiS{4#*RMQbvVZ(H4e0c~%Yj?HZet$e@Uy*a-cR-0t
z-$bPFoFq<w^pYNP{OA?LB0Bgu;mu1%<P<fmb|PC3{;Rz&hSP7X>JkJ_T|6KL<!k+i
zQ<h2QhwC2cR}7@pCt|cW;`y%<d=J!lHKIcgE<MV?MgoHABx(1n;+FynuEy?2y1PPo
z$OKn_LKD($419Vd?E*vULB~Gu8-eFz7b)f@%<uZRiTpftOu^3~)i2!#M#V_Ysr}L&
ziX!P{HOUpN=bA8V+qH8TJ)hx><E>3=<}5%dIs|OvVP3t#7?h^6VXjSSqRtHS4E4zq
zofN)w_vv&>&Hp&~jjqT*qhcuQ1^s}Ey>GvYVT6T#3w5Zd*nUNxTFePe$!ga03tqXJ
zUA4+-j9X6Y7GDbJ+aEJAwf@^L{8>G@(iH3M7YkMt`g6^1sb8bF4W~(PFQr+ZOhr&3
z)L7&2l@sy!&40VtV^DP&@-ap>iH_NQ#?2?l_+AAFpPH#R$<nqVK~p23>PqLRE}IB~
zUn~#LB#o%~Y;>jCc2RnRPddbY+d0(-ELgrdJAfc2ZL#@tH8s3nN<UOuh$dT6UW*==
zg}u3sl3G?F{l0X6oJd$dMcg((aeF^L+k*<13jfs5mlU6QEK9N!b3+b`EZTn4M6&_u
z-U99Iq{#;;jdWbqXdchOh7OK`vX~F!Q08>@IzpXqTu$t$p0w-A(Clk`-fm8EIkTh6
zczDIXKL?8g559a(@U0YrQ796YQp+}_A49_3f*`v{!tobEpOR*}DHZrM2$Nt1b{31k
z!AHa55|kpT8CAk61$M@~fP=>oz$F;kR5N1rRSg)lO*zj-!#D4CM9Hs~HeVRLV1SB~
zAbMF%LvB<BJPIku0H!<Tmf&rD<;_a{Vw8PiV0*=UqMdN+`RXfE5Bm!ja-oJDfve7Z
z#UMdESR!c|d5>fotgkDI7eO=vM||6eH1F`}^6=NcrklikvXMbpQx;wf<pRG9n~Af@
zu&F@4M~oVO!Y-r?90cUOWqckD$!<rEa!-`&FETQW2ulmZdWRV%7B518E&^@L3wtRh
z##e1u?4Z`F{`Eb7S(oyuKA%$mRr%wO(7c^yWT`RtQS!u_Jv{Ru-XnJgby;?pksfvv
zFMHuiM0EuHR+{8W^RCq-O_F)|G7^KaSY+-cj((MTi3HpGVd=&xG<;>nu_A9?_AJ{#
zHN|=8qLw;1?1nw%{rqUO1wrKvj=@dsl0dB4?wJ0Tg%fOo*XFPkwicl;$Yr)s$4BxB
z1`MN^_64U595i1974I3rqI-j6#x*KUR3=sF??Ww3+Ln6+#`zWo9VTh0@^y{_F!=_t
z)#Dlq?h7aG?(PXbF(gL;Sux)RTv0Zk_pN@l^#aR_i|_afAg0EXe%)BTyF9EpFI^>P
zV&V^v@W`u{4|N&a(ONZZJH9lGEcPgy*sv6vTCpw`lM8cWpw-C4&WEOlEJZ{~kCm3e
zUx1c}aOI%M7gW0jt@YRyL({8Rlg+p%aMpERNCCa6U~WKi;*Ro>Lx!WAA3i1Ya%SBJ
zU&E>{<FAjCs9#Zx4zbDCJfZGOJM(}AMF^61{^+zUeiLItruxDCwba;>AgQ*uJ(Zm5
z*9oo$cyR5*&67%|UK$`<Y?dI`rC1v2(yE2C-K5+v5To*0l9<f=En0j_KZK$eK!?6f
zxU!6mHAZJ*Y34*gl!_N7Nga|iUM%dOt`sckVD<R$Rg%e@BjL0(TZ?rw6?WZuFG4|V
zA12AYgc@tpLP#|00ctwFFv;N=2-#H(mf=1llJA<L8So$|385mU-;nBm6SGQd9qBDQ
zncJW)DzWamP6=A_$xQgsCr6q(xqO*k?gSU};UzF!JryFW{3LC@OqBX$xYk7|n!`N}
zwW24{?71Nw;X%)I=?JQ~#uDdI9b5tVZCr*Q-k|!%u*Q5Mf`XzW!oaBLE~P(9xm1F!
zpg;d!l=rv5zV4>-1D&M_3UST`qw|vnsS~@mRrp??d4S1Ya}+N1sY@t=yTr(Hg8RhC
z%tFuiID4PS8R$s$Xm3i-QHLfwdQ9_W){U3JxuX}^TFzSv?2^3j{&ZOG+s+FGC9$(j
z2Ffl>`VN2;ekXu5eowh$uHoR{J4?F9w7Pz_pOyY<*`NXnFJ$fRcsr|cpabcUZuR*G
zgx1C=l^?Z1ahMh#&o-WTTbyMDe2=-~NXQuXm#yZw8djM0SfDiTJ;^G2NS;W}2+V3<
zkqu05Cj;>Liv&#Ez_BSFe~H%*dMMv)WU*q4Lg+D%J}War$U7h8!80$4x>Oe*SkGkk
zkmGJ8JueFQT!*=0rW@f{&D8T}X;Jup7uiii(pp=zL1FWl|0}ft4#!#-QFsmyI{hJC
zu`ZOL#r7GDy>4H}JRbW&T`20~tA#G+{!876&VMI$qK#<%Kk7pHhZd4P4X9;;C9_3=
zdaQ`%x7I&=*Pm^wVTy3C`FG<bH>Jx)BIfLnQg}%uYL^TGcqKH{cdd`PPg{el5jFH#
zK&X!UJ+Ue*2D?lUDJjIL6uF$Cz<sn8B|X2xUfbgh%KF0O6I*%L<1juc6!Zwvb96Wa
z^EeQKKL?O9tT)57jS!i;us4Ili37+O-<yF`#b)KJA7fA;?6Ub`A|g|36;ya2De!%3
zB(fO`>AKOm$xgh>?nnAN;shE4Hq&-Aq3wC?!ub+Is9a|=ZcGa|@lC`~u=We$lP@E2
zTTHo6#&s1y&@?4UYuObUq4;wnPHH4x=w%mx`8h1hkI%Xk96JcJdCeLb(6!^Dx*M^}
zc*V1EpR$_HW7$Q)i~v498`O8~d%%=CK9q+3Gq*`gmk$OQ&glM-tL)eSBhG;SXzMYz
zfexMbXI8xa8g4k^hgHl#4HEJNAVNA+lvr}}YW!4D10OO6S?jAFigT-2>2D^B5#l2=
zvC?l&im`sA8E|2iZ{tFS*jit`+DtLvl5ml)NPER!ped};ds3`!`1r8wJsBwHWp90@
z>Jwo5WTJ%oW5RZlx}%xbRMA7~jv7g-!7Q#+fu?N~#bYMI&`jKa%1_u<f4eG%Z~b6e
z^)DmU3~}-mbHJZQ{$mY)Sm-+$DE_N@S9&|Sich<(%PsUP8=LDV^)(7Z(S@lzb{A|<
z1!0E`^N<G+8u1EAqE~Y14NgHur*GtwN>mfoQ{iDzjy0P&+x?Q&^tDb)XZFgZP7_T)
zQFVd_(`x2l&`!VX`YmRdm$fyzgKL|AXpbLzpK|Mvc@_JqB;|wg@msBnb~)dyzbM%D
zC(RY+n4YQ#O{zsRn6<nf)@5F&U}!I2joX)P>l=7Y6TWF{nDXXzUkwg6hxZKD+AVTy
zJyVst&*l5utE$XqES=@;nc4lR+xYHgAI<iw_LDF7P=D@?0sjgw%Jw!2u6g+PR)F}Z
zsFD1+H-1nITx}m>jM)E_3kU$T*^e5`|Ga87=I!QLQE!ukXRLR1?KpPu8f&+@!?I_u
zvuCQA)RJLkWYW;Cs|8OI&rtGwA`{(c7vQ}k#bpHqC?!7m`w1B?3gDL3Q^~4!Qhd{I
zdN1X{h&@n)Xe;l<CMjsk`hpcFUEJ~oXH#R_Txetj58T%R1b|*Rh){}_M=~rfZ!I0D
zWr)YAAsRiY_bJywJneG|FDM7Q*IlrFL59jCm&@a=aob0tDTj~NoX?QLyVc%96Jx4x
z0JQ||zQJY7*=(h;zd8%pLnkJHVxuLU#>7Vuou({BoRTxmX}Tzr-*APOeH}-R%8OX;
zOh3>1JPJPC6Q<giA;PwEEC<%$zJ+KAcd7F;v|CP=nj~CFN_*^9;}d$5XXtqPwCPti
zDZrGY>BDdpXNaEt!E?YpRlv{)!$<};@oet+@z{^cHK@U}Q&8m&`P1-%QHq*@st|O>
z)r042qF=dSB$cX3%~~z8xT<k1n82<2RPV2IdXSfCu#PN#Shf(rZ@LAd_0EOql~Nkp
z<QM@xYDeN}Ofyce1Bp>L42Goy=8!(HYo#tRe`^5DE${aLd*c`Mr8}WFiky8sI}`C~
zkj)6%`^7?n`Zpa{6lkbgbc%O^8t)`OG&+4Bxhp=>oG$V(*DXn|P{(ivucC3#&`1@X
zEPS0bl*db|i=53Gwp-jT(*=X&)R`G-EMSf5QzW)ZY$Y_p)+ROYFhtyeG1Q4)S0F1!
z>}TPo?sv>V8Ao^9n=;d&*_1c6J7%Z5S?g1j+^zz%I|$hwoF_i*`*R`dl}}?zT9trz
z{N$9O?8vIBLQJW?ozsn2to^NiuA1YFJY@}dpCWRT2xVR?ItSrE$Fd&DvEg=+M9zMK
zm>fe)J2~Ii_OKPP@SWCoW#pcH<rwG(rxElah}9QK;}lMCHct2%>fOWr?*3Ob?HOAS
zel7lRD)i(p_y04v=Qk4kE7IpbFkwREG4={>tVFAZMp0G-acVD2p`HrgA;S?nVJ6u^
zc6(OKfwDXRmr`wlysG~bc+<OW=~LGJ(~{wN-U!W@N$<jJdRfe^7<;cT^t_d=o&m#N
zwcR4lULyKWrQhL7A@gq>&{CzMODTk6Y^j*|l5iDT+nA4SNYvBfn|rdXc_Mtv$bAlX
z^CGXlj_2aru(5crX4E>?`DkDI4Q%dom4pV_>*w5?$_ZW~HpFm_^9w=oHJ)1-sQQVF
zFOv?eI^=pehk;Y+$coJu#B6Boqx5+T!!lJ%j%DZFaGNxJjD!8;HSLvm4+m;c&`b}C
z>|=Q1V_?+p;fa5rA^ss)@$UwHkF5IDK-j~W{1RvNEAXG<PkusEAEHwJF&gDp6aRD`
z_|t?u+FvrkFM9K@@W*fe`)R~aINHPM;vX&e?QG&#{6A^jKk?@ehZ}$3|E75VYT<uM
zy+82)0Q<v){deK_@95vvyI;{6c)y_k((?We|GTX6(|{P^U%mHlk>xM&Kd(DKp$|h&
r`7iKq1pGVxcjEqvH=y|!{{Kc}B{{eU2YHO+LjiO@EPWZYk8l46F;eAv

literal 0
HcmV?d00001


From e19de8e8a481ce3fb1aa84ff236952c22debb277 Mon Sep 17 00:00:00 2001
From: Martin Hanzl <martin.hanzl@edookit.com>
Date: Thu, 11 Oct 2018 11:28:44 +0200
Subject: [PATCH 345/370] #1253 - add explanatory comment

---
 src/PhpWord/TemplateProcessor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 86c9e1c9..ced3880e 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -503,6 +503,8 @@ class TemplateProcessor
     }
 
     /**
+     * Usually, the name of main part document will be 'document.xml'. However, some .docx files (possibly those from Office 365, experienced also on documents from Word Online created from blank templates) have file 'document22.xml' in their zip archive instead of 'document.xml'. This method searches content types file to correctly determine the file name.
+     *
      * @return string
      */
     protected function getMainPartName()

From 28505b0b77573d9f36936bf481ff8aef11eeec3a Mon Sep 17 00:00:00 2001
From: Ralph02 <info@ralphmedia.co.uk>
Date: Thu, 25 Oct 2018 11:23:53 +0100
Subject: [PATCH 346/370] RTF writer: Round getPageSizeW and getPageSizeH to
 avoid decimals

---
 src/PhpWord/Writer/RTF/Style/Section.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index 5c34fa86..ee6efcf3 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -43,8 +43,8 @@ class Section extends AbstractStyle
         $content .= '\sectd ';
 
         // Size & margin
-        $content .= $this->getValueIf($style->getPageSizeW() !== null, '\pgwsxn' . $style->getPageSizeW());
-        $content .= $this->getValueIf($style->getPageSizeH() !== null, '\pghsxn' . $style->getPageSizeH());
+        $content .= $this->getValueIf($style->getPageSizeW() !== null, '\pgwsxn' . round($style->getPageSizeW()));
+        $content .= $this->getValueIf($style->getPageSizeH() !== null, '\pghsxn' . round($style->getPageSizeH()));
         $content .= ' ';
         $content .= $this->getValueIf($style->getMarginTop() !== null, '\margtsxn' . $style->getMarginTop());
         $content .= $this->getValueIf($style->getMarginRight() !== null, '\margrsxn' . $style->getMarginRight());

From 54eb6e6f2cf73d9983b08d80e2da9de8311fd6bc Mon Sep 17 00:00:00 2001
From: Stefan Thoolen <st@superbrave.nl>
Date: Tue, 6 Nov 2018 14:24:56 +0100
Subject: [PATCH 347/370] Fix for undefined index

PHP Notice:  Undefined index: document in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
PHP Warning:  Invalid argument supplied for foreach() in /home/stefan/Projects/garrcomm/PHPWord/src/PhpWord/Reader/Word2007.php on line 65
---
 src/PhpWord/Reader/Word2007.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php
index deed3ce3..52030ef8 100644
--- a/src/PhpWord/Reader/Word2007.php
+++ b/src/PhpWord/Reader/Word2007.php
@@ -62,6 +62,9 @@ class Word2007 extends AbstractReader implements ReaderInterface
         foreach ($steps as $step) {
             $stepPart = $step['stepPart'];
             $stepItems = $step['stepItems'];
+            if (!isset($relationships[$stepPart])) {
+                continue;
+            }
             foreach ($relationships[$stepPart] as $relItem) {
                 $relType = $relItem['type'];
                 if (isset($stepItems[$relType])) {

From 768a07071503cd24b8089f04899bc5f6d43bf61e Mon Sep 17 00:00:00 2001
From: Gordon Franke <info@nevalon.de>
Date: Mon, 12 Nov 2018 08:02:15 +0100
Subject: [PATCH 348/370] add/align possible values from class constant

---
 docs/styles.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/styles.rst b/docs/styles.rst
index 03366427..8c5de7cb 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -29,6 +29,7 @@ Available Section style options:
 - ``marginRight``. Page margin right in *twip*.
 - ``marginBottom``. Page margin bottom in *twip*.
 - ``orientation``. Page orientation (``portrait``, which is default, or ``landscape``).
+   See ``\PhpOffice\PhpWord\Style\Section::ORIENTATION_...`` class constants for possible values
 - ``pageSizeH``. Page height in *twip*. Implicitly defined by ``orientation`` option. Any changes are discouraged.
 - ``pageSizeW``. Page width in *twip*. Implicitly defined by ``orientation`` option. Any changes are discouraged.
 
@@ -45,7 +46,7 @@ Available Font style options:
 - ``color``. Font color, e.g. *FF0000*.
 - ``doubleStrikethrough``. Double strikethrough, *true* or *false*.
 - ``fgColor``. Font highlight color, e.g. *yellow*, *green*, *blue*.
-   See ``\PhpOffice\PhpWord\Style\Font::FGCOLOR_...`` constants for more values
+   See ``\PhpOffice\PhpWord\Style\Font::FGCOLOR_...`` class constants for possible values
 - ``hint``. Font content type, *default*, *eastAsia*, or *cs*.
 - ``italic``. Italic, *true* or *false*.
 - ``name``. Font name, e.g. *Arial*.
@@ -56,7 +57,7 @@ Available Font style options:
 - ``subScript``. Subscript, *true* or *false*.
 - ``superScript``. Superscript, *true* or *false*.
 - ``underline``. Underline, *single*, *dash*, *dotted*, etc.
-   See ``\PhpOffice\PhpWord\Style\Font::UNDERLINE_...`` constants for more values
+   See ``\PhpOffice\PhpWord\Style\Font::UNDERLINE_...`` class constants for possible values
 - ``lang``. Language, either a language code like *en-US*, *fr-BE*, etc. or an object (or as an array) if you need to set eastAsian or bidirectional languages
    See ``\PhpOffice\PhpWord\Style\Language`` class for some language codes.
 - ``position``. The text position, raised or lowered, in half points
@@ -69,7 +70,7 @@ Paragraph
 Available Paragraph style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class constants for possible values.
 - ``basedOn``. Parent style.
 - ``hanging``. Hanging in *twip*.
 - ``indent``. Indent in *twip*.
@@ -82,6 +83,7 @@ Available Paragraph style options:
 - ``spaceAfter``. Space after paragraph in *twip*.
 - ``spacing``. Space between lines.
 - ``spacingLineRule``. Line Spacing Rule. *auto*, *exact*, *atLeast*
+   See ``\PhpOffice\PhpWord\SimpleType\LineSpacingRule`` class constants for possible values.
 - ``suppressAutoHyphens``. Hyphenation for paragraph, *true* or *false*.
 - ``tabs``. Set of custom tab stops.
 - ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
@@ -89,7 +91,7 @@ Available Paragraph style options:
 - ``bidi``. Right to Left Paragraph Layout, *true* or *false*.
 - ``shading``. Paragraph Shading.
 - ``textAlignment``. Vertical Character Alignment on Line.
-   See ``\PhpOffice\PhpWord\SimpleType\TextAlignment`` class for possible values.
+   See ``\PhpOffice\PhpWord\SimpleType\TextAlignment`` class constants for possible values.
 
 .. _table-style:
 
@@ -99,7 +101,7 @@ Table
 Available Table style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-   See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` classes for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\JcTable`` and ``\PhpOffice\PhpWord\SimpleType\Jc`` class constants for possible values.
 - ``bgColor``. Background color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Color``. Border color, e.g. '9966CC'.
 - ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
@@ -168,7 +170,7 @@ Numbering level
 Available NumberingLevel style options:
 
 - ``alignment``. Supports all alignment modes since 1st Edition of ECMA-376 standard up till ISO/IEC 29500:2012.
-   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
+   See ``\PhpOffice\PhpWord\SimpleType\Jc`` class constants for possible values.
 - ``font``. Font name.
 - ``format``. Numbering format bullet\|decimal\|upperRoman\|lowerRoman\|upperLetter\|lowerLetter.
 - ``hanging``. See paragraph style.

From 9f28ece4e9b4d8c917135af05d58370c62a40287 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 16 Nov 2018 22:40:37 +0100
Subject: [PATCH 349/370] Fix path to test document

---
 tests/PhpWord/TemplateProcessorTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 2b3a9fd1..1513486e 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -279,8 +279,7 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
 
     public function testMainPartNameDetection()
     {
-        $templatePath = 'templates/document22-xml.docx';
-        $templateProcessor = new TemplateProcessor($templatePath);
+        $templateProcessor = new TemplateProcessor(__DIR__ . '/_files/templates/document22-xml.docx');
 
         $variables = array('test');
 

From c51b6febc0feb8841202e38b817422ab0bcb09c5 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 16 Nov 2018 23:00:23 +0100
Subject: [PATCH 350/370] rename variable to comply with rules

---
 src/PhpWord/TemplateProcessor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index ced3880e..b4102bcd 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -513,9 +513,9 @@ class TemplateProcessor
 
         $pattern = '~PartName="\/(word\/document.*?\.xml)" ContentType="application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document\.main\+xml"~';
 
-        preg_match($pattern, $contentTypes, $m);
+        preg_match($pattern, $contentTypes, $matches);
         
-        return (array_key_exists(1, $m) ? $m[1] : 'word/document.xml');
+        return (array_key_exists(1, $matches) ? $matches[1] : 'word/document.xml');
     }
 
     /**

From 925e9e091910bf90290dcfcfeb3a36fe94aa6855 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 16 Nov 2018 23:33:38 +0100
Subject: [PATCH 351/370] remove trailing spaces

---
 src/PhpWord/TemplateProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index b4102bcd..f9a8ceb6 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -514,7 +514,7 @@ class TemplateProcessor
         $pattern = '~PartName="\/(word\/document.*?\.xml)" ContentType="application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document\.main\+xml"~';
 
         preg_match($pattern, $contentTypes, $matches);
-        
+
         return (array_key_exists(1, $matches) ? $matches[1] : 'word/document.xml');
     }
 

From ea6edf95ccefca19ab3a87cd192d8e9ca54a9c61 Mon Sep 17 00:00:00 2001
From: Christopher ARZUR <christopher.arzur@gmail.com>
Date: Fri, 16 Nov 2018 23:35:57 +0000
Subject: [PATCH 352/370] Added PHP 7.3 support for travis (#1495)

* Added PHP 7.3 support for travis
* mark php 7.3 as failable
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db77ff05..6fcdad43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,19 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 matrix:
     include:
         - php: 7.0
           env: COVERAGE=1
+        - php: 5.3
+          env: COMPOSER_MEMORY_LIMIT=2G
+    exclude:
+        - php: 7.0
+        - php: 5.3
+    allow_failures:
+        - php: 7.3
 
 cache:
     directories:
@@ -32,7 +40,7 @@ before_install:
 
 before_script:
     ## Deactivate xdebug if we don't do code coverage
-    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
+    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini || echo "xdebug not available" ; fi
     ## Composer
     - composer self-update
     - travis_wait composer install --prefer-source

From 9b174e52c1600cb9f302a4dc40354eeb8fc6f01b Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Mon, 19 Nov 2018 01:35:03 -0200
Subject: [PATCH 354/370] Fix typo in the PR template

---
 docs/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index 24ba001c..5430a996 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -8,4 +8,4 @@ Fixes # (issue)
 
 - [ ] I have run `composer run-script check --timeout=0` and no errors were reported
 - [ ] The new code is covered by unit tests (check build/coverage for coverage report)
-- [ ] I have update the documentation to describe the changes
+- [ ] I have updated the documentation to describe the changes

From 663fb036d003d2cd98c29639818ca3673dda22fb Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Mon, 19 Nov 2018 01:36:23 -0200
Subject: [PATCH 355/370] Use dedicated PHPUnit assertions

---
 tests/PhpWord/Writer/HTML/ElementTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 7a6397ef..61aaf71c 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -73,8 +73,8 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $dom = $this->getAsHTML($phpWord);
         $xpath = new \DOMXPath($dom);
 
-        $this->assertTrue($xpath->query('/html/body/p[1]/ins')->length == 1);
-        $this->assertTrue($xpath->query('/html/body/p[2]/del')->length == 1);
+        $this->assertEquals(1, $xpath->query('/html/body/p[1]/ins')->length);
+        $this->assertEquals(1, $xpath->query('/html/body/p[2]/del')->length);
     }
 
     /**
@@ -97,9 +97,9 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $dom = $this->getAsHTML($phpWord);
         $xpath = new \DOMXPath($dom);
 
-        $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 1);
+        $this->assertEquals(1, $xpath->query('/html/body/table/tr[1]/td')->length);
         $this->assertEquals('2', $xpath->query('/html/body/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
-        $this->assertTrue($xpath->query('/html/body/table/tr[2]/td')->length == 2);
+        $this->assertEquals(2, $xpath->query('/html/body/table/tr[2]/td')->length);
     }
 
     /**
@@ -126,9 +126,9 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $dom = $this->getAsHTML($phpWord);
         $xpath = new \DOMXPath($dom);
 
-        $this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 2);
+        $this->assertEquals(2, $xpath->query('/html/body/table/tr[1]/td')->length);
         $this->assertEquals('3', $xpath->query('/html/body/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
-        $this->assertTrue($xpath->query('/html/body/table/tr[2]/td')->length == 1);
+        $this->assertEquals(1, $xpath->query('/html/body/table/tr[2]/td')->length);
     }
 
     private function getAsHTML(PhpWord $phpWord)
@@ -155,6 +155,6 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $htmlWriter = new HTML($phpWord);
         $content = $htmlWriter->getContent();
 
-        $this->assertTrue(strpos($content, $expected) !== false);
+        $this->assertContains($expected, $content);
     }
 }

From d9d79c0666928ce564dbdf3d08dca9bcdc678863 Mon Sep 17 00:00:00 2001
From: Ralph02 <info@ralphmedia.co.uk>
Date: Thu, 25 Oct 2018 11:23:53 +0100
Subject: [PATCH 356/370] RTF writer: Round getPageSizeW and getPageSizeH to
 avoid decimals

---
 src/PhpWord/Writer/RTF/Style/Section.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Writer/RTF/Style/Section.php b/src/PhpWord/Writer/RTF/Style/Section.php
index 5c34fa86..ee6efcf3 100644
--- a/src/PhpWord/Writer/RTF/Style/Section.php
+++ b/src/PhpWord/Writer/RTF/Style/Section.php
@@ -43,8 +43,8 @@ class Section extends AbstractStyle
         $content .= '\sectd ';
 
         // Size & margin
-        $content .= $this->getValueIf($style->getPageSizeW() !== null, '\pgwsxn' . $style->getPageSizeW());
-        $content .= $this->getValueIf($style->getPageSizeH() !== null, '\pghsxn' . $style->getPageSizeH());
+        $content .= $this->getValueIf($style->getPageSizeW() !== null, '\pgwsxn' . round($style->getPageSizeW()));
+        $content .= $this->getValueIf($style->getPageSizeH() !== null, '\pghsxn' . round($style->getPageSizeH()));
         $content .= ' ';
         $content .= $this->getValueIf($style->getMarginTop() !== null, '\margtsxn' . $style->getMarginTop());
         $content .= $this->getValueIf($style->getMarginRight() !== null, '\margrsxn' . $style->getMarginRight());

From b5865b2fc2bb4773450add0c354e49166d32ea02 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 20 Nov 2018 19:59:30 +0100
Subject: [PATCH 357/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abf34834..7ce722c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ v0.16.0 (xx xxx 2018)
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269
 - HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
+- RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals @Patrick64 #1493
 
 v0.15.0 (14 Jul 2018)
 ----------------------

From 1c20a4ed22c791e3cc574291c1f40e53b328568d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 20 Nov 2018 21:22:50 +0100
Subject: [PATCH 358/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce722c4..ce553f05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ v0.16.0 (xx xxx 2018)
 - Fix regex in `cloneBlock` function @nicoder #1269
 - HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
 - RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals @Patrick64 #1493
+- Fix parsing of Office 365 documents @Timanx #1485
 
 v0.15.0 (14 Jul 2018)
 ----------------------

From c12f98f69a201502f3f994d261c106c8926ef62b Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Tue, 20 Nov 2018 22:40:54 +0100
Subject: [PATCH 359/370] fix check style warning

---
 src/PhpWord/TemplateProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index f9a8ceb6..95468878 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -515,7 +515,7 @@ class TemplateProcessor
 
         preg_match($pattern, $contentTypes, $matches);
 
-        return (array_key_exists(1, $matches) ? $matches[1] : 'word/document.xml');
+        return array_key_exists(1, $matches) ? $matches[1] : 'word/document.xml';
     }
 
     /**

From 5ccf985f9ad1c596c8b60d0730ff0bdaa2124804 Mon Sep 17 00:00:00 2001
From: Christopher ARZUR <christopher.arzur@gmail.com>
Date: Fri, 16 Nov 2018 23:35:57 +0000
Subject: [PATCH 360/370] Added PHP 7.3 support for travis (#1495)

* Added PHP 7.3 support for travis
* mark php 7.3 as failable
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db77ff05..6fcdad43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,19 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 matrix:
     include:
         - php: 7.0
           env: COVERAGE=1
+        - php: 5.3
+          env: COMPOSER_MEMORY_LIMIT=2G
+    exclude:
+        - php: 7.0
+        - php: 5.3
+    allow_failures:
+        - php: 7.3
 
 cache:
     directories:
@@ -32,7 +40,7 @@ before_install:
 
 before_script:
     ## Deactivate xdebug if we don't do code coverage
-    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
+    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini || echo "xdebug not available" ; fi
     ## Composer
     - composer self-update
     - travis_wait composer install --prefer-source

From a2a70736addbe2929c3edf41851bb83b75d00414 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Thu, 22 Nov 2018 23:05:43 +0100
Subject: [PATCH 361/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abf34834..8c3a174d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ v0.16.0 (xx xxx 2018)
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269
 - HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
+- Fix loading of Sharepoint document @Garrcomm #1498
 
 v0.15.0 (14 Jul 2018)
 ----------------------

From 7aef21facaf78e78da3902d1c2dc7766bca52c30 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 28 Nov 2018 22:02:39 +0100
Subject: [PATCH 362/370] add test for parsing HTML containing entities

---
 tests/PhpWord/Shared/HtmlTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 51d92431..89292a20 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -86,6 +86,21 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
         $this->assertCount(2, $section->getElements());
     }
 
+    /**
+     * Test HTML entities
+     */
+    public function testParseHtmlEntities()
+    {
+        \PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(true);
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        Html::addHtml($section, 'text with entities &lt;my text&gt;');
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:r/w:t'));
+        $this->assertEquals('text with entities <my text>', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
+    }
+
     /**
      * Test underline
      */

From 32fb85fc8e4ad5bc059574995344fd60dc950aaa Mon Sep 17 00:00:00 2001
From: Christopher ARZUR <christopher.arzur@gmail.com>
Date: Fri, 16 Nov 2018 23:35:57 +0000
Subject: [PATCH 363/370] Added PHP 7.3 support for travis (#1495)

* Added PHP 7.3 support for travis
* mark php 7.3 as failable
---
 .travis.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index db77ff05..6fcdad43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,19 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 matrix:
     include:
         - php: 7.0
           env: COVERAGE=1
+        - php: 5.3
+          env: COMPOSER_MEMORY_LIMIT=2G
+    exclude:
+        - php: 7.0
+        - php: 5.3
+    allow_failures:
+        - php: 7.3
 
 cache:
     directories:
@@ -32,7 +40,7 @@ before_install:
 
 before_script:
     ## Deactivate xdebug if we don't do code coverage
-    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini ; fi
+    - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini || echo "xdebug not available" ; fi
     ## Composer
     - composer self-update
     - travis_wait composer install --prefer-source

From b50de97a41f29987901b1370b74cbf08c643e741 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Wed, 28 Nov 2018 22:54:57 +0100
Subject: [PATCH 364/370] support `auto` table layout too

---
 CHANGELOG.md                              |  1 +
 src/PhpWord/Writer/HTML/Element/Table.php | 26 ++++++++++++++++++++---
 tests/PhpWord/Writer/HTML/ElementTest.php | 11 +++++++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abf34834..7e2325fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ v0.16.0 (xx xxx 2018)
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269
 - HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
+- Adding table layout to the generated HTML @aarangara #1441
 
 v0.15.0 (14 Jul 2018)
 ----------------------
diff --git a/src/PhpWord/Writer/HTML/Element/Table.php b/src/PhpWord/Writer/HTML/Element/Table.php
index 50c5a777..a5143d2b 100644
--- a/src/PhpWord/Writer/HTML/Element/Table.php
+++ b/src/PhpWord/Writer/HTML/Element/Table.php
@@ -39,9 +39,8 @@ class Table extends AbstractElement
         $rows = $this->element->getRows();
         $rowCount = count($rows);
         if ($rowCount > 0) {
-            $tableStyle = $this->element->getStyle();
-            $tableLayout = $tableStyle === null ? '' : $tableStyle->getLayout();
-            $content .= '<table' . (empty($tableLayout) ? '' : ' style="table-layout: ' . $tableLayout . '"') . '>' . PHP_EOL;
+            $content .= '<table' . self::getTableStyle($this->element->getStyle()) . '>' . PHP_EOL;
+
             for ($i = 0; $i < $rowCount; $i++) {
                 /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
                 $rowStyle = $rows[$i]->getStyle();
@@ -104,4 +103,25 @@ class Table extends AbstractElement
 
         return $content;
     }
+
+    /**
+     * Translates Table style in CSS equivalent
+     *
+     * @param \PhpOffice\PhpWord\Style\Table|null $tableStyle
+     * @return string
+     */
+    private function getTableStyle(\PhpOffice\PhpWord\Style\Table $tableStyle = null)
+    {
+        if ($tableStyle == null) {
+            return '';
+        }
+        $style = ' style="';
+        if ($tableStyle->getLayout() == \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED) {
+            $style .= 'table-layout: fixed;';
+        } elseif ($tableStyle->getLayout() == \PhpOffice\PhpWord\Style\Table::LAYOUT_AUTO) {
+            $style .= 'table-layout: auto;';
+        }
+
+        return $style . '"';
+    }
 }
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 1f286c5f..73c6ede9 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -166,14 +166,19 @@ class ElementTest extends \PHPUnit\Framework\TestCase
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addTable();
-        $table = $section->addTable(array('layout' => 'fixed'));
 
-        $row1 = $table->addRow();
+        $table1 = $section->addTable(array('layout' => \PhpOffice\PhpWord\Style\Table::LAYOUT_FIXED));
+        $row1 = $table1->addRow();
         $row1->addCell()->addText('fixed layout table');
 
+        $table2 = $section->addTable(array('layout' => \PhpOffice\PhpWord\Style\Table::LAYOUT_AUTO));
+        $row2 = $table2->addRow();
+        $row2->addCell()->addText('auto layout table');
+
         $dom = $this->getAsHTML($phpWord);
         $xpath = new \DOMXPath($dom);
 
-        $this->assertEquals('table-layout: fixed', $xpath->query('/html/body/table')->item(0)->attributes->getNamedItem('style')->textContent);
+        $this->assertEquals('table-layout: fixed;', $xpath->query('/html/body/table[1]')->item(0)->attributes->getNamedItem('style')->textContent);
+        $this->assertEquals('table-layout: auto;', $xpath->query('/html/body/table[2]')->item(0)->attributes->getNamedItem('style')->textContent);
     }
 }

From 6a7594630ce1a3adf7dbb8d9893f2f0f0e739faf Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 30 Nov 2018 23:01:05 +0100
Subject: [PATCH 365/370] add sonar config files

---
 .gitignore               |  1 +
 phpunit.xml.dist         |  1 +
 sonar-project.properties | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 sonar-project.properties

diff --git a/.gitignore b/.gitignore
index 2ac6e2b5..b2ec7e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ vendor
 /.settings
 phpword.ini
 /.buildpath
+/.scannerwork
 /.project
 /nbproject
 /.php_cs.cache
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 17fcfa39..4a882446 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,5 +23,6 @@
     <logging>
         <log type="coverage-html" target="./build/coverage" />
         <log type="coverage-clover" target="./build/logs/clover.xml" />
+        <log type="junit" target="./build/logs/logfile.xml"/>
     </logging>
 </phpunit>
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000..7741cfb4
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,17 @@
+# must be unique in a given SonarQube instance
+sonar.projectKey=phpoffice:phpword
+# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
+sonar.projectName=PHPWord
+sonar.projectVersion=0.16
+ 
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+# This property is optional if sonar.modules is set. 
+sonar.sources=src
+sonar.tests=tests
+sonar.php.coverage.reportPaths=build/logs/clover.xml
+sonar.php.tests.reportPath=build/logs/logfile.xml
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+sonar.host.url=http://localhost:9000
\ No newline at end of file

From a44aee8c34a78ed93d755224b8afd26d99737311 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Fri, 30 Nov 2018 22:59:21 +0100
Subject: [PATCH 366/370] fix some sonar warnings

---
 src/PhpWord/Reader/MsDoc.php | 2 ++
 src/PhpWord/Shared/Html.php  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index d4945229..187d5b17 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -2185,6 +2185,8 @@ class MsDoc extends AbstractReader implements ReaderInterface
 
                                     $sprmCPicLocation += $embeddedBlipRH['recLen'];
                                     break;
+                                case self::OFFICEARTBLIPPNG:
+                                    break;
                                 default:
                                     // print_r(dechex($embeddedBlipRH['recType']));
                             }
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 873234de..60fd7e16 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -531,6 +531,7 @@ class Html
                     $styles['bgColor'] = trim($cValue, '#');
                     break;
                 case 'line-height':
+                    $matches = array();
                     if (preg_match('/([0-9]+\.?[0-9]*[a-z]+)/', $cValue, $matches)) {
                         $spacingLineRule = \PhpOffice\PhpWord\SimpleType\LineSpacingRule::EXACT;
                         $spacing = Converter::cssToTwip($matches[1]) / \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
@@ -743,8 +744,6 @@ class Html
             default:
                 return Jc::START;
         }
-
-        return null;
     }
 
     /**

From fb60865b8dfa6b9e038d7798d126a0a717b09a2f Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 2 Dec 2018 15:39:25 +0100
Subject: [PATCH 367/370] test build php 7.3

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6fcdad43..881decfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,12 @@ matrix:
           env: COVERAGE=1
         - php: 5.3
           env: COMPOSER_MEMORY_LIMIT=2G
+        - php: 7.3
+          env: DEPENDENCIES="--ignore-platform-reqs"
     exclude:
-        - php: 7.0
         - php: 5.3
+        - php: 7.0
+        - php: 7.3
     allow_failures:
         - php: 7.3
 
@@ -43,7 +46,7 @@ before_script:
     - if [ -z "$COVERAGE" ]; then phpenv config-rm xdebug.ini || echo "xdebug not available" ; fi
     ## Composer
     - composer self-update
-    - travis_wait composer install --prefer-source
+    - travis_wait composer install --prefer-source $(if [ -n "$DEPENDENCIES" ]; then echo $DEPENDENCIES; fi)
     ## PHPDocumentor
     ##- mkdir -p build/docs
     - mkdir -p build/coverage

From 5b688d50d82cf491b6114e94bc84de59dc96941d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 2 Dec 2018 23:54:25 +0100
Subject: [PATCH 368/370] fix formatting

---
 src/PhpWord/Style/Chart.php                | 26 +++++++++++++---------
 src/PhpWord/Writer/Word2007/Part/Chart.php | 16 ++++++-------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/PhpWord/Style/Chart.php b/src/PhpWord/Style/Chart.php
index 5c96afd2..06b4829c 100644
--- a/src/PhpWord/Style/Chart.php
+++ b/src/PhpWord/Style/Chart.php
@@ -51,8 +51,8 @@ class Chart extends AbstractStyle
      * @var array
      */
     private $colors = array();
-    
-     /**
+
+    /**
      * Chart title
      *
      * @var string
@@ -111,9 +111,15 @@ class Chart extends AbstractStyle
      */
     private $valueAxisTitle;
 
+    /**
+     * The position for major tick marks
+     * Possible values are 'in', 'out', 'cross', 'none'
+     *
+     * @var string
+     */
     private $majorTickMarkPos = 'none';
 
-    /*
+    /**
      * Show labels for axis
      *
      * @var bool
@@ -234,7 +240,7 @@ class Chart extends AbstractStyle
 
         return $this;
     }
-    
+
     /**
      * Get the chart title
      *
@@ -248,7 +254,7 @@ class Chart extends AbstractStyle
     /**
      * Set the chart title
      *
-     * @param string $value 
+     * @param string $value
      */
     public function setTitle($value = null)
     {
@@ -262,7 +268,7 @@ class Chart extends AbstractStyle
      *
      * @return bool
      */
-    public function getShowLegend()
+    public function isShowLegend()
     {
         return $this->showLegend;
     }
@@ -270,7 +276,7 @@ class Chart extends AbstractStyle
     /**
      * Set chart legend visibility
      *
-     * @param bool $value 
+     * @param bool $value
      */
     public function setShowLegend($value = false)
     {
@@ -452,8 +458,8 @@ class Chart extends AbstractStyle
     }
 
     /**
-     * set the position for major tick marks
-     * @param string $position [description]
+     * Set the position for major tick marks
+     * @param string $position
      */
     public function setMajorTickPosition($position)
     {
@@ -461,7 +467,7 @@ class Chart extends AbstractStyle
         $this->majorTickMarkPos = $this->setEnumVal($position, $enum, $this->majorTickMarkPos);
     }
 
-    /*
+    /**
      * Show Gridlines for X-Axis
      *
      * @return bool
diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
index e14a708b..812d3bf1 100644
--- a/src/PhpWord/Writer/Word2007/Part/Chart.php
+++ b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -128,12 +128,12 @@ class Chart extends AbstractPart
         $type = $this->element->getType();
         $style = $this->element->getStyle();
         $this->options = $this->types[$type];
-        
-        $title = $style->getTitle();        
-        $showLegend = $style->getShowLegend();
+
+        $title = $style->getTitle();
+        $showLegend = $style->isShowLegend();
 
         //Chart title
-        if($title){            
+        if ($title) {
             $xmlWriter->startElement('c:title');
             $xmlWriter->startElement('c:tx');
             $xmlWriter->startElement('c:rich');
@@ -142,20 +142,18 @@ class Chart extends AbstractPart
                 <a:lstStyle/>
                 <a:p>
                 <a:pPr>
-                <a:defRPr/></a:pPr><a:r><a:rPr/><a:t>'.$title.'</a:t></a:r>
+                <a:defRPr/></a:pPr><a:r><a:rPr/><a:t>' . $title . '</a:t></a:r>
                 <a:endParaRPr/>
                 </a:p>');
-
             $xmlWriter->endElement(); // c:rich
             $xmlWriter->endElement(); // c:tx
             $xmlWriter->endElement(); // c:title
-
-        }else{
+        } else {
             $xmlWriter->writeElementBlock('c:autoTitleDeleted', 'val', 1);
         }
 
         //Chart legend
-        if($showLegend){
+        if ($showLegend) {
             $xmlWriter->writeRaw('<c:legend><c:legendPos val="r"/></c:legend>');
         }
 

From 0c4bd1d02f3b175d3944d6577c377a800e27aace Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 2 Dec 2018 23:54:32 +0100
Subject: [PATCH 369/370] update documentation

---
 docs/styles.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/styles.rst b/docs/styles.rst
index 8c5de7cb..f8d26a9b 100644
--- a/docs/styles.rst
+++ b/docs/styles.rst
@@ -192,6 +192,14 @@ Available Chart style options:
 - ``width``. Width (in EMU).
 - ``height``. Height (in EMU).
 - ``3d``. Is 3D; applies to pie, bar, line, area, *true* or *false*.
+- ``colors``. A list of colors to use in the chart.
+- ``title``. The title for the chart.
+- ``showLegend``. Show legend, *true* or *false*.
+- ``categoryLabelPosition``. Label position for categories, *nextTo* (default), *low* or *high*.
+- ``valueLabelPosition``. Label position for values, *nextTo* (default), *low* or *high*.
+- ``categoryAxisTitle``. The title for the category axis.
+- ``valueAxisTitle``. The title for the values axis.
+- ``majorTickMarkPos``. The position for major tick marks, *in*, *out*, *cross*, *none* (default).
 - ``showAxisLabels``. Show labels for axis, *true* or *false*.
 - ``gridX``. Show Gridlines for X-Axis, *true* or *false*.
 - ``gridY``. Show Gridlines for Y-Axis, *true* or *false*.

From 9f684c745e3b7f41c304659a77c74967e662f3f1 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sun, 2 Dec 2018 23:54:40 +0100
Subject: [PATCH 370/370] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1db7a5e..79ae2511 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 v0.16.0 (xx xxx 2018)
 ----------------------
 ### Added
+- Add setting Chart Title and Legend visibility @Tom-Magill #1433
 
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269