From 28fef5f264d1a04f6bb16b666e7ec20f73af6abd Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sun, 16 Mar 2014 00:25:49 +0700
Subject: [PATCH 1/6] Bugfix on PHPWordTest

---
 Tests/PHPWordTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/PHPWordTest.php b/Tests/PHPWordTest.php
index 15106af6..c08d0885 100644
--- a/Tests/PHPWordTest.php
+++ b/Tests/PHPWordTest.php
@@ -172,7 +172,7 @@ class PHPWordTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @covers PHPWord::loadTemplate
-     * @expectedException PHPWord_Exception
+     * @expectedException Exception
      */
     public function testLoadTemplateException()
     {

From 077d87d1bc9406458aff9665af77e3f1b8484af7 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sun, 16 Mar 2014 07:40:02 +0700
Subject: [PATCH 2/6] New unit tests for Writer

---
 Classes/PHPWord/Writer/ODText/Content.php     |  6 +--
 Classes/PHPWord/Writer/ODText/Manifest.php    |  7 +--
 Classes/PHPWord/Writer/Word2007.php           | 10 ++++
 .../PHPWord/Writer/ODText/WriterPartTest.php  | 45 ++++++++++++++++++
 Tests/PHPWord/Writer/ODTextTest.php           | 13 ------
 Tests/PHPWord/Writer/RTFTest.php              | 21 ++-------
 Tests/PHPWord/Writer/Word2007/FooterTest.php  | 44 ++++++++++++++++++
 Tests/PHPWord/Writer/Word2007/HeaderTest.php  | 46 +++++++++++++++++++
 .../Writer/Word2007/WriterPartTest.php        | 45 ++++++++++++++++++
 Tests/PHPWord/Writer/Word2007Test.php         | 23 +++++++++-
 10 files changed, 224 insertions(+), 36 deletions(-)
 create mode 100644 Tests/PHPWord/Writer/ODText/WriterPartTest.php
 create mode 100644 Tests/PHPWord/Writer/Word2007/FooterTest.php
 create mode 100644 Tests/PHPWord/Writer/Word2007/HeaderTest.php
 create mode 100644 Tests/PHPWord/Writer/Word2007/WriterPartTest.php

diff --git a/Classes/PHPWord/Writer/ODText/Content.php b/Classes/PHPWord/Writer/ODText/Content.php
index 0899990b..316e56fc 100755
--- a/Classes/PHPWord/Writer/ODText/Content.php
+++ b/Classes/PHPWord/Writer/ODText/Content.php
@@ -33,9 +33,9 @@ class PHPWord_Writer_ODText_Content extends PHPWord_Writer_ODText_WriterPart
     /**
      * Write content file to XML format
      *
-     * @param    PHPWord $pPHPWord
-     * @return    string                        XML Output
-     * @throws    Exception
+     * @param   PHPWord $pPHPWord
+     * @return  string XML Output
+     * @throws  Exception
      */
     public function writeContent(PHPWord $pPHPWord = null)
     {
diff --git a/Classes/PHPWord/Writer/ODText/Manifest.php b/Classes/PHPWord/Writer/ODText/Manifest.php
index 89e802dc..0d627ec9 100755
--- a/Classes/PHPWord/Writer/ODText/Manifest.php
+++ b/Classes/PHPWord/Writer/ODText/Manifest.php
@@ -113,9 +113,10 @@ class PHPWord_Writer_ODText_Manifest extends PHPWord_Writer_ODText_WriterPart
     /**
      * Get image mime type
      *
-     * @param    string $pFile Filename
-     * @return    string    Mime Type
-     * @throws    Exception
+     * @param   string $pFile Filename
+     * @return  string Mime Type
+     * @throws  Exception
+     * @codeCoverageIgnore Image is not yet handled by ODText
      */
     private function _getImageMimeType($pFile = '')
     {
diff --git a/Classes/PHPWord/Writer/Word2007.php b/Classes/PHPWord/Writer/Word2007.php
index e62341bf..0f9aac14 100755
--- a/Classes/PHPWord/Writer/Word2007.php
+++ b/Classes/PHPWord/Writer/Word2007.php
@@ -289,4 +289,14 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
             $this->checkContentTypes($element['source']);
         }
     }
+
+    /**
+     * Get disk caching directory
+     *
+     * @return string
+     */
+    public function getDiskCachingDirectory()
+    {
+        return $this->_diskCachingDirectory;
+    }
 }
diff --git a/Tests/PHPWord/Writer/ODText/WriterPartTest.php b/Tests/PHPWord/Writer/ODText/WriterPartTest.php
new file mode 100644
index 00000000..f7b70ba2
--- /dev/null
+++ b/Tests/PHPWord/Writer/ODText/WriterPartTest.php
@@ -0,0 +1,45 @@
+<?php
+namespace PHPWord\Tests\Writer\ODText;
+
+use PHPWord_Writer_ODText_WriterPart;
+use PHPWord_Writer_ODText;
+use PHPWord\Tests\TestHelperDOCX;
+
+/**
+ * Class WriterPartTest
+ *
+ * @package             PHPWord\Tests
+ * @coversDefaultClass  PHPWord_Writer_ODText_WriterPart
+ * @runTestsInSeparateProcesses
+ */
+class WriterPartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * covers   ::setParentWriter
+     * covers   ::getParentWriter
+     */
+    public function testSetGetParentWriter()
+    {
+        $object = $this->getMockForAbstractClass(
+            'PHPWord_Writer_Word2007_WriterPart'
+        );
+        $object->setParentWriter(new PHPWord_Writer_ODText());
+        $this->assertEquals(
+            new PHPWord_Writer_ODText(),
+            $object->getParentWriter()
+        );
+    }
+
+    /**
+     * covers   ::getParentWriter
+     * @expectedException Exception
+     * @expectedExceptionMessage No parent PHPWord_Writer_IWriter assigned.
+     */
+    public function testSetGetParentWriterNull()
+    {
+        $object = $this->getMockForAbstractClass(
+            'PHPWord_Writer_Word2007_WriterPart'
+        );
+        $object->getParentWriter();
+    }
+}
diff --git a/Tests/PHPWord/Writer/ODTextTest.php b/Tests/PHPWord/Writer/ODTextTest.php
index ef92d249..7cc49fba 100644
--- a/Tests/PHPWord/Writer/ODTextTest.php
+++ b/Tests/PHPWord/Writer/ODTextTest.php
@@ -92,19 +92,6 @@ class ODTextTest extends \PHPUnit_Framework_TestCase
         unlink($file);
     }
 
-    /**
-     * @covers  ::save
-     * @todo    Haven't got any method to test this
-     */
-    public function testSavePhpOutput()
-    {
-        $phpWord = new PHPWord();
-        $section = $phpWord->createSection();
-        $section->addText('Test');
-        $writer = new PHPWord_Writer_ODText($phpWord);
-        $writer->save('php://output');
-    }
-
     /**
      * @covers                      ::save
      * @expectedException           Exception
diff --git a/Tests/PHPWord/Writer/RTFTest.php b/Tests/PHPWord/Writer/RTFTest.php
index d071def7..8735c7d7 100644
--- a/Tests/PHPWord/Writer/RTFTest.php
+++ b/Tests/PHPWord/Writer/RTFTest.php
@@ -35,19 +35,6 @@ class RTFTest extends \PHPUnit_Framework_TestCase
         $object->getPHPWord();
     }
 
-    /**
-     * @covers  ::save
-     * @todo    Haven't got any method to test this
-     */
-    public function testSavePhpOutput()
-    {
-        $phpWord = new PHPWord();
-        $section = $phpWord->createSection();
-        $section->addText('Test');
-        $writer = new PHPWord_Writer_RTF($phpWord);
-        $writer->save('php://output');
-    }
-
     /**
      * @covers                      ::save
      * @expectedException           Exception
@@ -78,13 +65,15 @@ class RTFTest extends \PHPUnit_Framework_TestCase
             array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'temp.rtf')
         );
 
+        $fontStyle = array('name' => 'Verdana', 'size' => 11, 'bold' => true, 'italic' => true, 'color' => 'F29101', 'fgColor' => '123456');
+        $paragraphStyle = array('align' => 'center', 'spaceAfter' => 120);
         $phpWord = new PHPWord();
-        $phpWord->addFontStyle('Font', array('size' => 11));
-        $phpWord->addParagraphStyle('Paragraph', array('align' => 'center'));
+        $phpWord->addFontStyle('Font', $fontStyle);
+        $phpWord->addParagraphStyle('Paragraph', $paragraphStyle);
         $section = $phpWord->createSection();
         $section->addText('Test 1', 'Font');
+        $section->addText('Test 2', array('name' => 'Tahoma'), 'Paragraph');
         $section->addTextBreak();
-        $section->addText('Test 2', null, 'Paragraph');
         $section->addLink('http://test.com');
         $section->addTitle('Test', 1);
         $section->addPageBreak();
diff --git a/Tests/PHPWord/Writer/Word2007/FooterTest.php b/Tests/PHPWord/Writer/Word2007/FooterTest.php
new file mode 100644
index 00000000..1facc622
--- /dev/null
+++ b/Tests/PHPWord/Writer/Word2007/FooterTest.php
@@ -0,0 +1,44 @@
+<?php
+namespace PHPWord\Tests\Writer\Word2007;
+
+use PHPWord_Writer_Word2007_Footer;
+use PHPWord_Writer_Word2007;
+use PHPWord_Section_Footer;
+use PHPWord\Tests\TestHelperDOCX;
+
+/**
+ * Class FooterTest
+ *
+ * @package             PHPWord\Tests
+ * @coversDefaultClass  PHPWord_Writer_Word2007_Footer
+ * @runTestsInSeparateProcesses
+ */
+class FooterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers  ::writeFooter
+     */
+    public function testWriteFooter()
+    {
+        $imageSrc = \join(
+            \DIRECTORY_SEPARATOR,
+            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'images', 'PHPWord.png')
+        );
+        $container = new PHPWord_Section_Footer(1);
+        $container->addText('');
+        $container->addPreserveText('');
+        $container->addTextBreak();
+        $container->createTextRun();
+        $container->addTable()->addRow()->addCell()->addText('');
+        $container->addImage($imageSrc);
+
+        $writer = new PHPWord_Writer_Word2007();
+        $object = new PHPWord_Writer_Word2007_Footer();
+        $object->setParentWriter($writer);
+        $object->writeFooter($container);
+        $writer->setUseDiskCaching(true);
+        $xml = simplexml_load_string($object->writeFooter($container));
+
+        $this->assertInstanceOf('SimpleXMLElement', $xml);
+    }
+}
diff --git a/Tests/PHPWord/Writer/Word2007/HeaderTest.php b/Tests/PHPWord/Writer/Word2007/HeaderTest.php
new file mode 100644
index 00000000..f4972b7c
--- /dev/null
+++ b/Tests/PHPWord/Writer/Word2007/HeaderTest.php
@@ -0,0 +1,46 @@
+<?php
+namespace PHPWord\Tests\Writer\Word2007;
+
+use PHPWord_Writer_Word2007_Header;
+use PHPWord_Writer_Word2007;
+use PHPWord_Section_Header;
+use PHPWord\Tests\TestHelperDOCX;
+
+/**
+ * Class HeaderTest
+ *
+ * @package             PHPWord\Tests
+ * @coversDefaultClass  PHPWord_Writer_Word2007_Header
+ * @runTestsInSeparateProcesses
+ */
+class HeaderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers  ::writeHeader
+     */
+    public function testWriteHeader()
+    {
+        $imageSrc = \join(
+            \DIRECTORY_SEPARATOR,
+            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'images', 'PHPWord.png')
+        );
+
+        $container = new PHPWord_Section_Header(1);
+        $container->addText('Test');
+        $container->addPreserveText('');
+        $container->addTextBreak();
+        $container->createTextRun();
+        $container->addTable()->addRow()->addCell()->addText('');
+        $container->addImage($imageSrc);
+        $container->addWatermark($imageSrc);
+
+        $writer = new PHPWord_Writer_Word2007();
+        $object = new PHPWord_Writer_Word2007_Header();
+        $object->setParentWriter($writer);
+        $object->writeHeader($container);
+        $writer->setUseDiskCaching(true);
+        $xml = simplexml_load_string($object->writeHeader($container));
+
+        $this->assertInstanceOf('SimpleXMLElement', $xml);
+    }
+}
diff --git a/Tests/PHPWord/Writer/Word2007/WriterPartTest.php b/Tests/PHPWord/Writer/Word2007/WriterPartTest.php
new file mode 100644
index 00000000..3d983178
--- /dev/null
+++ b/Tests/PHPWord/Writer/Word2007/WriterPartTest.php
@@ -0,0 +1,45 @@
+<?php
+namespace PHPWord\Tests\Writer\Word2007;
+
+use PHPWord_Writer_Word2007_WriterPart;
+use PHPWord_Writer_Word2007;
+use PHPWord\Tests\TestHelperDOCX;
+
+/**
+ * Class WriterPartTest
+ *
+ * @package             PHPWord\Tests
+ * @coversDefaultClass  PHPWord_Writer_Word2007_WriterPart
+ * @runTestsInSeparateProcesses
+ */
+class WriterPartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * covers   ::setParentWriter
+     * covers   ::getParentWriter
+     */
+    public function testSetGetParentWriter()
+    {
+        $object = $this->getMockForAbstractClass(
+            'PHPWord_Writer_Word2007_WriterPart'
+        );
+        $object->setParentWriter(new PHPWord_Writer_Word2007());
+        $this->assertEquals(
+            new PHPWord_Writer_Word2007(),
+            $object->getParentWriter()
+        );
+    }
+
+    /**
+     * covers   ::getParentWriter
+     * @expectedException Exception
+     * @expectedExceptionMessage No parent PHPWord_Writer_IWriter assigned.
+     */
+    public function testSetGetParentWriterNull()
+    {
+        $object = $this->getMockForAbstractClass(
+            'PHPWord_Writer_Word2007_WriterPart'
+        );
+        $object->getParentWriter();
+    }
+}
diff --git a/Tests/PHPWord/Writer/Word2007Test.php b/Tests/PHPWord/Writer/Word2007Test.php
index 95abee83..ca1d7d82 100644
--- a/Tests/PHPWord/Writer/Word2007Test.php
+++ b/Tests/PHPWord/Writer/Word2007Test.php
@@ -67,6 +67,26 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
         unlink($file);
     }
 
+    /**
+     * @covers                      ::save
+     * @expectedException           Exception
+     * @expectedExceptionMessage    PHPWord object unassigned.
+     */
+    public function testSaveException()
+    {
+        $writer = new PHPWord_Writer_Word2007();
+        $writer->save();
+    }
+
+    /**
+     * @covers  ::getWriterPart
+     */
+    public function testGetWriterPartNull()
+    {
+        $object = new PHPWord_Writer_Word2007();
+        $this->assertNull($object->getWriterPart('foo'));
+    }
+
     /**
      * @covers  ::checkContentTypes
      */
@@ -100,13 +120,14 @@ class Word2007Test extends \PHPUnit_Framework_TestCase
     /**
      * @covers  ::setUseDiskCaching
      * @covers  ::getUseDiskCaching
+     * @covers  ::getDiskCachingDirectory
      */
     public function testSetGetUseDiskCaching()
     {
         $object = new PHPWord_Writer_Word2007();
         $object->setUseDiskCaching(true, PHPWORD_TESTS_DIR_ROOT);
-
         $this->assertTrue($object->getUseDiskCaching());
+        $this->assertEquals(PHPWORD_TESTS_DIR_ROOT, $object->getDiskCachingDirectory());
     }
 
     /**

From 18c1e5f77b32f66e663509cd72f59c865d5897e7 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Sun, 16 Mar 2014 08:42:02 +0700
Subject: [PATCH 3/6] Additional template test

---
 Tests/PHPWord/TemplateTest.php          |  30 ++++++++++++++++++++++--
 Tests/_files/templates/clone-merge.docx | Bin 0 -> 14690 bytes
 Tests/_files/templates/clone-row.docx   | Bin 14690 -> 14678 bytes
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 Tests/_files/templates/clone-merge.docx

diff --git a/Tests/PHPWord/TemplateTest.php b/Tests/PHPWord/TemplateTest.php
index 872ab182..1439cebc 100644
--- a/Tests/PHPWord/TemplateTest.php
+++ b/Tests/PHPWord/TemplateTest.php
@@ -145,17 +145,43 @@ final class TemplateTest extends \PHPUnit_Framework_TestCase
         @$template->applyXslStyleSheet($xslDOMDocument);
     }
 
+    /**
+     * @covers  PHPWord_Template
+     */
+    public function testConstruct()
+    {
+        $template = \join(
+            \DIRECTORY_SEPARATOR,
+            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'clone-row.docx')
+        );
+        $expectedVar = array('tableHeader', 'userId', 'userName');
+        $document = new PHPWord_Template($template);
+        $actualVar = $document->getVariables();
+        $document->cloneRow('userId', 9);
+        $document->setValue('userId#1', utf8_decode('ééé'));
+        $document->setValue('userId#2', 'a');
+        $document->setValue('userId#3', 'a');
+        $document->setValue('userId#3', 'a');
+        $document->setValue('userId#4', 'a');
+        $document->setValue('userId#5', 'a');
+        $document->setValue('userId#6', 'a');
+        $document->setValue('userId#7', 'a');
+        $document->setValue('userId#8', 'a');
+        $document->cloneRow('userId#9', 'a');
+        $this->assertEquals($expectedVar, $actualVar);
+    }
+
     /**
      * @covers  ::setValue
      * @covers  ::getVariables
      * @covers  ::cloneRow
      * @covers  ::saveAs
      */
-    public function testCloneRow()
+    public function testCloneMergedRow()
     {
         $template = \join(
             \DIRECTORY_SEPARATOR,
-            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'clone-row.docx')
+            array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'clone-merge.docx')
         );
         $expectedVar = array('tableHeader', 'userId', 'userName', 'userLocation');
         $docName = 'clone-test-result.docx';
diff --git a/Tests/_files/templates/clone-merge.docx b/Tests/_files/templates/clone-merge.docx
new file mode 100644
index 0000000000000000000000000000000000000000..eb944367f035ea2a39f4ea0fa3ab7e7cc3939bef
GIT binary patch
literal 14690
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

literal 0
HcmV?d00001

diff --git a/Tests/_files/templates/clone-row.docx b/Tests/_files/templates/clone-row.docx
index eb944367f035ea2a39f4ea0fa3ab7e7cc3939bef..8bea4f038347055bb24accfe12d11bc60b976337 100644
GIT binary patch
delta 983
zcmaD<bghUtz?+#xgaHJq91Aw`zT{#C(vyF3DexU}EO2rBoVZq<iGkrB+hlcamHI2U
z*><12bf)Wacj)V)jVpt0vnxp4Uh&MiVRCBdy;}A;Hv%_p^{hVpkm3J*%YvL4_x^~L
zZb>;-q-s2cCrQN6GxS{Q%!SL3zn?BF66v1em!%rncJ0if**Bm2Uk;t6eTzdamW3np
z^3-LLtL9wRJT@)NN5EQOj#O&sL$(mkHC;`?^=;v&p8U}AdvxKlTVR^*k>74lCPi#H
z+L=7-lFy-(g*^&<F~LcWXNni=H?He^%pF&}ovqB~USdd_l=5ZWN1MD)cwaJGxb~*z
z8O_4zlW)JVIJx9R@LFnQYOnj9yJtGv<g0v}YI23W0~fDjIr$>lbcbmQ>oWFvlj`nu
zxyTyTH_xa)q8@TY+3KjK=9}Yhj0Iax^L^g8_@?!pC#NeLRy#N7ooAL2dwy<(+jo<H
zhPPtu%5_ejOFH^^@!Ff48Qf3Wgt#1**T}HaUuu*R=<F7-iNnwK(|pre2YWXM{Ja(Y
zR{F8DdG(iU<>RquFTHqlwDLQ<vZe8C&2QW_*-opQlLFZ<pQ?YU`0k`p@fvRBFZa9R
zT{isJj7om6uSWIBQEz6)=RcqA*|GMF`~5wFaz5MhPp{Z*-WY24r!(x|cdtq73lg37
zH~p(Hnxk+>?}sN(kJZw|nkg~ARokXdeSNpJ$d9vMqHj<9=A`^>T%{*2l-hjETR7!*
z@#$l%=6Qz$L!%|O&I%B_CU>CV_o+LQ^Qz6JznN#v70GwpvE}#Q2Y0VG{%+6wCce3l
zca;P<`2^^SZ8lMpWCw9J2k0s=gBisJ&WvE`orWg7<!K+bZgDuz2&N}rG?m^gYNQE~
zb~HBNy&>`&EDfe7*BOhWC&$IchU`Bhy4kimoS&>{p*Z=Eu@qzKWO0)uMu*8&CdrJ-
zlkb@%GD=Q%FimFqAu@TXX(D6yWOg$rumgO|q%~O87#Pa)i&FGUGE#F>^|=@nz`1~t
zL4v`e?<d%DFg>~7%#=}Y@=>!iM()Wv=I(F<%ypp##22OJ6r&h`;rhuJ%;gvpCcih&
zWn4cw*22vl7%(ni`=A6Hg9?--0HmV~7#J{3t(g4>>?{}^*|lbpk?7?A7E+9Llcg-3
K*yb66%m4tX{+e3=

delta 955
zcmcas^r(n8z?+#xgaHKjqw_cNzT{#C(vyF3Dey^0=ez9FH{WW^#K6GDK3SbxrGCq8
zw%sQ$o$0#V9r{{nZSc}Oeg}hXfoIzp)K4$l`<w5^#>GprCx2tJC^+~2&%+xA`~RuF
z$~fEe)GJLx@~B4Aq*ZfH8#&w8*X*3J@Pw68agg>&qb;dovHJJ+&(6OTbJ5M<rILfk
z>^zgR0Z-@n8E)H>)O2IwgDV=Vxy%=NC4`F1sW;jasCImMp-}rovo51-#rx?>*N-gX
zQ}4_4GUn`VHEOaj@a<$Z?C;&juuH9PeZ|?kVmCgPv<FIN_4rsHan(Q3zGUr!b+=t-
z1b^D5XnvQorRT;5DHDxM?RD+Bd#15<U*+3WmnWPZxOgAS$tSs{I}B5p?=sl9*4<<4
zw9=?=oKb&7J>-b;ua01qH_v6Ja2!hQue^Kljcnehk2VLMDmqMm&dAqYoE@^5U8-I>
zS5v-vT1xuHM=vj4dlT89Y{)Nq@dG>8EIsd)JdsxyaCnIwT<QLAvm5u0!Z5A-+sgaD
zE&JFTUGwAdp8w%)MQQ)eZJhskE$3Q3ztvVHxh%Q2e<!ScUq3@Ll7%@a{e;1eH$Bc0
zN!Ifh=k%tg&9tA&!T(|T;eEmf|4H8{dsexS{g6_P)3yArw(gft&+M?*I=$j`(G>pu
zi+lg`PJSXBv&LXug3a9CbdK$O<wp*z36^@MesXHL;hr^j64p&A_Nq8i@#yU=(dyNq
z8nJEb9?dl8UV3L<q?z6ft-{%Tt8N`ybG2pD1Ln(bvrDoo-rbDZRQ*n4g^a(mfZVs{
z+v_>l4l{52!M-__ca;PvDQy-~(`N@WTyzzf!HjeRXGU-;TWe^-`{dl65;lkPj9_~6
zJ3|+Ul&P@+Z_3L@U@0&?d9ArPdXk)OY{;6%r_#(e`K+-mQz7r<Mqc5`@+N+aK9loI
zk{R_UUouH#RGn;Mn#{x^I(epPBIESQzfGOMb~~6!GYU?QF_RKTu?FZ8>)^eU6)i+3
z&oh%^w3@urER9iovVyrgOqYhUE(1e(eo=~kd{Jsnu|5}r0yz6HGDt9>7zK2(DN~N_
z<QiSM$xIf0jJqcXTDXBtnPnlZnP$MifN20r!4t5TVRU5I8n9bFTSzf>P3E(7Vq0Yh
GvJC*r=!wh#


From 745f3c81b5d5696ad449a8e206304a7dfcf96ff6 Mon Sep 17 00:00:00 2001
From: Brandon Skrtich <bskrtich@gmail.com>
Date: Sun, 16 Mar 2014 11:52:56 -0600
Subject: [PATCH 4/6] Add function to check for image type.

Some servers do not have exif_imagetype available. So I added a work around.
---
 Classes/PHPWord/Media.php           |  2 +-
 Classes/PHPWord/Section/Image.php   |  3 +-
 Classes/PHPWord/Shared/File.php     | 47 +++++++++++++++++++++--------
 Classes/PHPWord/Writer/Word2007.php |  2 +-
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/Classes/PHPWord/Media.php b/Classes/PHPWord/Media.php
index 03328184..5fac968b 100755
--- a/Classes/PHPWord/Media.php
+++ b/Classes/PHPWord/Media.php
@@ -101,7 +101,7 @@ class PHPWord_Media
                     $media['createfunction'] = $memoryImage->getImageCreateFunction();
                     $media['imagefunction'] = $memoryImage->getImageFunction();
                 } else {
-                    $imageType = exif_imagetype($src);
+                    $imageType = PHPWord_Shared_File::imagetype($src);
                     if ($imageType === IMAGETYPE_JPEG) {
                         $extension = 'jpg';
                     } elseif ($imageType === IMAGETYPE_GIF) {
diff --git a/Classes/PHPWord/Section/Image.php b/Classes/PHPWord/Section/Image.php
index fcaa1cc9..b8272e89 100755
--- a/Classes/PHPWord/Section/Image.php
+++ b/Classes/PHPWord/Section/Image.php
@@ -61,7 +61,6 @@ class PHPWord_Section_Image
      */
     private $_isWatermark;
 
-
     /**
      * Create a new Image
      *
@@ -78,7 +77,7 @@ class PHPWord_Section_Image
             throw new InvalidImageException;
         }
 
-        if (!in_array(exif_imagetype($src), $supportedImageTypes)) {
+        if (!in_array(PHPWord_Shared_File::imagetype($src), $supportedImageTypes)) {
             throw new UnsupportedImageTypeException;
         }
 
diff --git a/Classes/PHPWord/Shared/File.php b/Classes/PHPWord/Shared/File.php
index 26a206ba..43b0cad4 100755
--- a/Classes/PHPWord/Shared/File.php
+++ b/Classes/PHPWord/Shared/File.php
@@ -33,12 +33,11 @@ class PHPWord_Shared_File
     /**
      * Verify if a file exists
      *
-     * @param    string $pFilename Filename
+     * @param string $pFilename Filename
      * @return bool
      */
     public static function file_exists($pFilename)
     {
-        // Regular file_exists
         return file_exists($pFilename);
     }
 
@@ -50,18 +49,13 @@ class PHPWord_Shared_File
      */
     public static function realpath($pFilename)
     {
-        // Returnvalue
-        $returnValue = '';
-
-        // Try using realpath()
         $returnValue = realpath($pFilename);
 
-        // Found something?
-        if ($returnValue == '' || is_null($returnValue)) {
+        if (!$returnValue) {
             $pathArray = explode('/', $pFilename);
-            while (in_array('..', $pathArray) && $pathArray[0] != '..') {
+            while (in_array('..', $pathArray) && $pathArray[0] !== '..') {
                 for ($i = 0; $i < count($pathArray); ++$i) {
-                    if ($pathArray[$i] == '..' && $i > 0) {
+                    if ($pathArray[$i] === '..' && $i > 0) {
                         unset($pathArray[$i]);
                         unset($pathArray[$i - 1]);
                         break;
@@ -71,7 +65,36 @@ class PHPWord_Shared_File
             $returnValue = implode('/', $pathArray);
         }
 
-        // Return
         return $returnValue;
     }
-}
+
+    /**
+     * PHP Words version of exif_imagetype to return the Image Type from a file
+     *
+     * @param string $filename
+     * @return int|bool
+     */
+    public static function PHPWord_imagetype($filename)
+    {
+        if ((list($width, $height, $type, $attr) = getimagesize($filename)) !== false) {
+            return $type;
+        }
+        return false;
+    }
+
+    /**
+     * Return the Image Type from a file
+     *
+     * @param string $filename
+     * @return int|bool
+     */
+    public static function imagetype($filename)
+    {
+        if (function_exists('exif_imagetype')) {
+            return exif_imagetype($filename);
+        } else {
+            return self::PHPWord_imagetype($filename);
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/Classes/PHPWord/Writer/Word2007.php b/Classes/PHPWord/Writer/Word2007.php
index e62341bf..110ba392 100755
--- a/Classes/PHPWord/Writer/Word2007.php
+++ b/Classes/PHPWord/Writer/Word2007.php
@@ -212,7 +212,7 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         if (stripos(strrev($src), strrev('.php')) === 0) {
             $extension = 'php';
         } else {
-            $imageType = exif_imagetype($src);
+            $imageType = PHPWord_Shared_File::imagetype($src);
             if ($imageType === IMAGETYPE_JPEG) {
                 $extension = 'jpg';
             } elseif ($imageType === IMAGETYPE_GIF) {

From 74566e38627bb25f66df52a289a046f9eefa7d3c Mon Sep 17 00:00:00 2001
From: Gabriel Bull <me@gabrielbull.com>
Date: Sun, 16 Mar 2014 16:35:24 -0400
Subject: [PATCH 5/6] Added test case for image type detection

Conflicts:
	changelog.txt
---
 Classes/PHPWord/Media.php                     | 14 +------
 Classes/PHPWord/Section/Image.php             |  4 +-
 Classes/PHPWord/Shared/File.php               | 42 +++++++++++++++----
 Classes/PHPWord/Writer/Word2007.php           | 21 ++--------
 Tests/PHPWord/Shared/FileTest.php             | 37 +++++++++++++++-
 .../PHPWord/Writer/Word2007/DocumentTest.php  |  2 +-
 Tests/_inc/TestHelperDOCX.php                 |  9 ++--
 changelog.txt                                 |  3 ++
 8 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/Classes/PHPWord/Media.php b/Classes/PHPWord/Media.php
index 5fac968b..1d422775 100755
--- a/Classes/PHPWord/Media.php
+++ b/Classes/PHPWord/Media.php
@@ -94,25 +94,13 @@ class PHPWord_Media
                 if (!$isMemImage) {
                     $isMemImage = (filter_var($src, FILTER_VALIDATE_URL) !== false);
                 }
-                $extension = '';
                 if ($isMemImage) {
                     $extension = $memoryImage->getImageExtension();
                     $media['isMemImage'] = true;
                     $media['createfunction'] = $memoryImage->getImageCreateFunction();
                     $media['imagefunction'] = $memoryImage->getImageFunction();
                 } else {
-                    $imageType = PHPWord_Shared_File::imagetype($src);
-                    if ($imageType === IMAGETYPE_JPEG) {
-                        $extension = 'jpg';
-                    } elseif ($imageType === IMAGETYPE_GIF) {
-                        $extension = 'gif';
-                    } elseif ($imageType === IMAGETYPE_PNG) {
-                        $extension = 'png';
-                    } elseif ($imageType === IMAGETYPE_BMP) {
-                        $extension = 'bmp';
-                    } elseif ($imageType === IMAGETYPE_TIFF_II || $imageType === IMAGETYPE_TIFF_MM) {
-                        $extension = 'tif';
-                    }
+                    $extension = PHPWord_Shared_File::imagetype($src);
                 }
 
                 $folder = 'media';
diff --git a/Classes/PHPWord/Section/Image.php b/Classes/PHPWord/Section/Image.php
index b8272e89..30a10449 100755
--- a/Classes/PHPWord/Section/Image.php
+++ b/Classes/PHPWord/Section/Image.php
@@ -71,13 +71,11 @@ class PHPWord_Section_Image
      */
     public function __construct($src, $style = null, $isWatermark = false)
     {
-        $supportedImageTypes = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM);
-
         if (!file_exists($src)) {
             throw new InvalidImageException;
         }
 
-        if (!in_array(PHPWord_Shared_File::imagetype($src), $supportedImageTypes)) {
+        if (!PHPWord_Shared_File::imagetype($src)) {
             throw new UnsupportedImageTypeException;
         }
 
diff --git a/Classes/PHPWord/Shared/File.php b/Classes/PHPWord/Shared/File.php
index 43b0cad4..4ed0e725 100755
--- a/Classes/PHPWord/Shared/File.php
+++ b/Classes/PHPWord/Shared/File.php
@@ -30,6 +30,12 @@
  */
 class PHPWord_Shared_File
 {
+    const IMAGETYPE_JPEG = 'jpg';
+    const IMAGETYPE_GIF = 'gif';
+    const IMAGETYPE_PNG = 'png';
+    const IMAGETYPE_BMP = 'bmp';
+    const IMAGETYPE_TIFF = 'tif';
+
     /**
      * Verify if a file exists
      *
@@ -74,10 +80,20 @@ class PHPWord_Shared_File
      * @param string $filename
      * @return int|bool
      */
-    public static function PHPWord_imagetype($filename)
+    private static function fallbackImagetype($filename)
     {
         if ((list($width, $height, $type, $attr) = getimagesize($filename)) !== false) {
-            return $type;
+            if ($type === 2) {
+                return self::IMAGETYPE_JPEG;
+            } elseif ($type === 1) {
+                return self::IMAGETYPE_GIF;
+            } elseif ($type === 3) {
+                return self::IMAGETYPE_PNG;
+            } elseif ($type === 6) {
+                return self::IMAGETYPE_BMP;
+            } elseif ($type === 7 || $type === 8) {
+                return self::IMAGETYPE_TIFF;
+            }
         }
         return false;
     }
@@ -86,14 +102,26 @@ class PHPWord_Shared_File
      * Return the Image Type from a file
      *
      * @param string $filename
+     * @param bool $userFallbackFunction
      * @return int|bool
      */
-    public static function imagetype($filename)
+    public static function imagetype($filename, $userFallbackFunction = false)
     {
-        if (function_exists('exif_imagetype')) {
-            return exif_imagetype($filename);
-        } else {
-            return self::PHPWord_imagetype($filename);
+        if ($userFallbackFunction || !function_exists('exif_imagetype')) {
+            return self::fallbackImagetype($filename);
+        }
+
+        $imagetype = exif_imagetype($filename);
+        if ($imagetype === IMAGETYPE_JPEG) {
+            return self::IMAGETYPE_JPEG;
+        } elseif ($imagetype === IMAGETYPE_GIF) {
+            return self::IMAGETYPE_GIF;
+        } elseif ($imagetype === IMAGETYPE_PNG) {
+            return self::IMAGETYPE_PNG;
+        } elseif ($imagetype === IMAGETYPE_BMP) {
+            return self::IMAGETYPE_BMP;
+        } elseif ($imagetype === IMAGETYPE_TIFF_II || $imagetype === IMAGETYPE_TIFF_MM) {
+            return self::IMAGETYPE_TIFF;
         }
         return false;
     }
diff --git a/Classes/PHPWord/Writer/Word2007.php b/Classes/PHPWord/Writer/Word2007.php
index 110ba392..50890363 100755
--- a/Classes/PHPWord/Writer/Word2007.php
+++ b/Classes/PHPWord/Writer/Word2007.php
@@ -212,21 +212,10 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         if (stripos(strrev($src), strrev('.php')) === 0) {
             $extension = 'php';
         } else {
-            $imageType = PHPWord_Shared_File::imagetype($src);
-            if ($imageType === IMAGETYPE_JPEG) {
-                $extension = 'jpg';
-            } elseif ($imageType === IMAGETYPE_GIF) {
-                $extension = 'gif';
-            } elseif ($imageType === IMAGETYPE_PNG) {
-                $extension = 'png';
-            } elseif ($imageType === IMAGETYPE_BMP) {
-                $extension = 'bmp';
-            } elseif ($imageType === IMAGETYPE_TIFF_II || $imageType === IMAGETYPE_TIFF_MM) {
-                $extension = 'tif';
-            }
+            $extension = PHPWord_Shared_File::imagetype($src);
         }
 
-        if (isset($extension)) {
+        if (isset($extension) && $extension) {
             $imageData = getimagesize($src);
             $imageType = image_type_to_mime_type($imageData[2]);
             $imageExtension = str_replace('.', '', image_type_to_extension($imageData[2]));
@@ -236,10 +225,8 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
             if (!in_array($imageType, $this->_imageTypes)) {
                 $this->_imageTypes[$imageExtension] = $imageType;
             }
-        } else {
-            if (!in_array($extension, $this->_objectTypes)) {
-                $this->_objectTypes[] = $extension;
-            }
+        } elseif (!in_array($extension, $this->_objectTypes)) {
+            $this->_objectTypes[] = $extension;
         }
     }
 
diff --git a/Tests/PHPWord/Shared/FileTest.php b/Tests/PHPWord/Shared/FileTest.php
index a5ac348f..fe825b8f 100644
--- a/Tests/PHPWord/Shared/FileTest.php
+++ b/Tests/PHPWord/Shared/FileTest.php
@@ -54,4 +54,39 @@ class FileTest extends \PHPUnit_Framework_TestCase
         $expected = $dir . DIRECTORY_SEPARATOR . $file;
         $this->assertEquals($expected, PHPWord_Shared_File::realpath($file));
     }
-}
+
+    /**
+     * @covers PHPWord_Shared_File::imagetype
+     * @covers PHPWord_Shared_File::fallbackImagetype
+     */
+    public function testImagetype()
+    {
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/mars_noext_jpg";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_JPEG, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_JPEG, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/mars.jpg";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_JPEG, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_JPEG, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/mario.gif";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_GIF, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_GIF, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/firefox.png";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_PNG, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_PNG, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/duke_nukem.bmp";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_BMP, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_BMP, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/angela_merkel.tif";
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_TIFF, PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertEquals(PHPWord_Shared_File::IMAGETYPE_TIFF, PHPWord_Shared_File::imagetype($filename));
+
+        $filename = PHPWORD_TESTS_DIR_ROOT . "/_files/images/alexz-johnson.pcx";
+        $this->assertFalse(PHPWord_Shared_File::imagetype($filename, true));
+        $this->assertFalse(PHPWord_Shared_File::imagetype($filename));
+    }
+}
\ No newline at end of file
diff --git a/Tests/PHPWord/Writer/Word2007/DocumentTest.php b/Tests/PHPWord/Writer/Word2007/DocumentTest.php
index fe854fee..5bc11b5a 100644
--- a/Tests/PHPWord/Writer/Word2007/DocumentTest.php
+++ b/Tests/PHPWord/Writer/Word2007/DocumentTest.php
@@ -84,4 +84,4 @@ class DocumentTest extends \PHPUnit_Framework_TestCase
         $element = $doc->getElement('/w:document/w:body/w:p[11]/w:r/w:object/o:OLEObject');
         $this->assertEquals('Embed', $element->getAttribute('Type'));
     }
-}
+}
\ No newline at end of file
diff --git a/Tests/_inc/TestHelperDOCX.php b/Tests/_inc/TestHelperDOCX.php
index dec1f077..ba5dcf07 100644
--- a/Tests/_inc/TestHelperDOCX.php
+++ b/Tests/_inc/TestHelperDOCX.php
@@ -5,11 +5,14 @@ use PHPWord;
 
 class TestHelperDOCX
 {
-    /** @var string $file */
-    static protected $file;
+    /**
+     * @var string
+     */
+    protected static $file;
 
     /**
      * @param \PHPWord $PHPWord
+     * @param string $writer
      * @return \PHPWord\Tests\XmlDocument
      */
     public static function getDocument(PHPWord $PHPWord, $writer = 'Word2007')
@@ -67,4 +70,4 @@ class TestHelperDOCX
     {
         return self::$file;
     }
-}
+}
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index d603eecd..23c4c4c2 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -22,6 +22,9 @@
 * @version ##VERSION##, ##DATE##
 **************************************************************************************
 
+Changes in branch for release 0.8.1 :
+- Feature:  (bskrtich, gabrielbull)             - Added fallback for computers that do not have exif_imagetype
+
 Changes in branch for release 0.8.0 :
 - Bugfix:   (gabrielbull)                       - Fixed bug with cell styling
 - Bugfix:   (gabrielbull)                       - Fixed bug list items inside of cells

From fca9e532cfc07ab0e1c58e2eec452b5d98feb702 Mon Sep 17 00:00:00 2001
From: Ivan Lanin <ivanlanin@gmail.com>
Date: Mon, 17 Mar 2014 07:26:25 +0700
Subject: [PATCH 6/6] DocBlock corrections

---
 Classes/PHPWord.php                           |  23 +--
 Classes/PHPWord/Autoloader.php                |   2 +-
 Classes/PHPWord/Exceptions/Exception.php      |  25 +++
 .../Exceptions/InvalidImageException.php      |  25 +++
 .../Exceptions/InvalidStyleException.php      |  25 +++
 .../UnsupportedImageTypeException.php         |  25 +++
 Classes/PHPWord/Footnote.php                  |   3 +-
 Classes/PHPWord/Reader/Abstract.php           |   2 +
 Classes/PHPWord/Section/Footer.php            |   3 +
 .../PHPWord/Section/Footer/PreserveText.php   |   6 +-
 Classes/PHPWord/Section/Footnote.php          |   6 +-
 Classes/PHPWord/Section/Header.php            |   3 +
 Classes/PHPWord/Section/Link.php              |   8 +-
 Classes/PHPWord/Section/ListItem.php          |   3 +-
 Classes/PHPWord/Section/Settings.php          |   8 +
 Classes/PHPWord/Section/Table.php             |   3 +-
 Classes/PHPWord/Section/Table/Cell.php        |   4 +-
 Classes/PHPWord/Section/Text.php              |   2 +
 Classes/PHPWord/Section/TextBreak.php         |   7 +-
 Classes/PHPWord/Section/TextRun.php           |  16 +-
 Classes/PHPWord/Section/Title.php             |   9 +-
 Classes/PHPWord/Shared/Font.php               |  26 ++-
 Classes/PHPWord/Shared/XMLWriter.php          |   6 +-
 Classes/PHPWord/Shared/ZipStreamWrapper.php   |  10 ++
 Classes/PHPWord/Style.php                     |  16 +-
 Classes/PHPWord/Style/Cell.php                | 128 ++++++++++++++-
 Classes/PHPWord/Style/Font.php                |   4 +
 Classes/PHPWord/Style/Image.php               |  60 +++++++
 Classes/PHPWord/Style/Paragraph.php           |  10 +-
 Classes/PHPWord/Style/Row.php                 |  25 +++
 Classes/PHPWord/Style/Table.php               |  68 +++++++-
 Classes/PHPWord/Style/TableFull.php           | 152 +++++++++++++++++-
 Classes/PHPWord/Style/Tabs.php                |   2 +
 Classes/PHPWord/TOC.php                       |   2 +
 Classes/PHPWord/Writer/IWriter.php            |   4 +-
 Classes/PHPWord/Writer/ODText.php             |  21 +--
 Classes/PHPWord/Writer/ODText/Content.php     |  20 ++-
 Classes/PHPWord/Writer/RTF.php                |  63 +++++++-
 Classes/PHPWord/Writer/Word2007.php           |  71 +++++++-
 Classes/PHPWord/Writer/Word2007/Base.php      |  12 +-
 .../PHPWord/Writer/Word2007/ContentTypes.php  |  33 ++--
 Classes/PHPWord/Writer/Word2007/DocProps.php  |  14 +-
 Classes/PHPWord/Writer/Word2007/Document.php  |  22 ++-
 .../PHPWord/Writer/Word2007/DocumentRels.php  |  23 ++-
 Classes/PHPWord/Writer/Word2007/Footer.php    |   7 +-
 Classes/PHPWord/Writer/Word2007/Footnotes.php |  10 +-
 .../PHPWord/Writer/Word2007/FootnotesRels.php |  18 ++-
 Classes/PHPWord/Writer/Word2007/Header.php    |   7 +-
 Classes/PHPWord/Writer/Word2007/Rels.php      |   6 +-
 Classes/PHPWord/Writer/Word2007/Styles.php    |  30 +++-
 .../PHPWord/Writer/Word2007/WriterPart.php    |  15 ++
 51 files changed, 984 insertions(+), 109 deletions(-)

diff --git a/Classes/PHPWord.php b/Classes/PHPWord.php
index d591b94e..e7501d85 100755
--- a/Classes/PHPWord.php
+++ b/Classes/PHPWord.php
@@ -188,8 +188,8 @@ class PHPWord
     /**
      * Adds a paragraph style definition to styles.xml
      *
-     * @param $styleName string
-     * @param $styles array
+     * @param string $styleName
+     * @param array $styles
      */
     public function addParagraphStyle($styleName, $styles)
     {
@@ -199,8 +199,9 @@ class PHPWord
     /**
      * Adds a font style definition to styles.xml
      *
-     * @param $styleName string
-     * @param $styles array
+     * @param string $styleName
+     * @param array $styleFont
+     * @param array $styleParagraph
      */
     public function addFontStyle($styleName, $styleFont, $styleParagraph = null)
     {
@@ -210,8 +211,9 @@ class PHPWord
     /**
      * Adds a table style definition to styles.xml
      *
-     * @param $styleName string
-     * @param $styles array
+     * @param string $styleName
+     * @param array $styleTable
+     * @param array $styleFirstRow
      */
     public function addTableStyle($styleName, $styleTable, $styleFirstRow = null)
     {
@@ -221,8 +223,9 @@ class PHPWord
     /**
      * Adds a heading style definition to styles.xml
      *
-     * @param $titleCount int
-     * @param $styles array
+     * @param int $titleCount
+     * @param array $styleFont
+     * @param array $styleParagraph
      */
     public function addTitleStyle($titleCount, $styleFont, $styleParagraph = null)
     {
@@ -232,8 +235,8 @@ class PHPWord
     /**
      * Adds a hyperlink style to styles.xml
      *
-     * @param $styleName string
-     * @param $styles array
+     * @param string $styleName
+     * @param array $styles
      */
     public function addLinkStyle($styleName, $styles)
     {
diff --git a/Classes/PHPWord/Autoloader.php b/Classes/PHPWord/Autoloader.php
index aa36efc8..6a915563 100755
--- a/Classes/PHPWord/Autoloader.php
+++ b/Classes/PHPWord/Autoloader.php
@@ -69,7 +69,7 @@ class PHPWord_Autoloader
     /**
      * Autoloader
      *
-     * @param string
+     * @param string $class
      */
     public static function autoload($class)
     {
diff --git a/Classes/PHPWord/Exceptions/Exception.php b/Classes/PHPWord/Exceptions/Exception.php
index 11cb0516..d00ed0a9 100755
--- a/Classes/PHPWord/Exceptions/Exception.php
+++ b/Classes/PHPWord/Exceptions/Exception.php
@@ -1,4 +1,29 @@
 <?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.8.0
+ */
 namespace PhpOffice\PhpWord\Exceptions;
 
 /**
diff --git a/Classes/PHPWord/Exceptions/InvalidImageException.php b/Classes/PHPWord/Exceptions/InvalidImageException.php
index 8b8136d3..963ff2b3 100644
--- a/Classes/PHPWord/Exceptions/InvalidImageException.php
+++ b/Classes/PHPWord/Exceptions/InvalidImageException.php
@@ -1,4 +1,29 @@
 <?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.8.0
+ */
 namespace PhpOffice\PhpWord\Exceptions;
 
 /**
diff --git a/Classes/PHPWord/Exceptions/InvalidStyleException.php b/Classes/PHPWord/Exceptions/InvalidStyleException.php
index d624c62c..6d5cacc4 100644
--- a/Classes/PHPWord/Exceptions/InvalidStyleException.php
+++ b/Classes/PHPWord/Exceptions/InvalidStyleException.php
@@ -1,4 +1,29 @@
 <?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.8.0
+ */
 namespace PhpOffice\PhpWord\Exceptions;
 
 use InvalidArgumentException;
diff --git a/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php b/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php
index 6a222940..6b86fb27 100644
--- a/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php
+++ b/Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php
@@ -1,4 +1,29 @@
 <?php
+/**
+ * PHPWord
+ *
+ * Copyright (c) 2014 PHPWord
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPWord
+ * @package    PHPWord
+ * @copyright  Copyright (c) 2014 PHPWord
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    0.8.0
+ */
 namespace PhpOffice\PhpWord\Exceptions;
 
 /**
diff --git a/Classes/PHPWord/Footnote.php b/Classes/PHPWord/Footnote.php
index 33860bbf..87a60901 100644
--- a/Classes/PHPWord/Footnote.php
+++ b/Classes/PHPWord/Footnote.php
@@ -86,8 +86,7 @@ class PHPWord_Footnote
     /**
      * Add new Footnote Link Element
      *
-     * @param string $src
-     * @param string $type
+     * @param string $linkSrc
      *
      * @return mixed
      */
diff --git a/Classes/PHPWord/Reader/Abstract.php b/Classes/PHPWord/Reader/Abstract.php
index ba7f6565..63b794f8 100644
--- a/Classes/PHPWord/Reader/Abstract.php
+++ b/Classes/PHPWord/Reader/Abstract.php
@@ -42,6 +42,8 @@ abstract class PHPWord_Reader_Abstract implements PHPWord_Reader_IReader
     protected $readDataOnly = true;
 
     /**
+     * File pointer
+     *
      * @var bool|resource
      */
     protected $fileHandle = true;
diff --git a/Classes/PHPWord/Section/Footer.php b/Classes/PHPWord/Section/Footer.php
index 238bae1b..ba9cb68c 100755
--- a/Classes/PHPWord/Section/Footer.php
+++ b/Classes/PHPWord/Section/Footer.php
@@ -54,6 +54,8 @@ class PHPWord_Section_Footer
 
     /**
      * Create a new Footer
+     *
+     * @param int $sectionCount
      */
     public function __construct($sectionCount)
     {
@@ -95,6 +97,7 @@ class PHPWord_Section_Footer
     /**
      * Create a new TextRun
      *
+     * @param null|string|array|PHPWord_Style_Paragraph $styleParagraph
      * @return PHPWord_Section_TextRun
      */
     public function createTextRun($styleParagraph = null)
diff --git a/Classes/PHPWord/Section/Footer/PreserveText.php b/Classes/PHPWord/Section/Footer/PreserveText.php
index 72443743..d0305fbc 100755
--- a/Classes/PHPWord/Section/Footer/PreserveText.php
+++ b/Classes/PHPWord/Section/Footer/PreserveText.php
@@ -56,8 +56,10 @@ class PHPWord_Section_Footer_PreserveText
     /**
      * Create a new Preserve Text Element
      *
-     * @var string $text
-     * @var mixed $style
+     * @param string $text
+     * @param mixed $styleFont
+     * @param mixed $styleParagraph
+     * @return PHPWord_Section_Footer_PreserveText
      */
     public function __construct($text = null, $styleFont = null, $styleParagraph = null)
     {
diff --git a/Classes/PHPWord/Section/Footnote.php b/Classes/PHPWord/Section/Footnote.php
index 652a3873..7e77aca4 100644
--- a/Classes/PHPWord/Section/Footnote.php
+++ b/Classes/PHPWord/Section/Footnote.php
@@ -54,6 +54,8 @@ class PHPWord_Section_Footnote
 
     /**
      * Create a new Footnote Element
+     *
+     * @param mixed $styleParagraph
      */
     public function __construct($styleParagraph = null)
     {
@@ -78,8 +80,8 @@ class PHPWord_Section_Footnote
     /**
      * Add a Text Element
      *
-     * @var string $text
-     * @var mixed $styleFont
+     * @param null|string $text
+     * @param mixed $styleFont
      * @return PHPWord_Section_Text
      */
     public function addText($text = null, $styleFont = null)
diff --git a/Classes/PHPWord/Section/Header.php b/Classes/PHPWord/Section/Header.php
index 5e1c6bfe..89672e6e 100755
--- a/Classes/PHPWord/Section/Header.php
+++ b/Classes/PHPWord/Section/Header.php
@@ -83,6 +83,8 @@ class PHPWord_Section_Header
 
     /**
      * Create a new Header
+     *
+     * @param int $sectionCount
      */
     public function __construct($sectionCount)
     {
@@ -124,6 +126,7 @@ class PHPWord_Section_Header
     /**
      * Create a new TextRun
      *
+     * @param mixed $styleParagraph
      * @return PHPWord_Section_TextRun
      */
     public function createTextRun($styleParagraph = null)
diff --git a/Classes/PHPWord/Section/Link.php b/Classes/PHPWord/Section/Link.php
index 620b08a1..26659b6f 100755
--- a/Classes/PHPWord/Section/Link.php
+++ b/Classes/PHPWord/Section/Link.php
@@ -70,10 +70,10 @@ class PHPWord_Section_Link
     /**
      * Create a new Link Element
      *
-     * @var string $linkSrc
-     * @var string $linkName
-     * @var mixed $styleFont
-     * @var mixed $styleParagraph
+     * @param string $linkSrc
+     * @param string $linkName
+     * @param mixed $styleFont
+     * @param mixed $styleParagraph
      */
     public function __construct($linkSrc, $linkName = null, $styleFont = null, $styleParagraph = null)
     {
diff --git a/Classes/PHPWord/Section/ListItem.php b/Classes/PHPWord/Section/ListItem.php
index 83384a94..7d37f3d8 100755
--- a/Classes/PHPWord/Section/ListItem.php
+++ b/Classes/PHPWord/Section/ListItem.php
@@ -58,8 +58,9 @@ class PHPWord_Section_ListItem
      *
      * @param string $text
      * @param int $depth
-     * @param mixed $styleText
+     * @param mixed $styleFont
      * @param mixed $styleList
+     * @param mixed $styleParagraph
      */
     public function __construct($text, $depth = 0, $styleFont = null, $styleList = null, $styleParagraph = null)
     {
diff --git a/Classes/PHPWord/Section/Settings.php b/Classes/PHPWord/Section/Settings.php
index 1ff3bf64..ba278410 100755
--- a/Classes/PHPWord/Section/Settings.php
+++ b/Classes/PHPWord/Section/Settings.php
@@ -158,11 +158,15 @@ class PHPWord_Section_Settings
     private $pageNumberingStart;
 
     /**
+     * Header height
+     *
      * @var int
      */
     private $headerHeight;
 
     /**
+     * Footer height
+     *
      * @var int
      */
     private $footerHeight;
@@ -594,6 +598,8 @@ class PHPWord_Section_Settings
     }
 
     /**
+     * Set page numbering start
+     *
      * @param null|int $pageNumberingStart
      * @return $this
      */
@@ -604,6 +610,8 @@ class PHPWord_Section_Settings
     }
 
     /**
+     * Get page numbering start
+     *
      * @return null|int
      */
     public function getPageNumberingStart()
diff --git a/Classes/PHPWord/Section/Table.php b/Classes/PHPWord/Section/Table.php
index f5a8a799..80126cba 100755
--- a/Classes/PHPWord/Section/Table.php
+++ b/Classes/PHPWord/Section/Table.php
@@ -99,6 +99,7 @@ class PHPWord_Section_Table
      * Add a row
      *
      * @param int $height
+     * @param mixed $style
      */
     public function addRow($height = null, $style = null)
     {
@@ -144,7 +145,7 @@ class PHPWord_Section_Table
     /**
      * Set table width
      *
-     * @var int $width
+     * @param int $width
      */
     public function setWidth($width)
     {
diff --git a/Classes/PHPWord/Section/Table/Cell.php b/Classes/PHPWord/Section/Table/Cell.php
index f8d6d340..4b620217 100755
--- a/Classes/PHPWord/Section/Table/Cell.php
+++ b/Classes/PHPWord/Section/Table/Cell.php
@@ -100,7 +100,8 @@ class PHPWord_Section_Table_Cell
      * Add a Text Element
      *
      * @param string $text
-     * @param mixed $style
+     * @param mixed $styleFont
+     * @param mixed $styleParagraph
      * @return PHPWord_Section_Text
      */
     public function addText($text, $styleFont = null, $styleParagraph = null)
@@ -299,6 +300,7 @@ class PHPWord_Section_Table_Cell
     /**
      * Create a new TextRun
      *
+     * @param mixed $styleParagraph
      * @return PHPWord_Section_TextRun
      */
     public function createTextRun($styleParagraph = null)
diff --git a/Classes/PHPWord/Section/Text.php b/Classes/PHPWord/Section/Text.php
index 8631b66e..d9062520 100755
--- a/Classes/PHPWord/Section/Text.php
+++ b/Classes/PHPWord/Section/Text.php
@@ -131,6 +131,8 @@ class PHPWord_Section_Text
     }
 
     /**
+     * Set text content
+     *
      * @param string $text
      * @return $this
      */
diff --git a/Classes/PHPWord/Section/TextBreak.php b/Classes/PHPWord/Section/TextBreak.php
index 85f53edc..859eb621 100755
--- a/Classes/PHPWord/Section/TextBreak.php
+++ b/Classes/PHPWord/Section/TextBreak.php
@@ -46,6 +46,9 @@ class PHPWord_Section_TextBreak
 
     /**
      * Create a new TextBreak Element
+     *
+     * @param mixed $fontStyle
+     * @param mixed $paragraphStyle
      */
     public function __construct($fontStyle = null, $paragraphStyle = null)
     {
@@ -60,8 +63,8 @@ class PHPWord_Section_TextBreak
     /**
      * Set Text style
      *
-     * @param null|array|\PHPWord_Style_Font $style
-     * @param null|array|\PHPWord_Style_Paragraph $paragraphStyle
+     * @param mixed $style
+     * @param mixed $paragraphStyle
      * @return PHPWord_Style_Font
      */
     public function setFontStyle($style = null, $paragraphStyle = null)
diff --git a/Classes/PHPWord/Section/TextRun.php b/Classes/PHPWord/Section/TextRun.php
index fcb2bd48..890ea45b 100755
--- a/Classes/PHPWord/Section/TextRun.php
+++ b/Classes/PHPWord/Section/TextRun.php
@@ -48,6 +48,8 @@ class PHPWord_Section_TextRun
 
     /**
      * Create a new TextRun Element
+     *
+     * @param mixed $styleParagraph
      */
     public function __construct($styleParagraph = null)
     {
@@ -72,8 +74,8 @@ class PHPWord_Section_TextRun
     /**
      * Add a Text Element
      *
-     * @var string $text
-     * @var mixed $styleFont
+     * @param string $text
+     * @param mixed $styleFont
      * @return PHPWord_Section_Text
      */
     public function addText($text = null, $styleFont = null)
@@ -113,7 +115,7 @@ class PHPWord_Section_TextRun
      * Add a Image Element
      *
      * @param string $imageSrc
-     * @param mixed $styleFont
+     * @param mixed $style
      * @return PHPWord_Section_Image
      */
     public function addImage($imageSrc, $style = null)
@@ -134,9 +136,9 @@ class PHPWord_Section_TextRun
     /**
      * Add TextBreak
      *
-     * @param   int $count
-     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
-     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
+     * @param int $count
+     * @param mixed $fontStyle
+     * @param mixed $paragraphStyle
      */
     public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
@@ -148,7 +150,7 @@ class PHPWord_Section_TextRun
     /**
      * Create a new Footnote Element
      *
-     * @param string $text
+     * @param mixed $styleParagraph
      * @return PHPWord_Section_Footnote
      */
     public function createFootnote($styleParagraph = null)
diff --git a/Classes/PHPWord/Section/Title.php b/Classes/PHPWord/Section/Title.php
index 067370f2..2cc71e11 100755
--- a/Classes/PHPWord/Section/Title.php
+++ b/Classes/PHPWord/Section/Title.php
@@ -70,8 +70,9 @@ class PHPWord_Section_Title
     /**
      * Create a new Title Element
      *
-     * @var string $text
-     * @var int $depth
+     * @param string $text
+     * @param int $depth
+     * @param mixed $style
      */
     public function __construct($text, $depth = 1, $style = null)
     {
@@ -88,7 +89,7 @@ class PHPWord_Section_Title
     /**
      * Set Anchor
      *
-     * @var int $anchor
+     * @param int $anchor
      */
     public function setAnchor($anchor)
     {
@@ -108,7 +109,7 @@ class PHPWord_Section_Title
     /**
      * Set Bookmark ID
      *
-     * @var int $bookmarkId
+     * @param int $bookmarkId
      */
     public function setBookmarkId($bookmarkId)
     {
diff --git a/Classes/PHPWord/Shared/Font.php b/Classes/PHPWord/Shared/Font.php
index 3bb783b8..9d5a42a5 100755
--- a/Classes/PHPWord/Shared/Font.php
+++ b/Classes/PHPWord/Shared/Font.php
@@ -44,8 +44,8 @@ class PHPWord_Shared_Font
     /**
      * Calculate an (approximate) pixel size, based on inch size
      *
-     * @param    int $sizeInInch Font size (in inch)
-     * @return    int        Size (in pixels)
+     * @param int $sizeInInch Font size (in inch)
+     * @return int Size (in pixels)
      */
     public static function inchSizeToPixels($sizeInInch = 1)
     {
@@ -55,24 +55,42 @@ class PHPWord_Shared_Font
     /**
      * Calculate an (approximate) pixel size, based on centimeter size
      *
-     * @param    int $sizeInCm Font size (in centimeters)
-     * @return    int        Size (in pixels)
+     * @param int $sizeInCm Font size (in centimeters)
+     * @return int Size (in pixels)
      */
     public static function centimeterSizeToPixels($sizeInCm = 1)
     {
         return ($sizeInCm * 37.795275591);
     }
 
+    /**
+     * Convert centimeter to twip
+     *
+     * @param int $sizeInCm
+     * @return int
+     */
     public static function centimeterSizeToTwips($sizeInCm = 1)
     {
         return ($sizeInCm * 565.217);
     }
 
+    /**
+     * Convert inch to twip
+     *
+     * @param int $sizeInInch
+     * @return int
+     */
     public static function inchSizeToTwips($sizeInInch = 1)
     {
         return self::centimeterSizeToTwips($sizeInInch * 2.54);
     }
 
+    /**
+     * Convert pixel to twip
+     *
+     * @param int $sizeInPixel
+     * @return int
+     */
     public static function pixelSizeToTwips($sizeInPixel = 1)
     {
         return self::centimeterSizeToTwips($sizeInPixel / 37.795275591);
diff --git a/Classes/PHPWord/Shared/XMLWriter.php b/Classes/PHPWord/Shared/XMLWriter.php
index 6e6e6360..e86749d1 100755
--- a/Classes/PHPWord/Shared/XMLWriter.php
+++ b/Classes/PHPWord/Shared/XMLWriter.php
@@ -109,7 +109,7 @@ class PHPWord_Shared_XMLWriter
     /**
      * Get written data
      *
-     * @return $data
+     * @return string XML data
      */
     public function getData()
     {
@@ -124,8 +124,8 @@ class PHPWord_Shared_XMLWriter
     /**
      * Catch function calls (and pass them to internal XMLWriter)
      *
-     * @param unknown_type $function
-     * @param unknown_type $args
+     * @param mixed $function
+     * @param mixed $args
      */
     public function __call($function, $args)
     {
diff --git a/Classes/PHPWord/Shared/ZipStreamWrapper.php b/Classes/PHPWord/Shared/ZipStreamWrapper.php
index fe4ff372..afebe7ef 100755
--- a/Classes/PHPWord/Shared/ZipStreamWrapper.php
+++ b/Classes/PHPWord/Shared/ZipStreamWrapper.php
@@ -71,6 +71,11 @@ class PHPWord_Shared_ZipStreamWrapper
 
     /**
      * Open stream
+     *
+     * @param string $path
+     * @param string $mode
+     * @param string $options
+     * @param string $opened_path
      */
     public function stream_open($path, $mode, $options, &$opened_path)
     {
@@ -119,6 +124,8 @@ class PHPWord_Shared_ZipStreamWrapper
 
     /**
      * Read stream
+     *
+     * @param int $count
      */
     public function stream_read($count)
     {
@@ -145,6 +152,9 @@ class PHPWord_Shared_ZipStreamWrapper
 
     /**
      * Seek stream
+     *
+     * @param int $offset
+     * @param mixed $whence
      */
     public function stream_seek($offset, $whence)
     {
diff --git a/Classes/PHPWord/Style.php b/Classes/PHPWord/Style.php
index 8366b658..e82728e1 100755
--- a/Classes/PHPWord/Style.php
+++ b/Classes/PHPWord/Style.php
@@ -106,7 +106,9 @@ class PHPWord_Style
      * Add a table style
      *
      * @param string $styleName
-     * @param array $styles
+     * @param array $styleTable
+     * @param null|array $styleFirstRow
+     * @param null|array $styleLastRow
      */
     public static function addTableStyle($styleName, $styleTable, $styleFirstRow = null, $styleLastRow = null)
     {
@@ -120,9 +122,9 @@ class PHPWord_Style
     /**
      * Add a title style
      *
-     * @param string $styleName
+     * @param int $titleCount
      * @param array $styleFont
-     * @param array $styleParagraph
+     * @param nullarray $styleParagraph
      */
     public static function addTitleStyle($titleCount, $styleFont, $styleParagraph = null)
     {
@@ -143,7 +145,7 @@ class PHPWord_Style
     /**
      * Set default paragraph style
      *
-     * @param   array   $styles Paragraph style definition
+     * @param array $styles Paragraph style definition
      */
     public static function setDefaultParagraphStyle($styles)
     {
@@ -153,7 +155,7 @@ class PHPWord_Style
     /**
      * Get all styles
      *
-     * @return PHPWord_Style_Font[]
+     * @return array
      */
     public static function getStyles()
     {
@@ -163,8 +165,8 @@ class PHPWord_Style
     /**
      * Get style
      *
-     * @param string
-     * @return PHPWord_Style
+     * @param string $styleName
+     * @return null|PHPWord_Style
      */
     public static function getStyle($styleName)
     {
diff --git a/Classes/PHPWord/Style/Cell.php b/Classes/PHPWord/Style/Cell.php
index b07eb4c2..2f733784 100755
--- a/Classes/PHPWord/Style/Cell.php
+++ b/Classes/PHPWord/Style/Cell.php
@@ -157,8 +157,8 @@ class PHPWord_Style_Cell
     /**
      * Set style value
      *
-     * @var string $key
-     * @var mixed $value
+     * @param string $key
+     * @param mixed $value
      */
     public function setStyleValue($key, $value)
     {
@@ -171,36 +171,65 @@ class PHPWord_Style_Cell
         }
     }
 
+    /**
+     * Get vertical align
+     */
     public function getVAlign()
     {
         return $this->_valign;
     }
 
+    /**
+     * Set vertical align
+     *
+     * @param string $pValue
+     */
     public function setVAlign($pValue = null)
     {
         $this->_valign = $pValue;
     }
 
+    /**
+     * Get text direction
+     */
     public function getTextDirection()
     {
         return $this->_textDirection;
     }
 
+    /**
+     * Set text direction
+     *
+     * @param string $pValue
+     */
     public function setTextDirection($pValue = null)
     {
         $this->_textDirection = $pValue;
     }
 
+    /**
+     * Get background color
+     */
     public function getBgColor()
     {
         return $this->_bgColor;
     }
 
+    /**
+     * Set background color
+     *
+     * @param string $pValue
+     */
     public function setBgColor($pValue = null)
     {
         $this->_bgColor = $pValue;
     }
 
+    /**
+     * Set border size
+     *
+     * @param int $pValue
+     */
     public function setBorderSize($pValue = null)
     {
         $this->_borderTopSize = $pValue;
@@ -209,6 +238,9 @@ class PHPWord_Style_Cell
         $this->_borderBottomSize = $pValue;
     }
 
+    /**
+     * Get border size
+     */
     public function getBorderSize()
     {
         $t = $this->getBorderTopSize();
@@ -219,6 +251,11 @@ class PHPWord_Style_Cell
         return array($t, $l, $r, $b);
     }
 
+    /**
+     * Set border color
+     *
+     * @param string $pValue
+     */
     public function setBorderColor($pValue = null)
     {
         $this->_borderTopColor = $pValue;
@@ -227,6 +264,9 @@ class PHPWord_Style_Cell
         $this->_borderBottomColor = $pValue;
     }
 
+    /**
+     * Get border color
+     */
     public function getBorderColor()
     {
         $t = $this->getBorderTopColor();
@@ -237,107 +277,189 @@ class PHPWord_Style_Cell
         return array($t, $l, $r, $b);
     }
 
+    /**
+     * Set border top size
+     *
+     * @param int $pValue
+     */
     public function setBorderTopSize($pValue = null)
     {
         $this->_borderTopSize = $pValue;
     }
 
+    /**
+     * Get border top size
+     */
     public function getBorderTopSize()
     {
         return $this->_borderTopSize;
     }
 
+    /**
+     * Set border top color
+     *
+     * @param string $pValue
+     */
     public function setBorderTopColor($pValue = null)
     {
         $this->_borderTopColor = $pValue;
     }
 
+    /**
+     * Get border top color
+     */
     public function getBorderTopColor()
     {
         return $this->_borderTopColor;
     }
 
+    /**
+     * Set border left size
+     *
+     * @param int $pValue
+     */
     public function setBorderLeftSize($pValue = null)
     {
         $this->_borderLeftSize = $pValue;
     }
 
+    /**
+     * Get border left size
+     */
     public function getBorderLeftSize()
     {
         return $this->_borderLeftSize;
     }
 
+    /**
+     * Set border left color
+     *
+     * @param string $pValue
+     */
     public function setBorderLeftColor($pValue = null)
     {
         $this->_borderLeftColor = $pValue;
     }
 
+    /**
+     * Get border left color
+     */
     public function getBorderLeftColor()
     {
         return $this->_borderLeftColor;
     }
 
+    /**
+     * Set border right size
+     *
+     * @param int $pValue
+     */
     public function setBorderRightSize($pValue = null)
     {
         $this->_borderRightSize = $pValue;
     }
 
+    /**
+     * Get border right size
+     */
     public function getBorderRightSize()
     {
         return $this->_borderRightSize;
     }
 
+    /**
+     * Set border right color
+     *
+     * @param string $pValue
+     */
     public function setBorderRightColor($pValue = null)
     {
         $this->_borderRightColor = $pValue;
     }
 
+    /**
+     * Get border right color
+     */
     public function getBorderRightColor()
     {
         return $this->_borderRightColor;
     }
 
-
+    /**
+     * Set border bottom size
+     *
+     * @param int $pValue
+     */
     public function setBorderBottomSize($pValue = null)
     {
         $this->_borderBottomSize = $pValue;
     }
 
+    /**
+     * Get border bottom size
+     */
     public function getBorderBottomSize()
     {
         return $this->_borderBottomSize;
     }
 
+    /**
+     * Set border bottom color
+     *
+     * @param string $pValue
+     */
     public function setBorderBottomColor($pValue = null)
     {
         $this->_borderBottomColor = $pValue;
     }
 
+    /**
+     * Get border bottom color
+     */
     public function getBorderBottomColor()
     {
         return $this->_borderBottomColor;
     }
 
+    /**
+     * Get default border color
+     */
     public function getDefaultBorderColor()
     {
         return $this->_defaultBorderColor;
     }
 
+    /**
+     * Set grid span (colspan)
+     *
+     * @param int $pValue
+     */
     public function setGridSpan($pValue = null)
     {
         $this->_gridSpan = $pValue;
     }
 
+    /**
+     * Get grid span (colspan)
+     */
     public function getGridSpan()
     {
         return $this->_gridSpan;
     }
 
+    /**
+     * Set vertical merge (rowspan)
+     *
+     * @param string $pValue
+     */
     public function setVMerge($pValue = null)
     {
         $this->_vMerge = $pValue;
     }
 
+    /**
+     * Get vertical merge (rowspan)
+     */
     public function getVMerge()
     {
         return $this->_vMerge;
diff --git a/Classes/PHPWord/Style/Font.php b/Classes/PHPWord/Style/Font.php
index f26f3924..2aa6cbc6 100755
--- a/Classes/PHPWord/Style/Font.php
+++ b/Classes/PHPWord/Style/Font.php
@@ -185,6 +185,8 @@ class PHPWord_Style_Font
     }
 
     /**
+     * Set style using associative array
+     *
      * @param array $style
      * @return $this
      */
@@ -510,6 +512,8 @@ class PHPWord_Style_Font
     }
 
     /**
+     * Get line height
+     *
      * @return int|float
      */
     public function getLineHeight()
diff --git a/Classes/PHPWord/Style/Image.php b/Classes/PHPWord/Style/Image.php
index 9bec4d5b..a6a128c9 100755
--- a/Classes/PHPWord/Style/Image.php
+++ b/Classes/PHPWord/Style/Image.php
@@ -36,9 +36,32 @@ class PHPWord_Style_Image
     const WRAPPING_STYLE_BEHIND = 'behind';
     const WRAPPING_STYLE_INFRONT = 'infront';
 
+    /**
+     * Image width
+     *
+     * @var int
+     */
     private $_width;
+
+    /**
+     * Image width
+     *
+     * @var int
+     */
     private $_height;
+
+    /**
+     * Alignment
+     *
+     * @var string
+     */
     private $_align;
+
+    /**
+     * Wrapping style
+     *
+     * @var string
+     */
     private $wrappingStyle;
 
     /**
@@ -55,6 +78,9 @@ class PHPWord_Style_Image
      */
     private $_marginLeft;
 
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         $this->_width = null;
@@ -65,36 +91,66 @@ class PHPWord_Style_Image
         $this->setWrappingStyle(self::WRAPPING_STYLE_INLINE);
     }
 
+    /**
+     * Set style value
+     *
+     * @param string $key
+     * @param mixed $value
+     */
     public function setStyleValue($key, $value)
     {
         $this->$key = $value;
     }
 
+    /**
+     * Get width
+     */
     public function getWidth()
     {
         return $this->_width;
     }
 
+    /**
+     * Set width
+     *
+     * @param int $pValue
+     */
     public function setWidth($pValue = null)
     {
         $this->_width = $pValue;
     }
 
+    /**
+     * Get height
+     */
     public function getHeight()
     {
         return $this->_height;
     }
 
+    /**
+     * Set height
+     *
+     * @param int $pValue
+     */
     public function setHeight($pValue = null)
     {
         $this->_height = $pValue;
     }
 
+    /**
+     * Get alignment
+     */
     public function getAlign()
     {
         return $this->_align;
     }
 
+    /**
+     * Set alignment
+     *
+     * @param string $pValue
+     */
     public function setAlign($pValue = null)
     {
         $this->_align = $pValue;
@@ -145,6 +201,8 @@ class PHPWord_Style_Image
     }
 
     /**
+     * Set wrapping style
+     *
      * @param string $wrappingStyle
      * @throws InvalidArgumentException
      * @return $this
@@ -167,6 +225,8 @@ class PHPWord_Style_Image
     }
 
     /**
+     * Get wrapping style
+     *
      * @return string
      */
     public function getWrappingStyle()
diff --git a/Classes/PHPWord/Style/Paragraph.php b/Classes/PHPWord/Style/Paragraph.php
index 32a44929..14e1f8e0 100755
--- a/Classes/PHPWord/Style/Paragraph.php
+++ b/Classes/PHPWord/Style/Paragraph.php
@@ -133,6 +133,8 @@ class PHPWord_Style_Paragraph
     private $_pageBreakBefore = false;
 
     /**
+     * Set style using associative array
+     *
      * @param array $style
      * @return $this
      */
@@ -319,11 +321,11 @@ class PHPWord_Style_Paragraph
         return $this->_tabs;
     }
 
-    /*
+    /**
      * Set tabs
      *
-     * @param   array   $pValue
-     * @return  PHPWord_Style_Paragraph
+     * @param array $pValue
+     * @return PHPWord_Style_Paragraph
      */
     public function setTabs($pValue = null)
     {
@@ -500,6 +502,8 @@ class PHPWord_Style_Paragraph
     }
 
     /**
+     * Get line height
+     *
      * @return int|float
      */
     public function getLineHeight()
diff --git a/Classes/PHPWord/Style/Row.php b/Classes/PHPWord/Style/Row.php
index 93b5f862..da039d84 100644
--- a/Classes/PHPWord/Style/Row.php
+++ b/Classes/PHPWord/Style/Row.php
@@ -54,12 +54,21 @@ class PHPWord_Style_Row
 
     /**
      * Set style value
+     *
+     * @param string $key
+     * @param mixed $value
      */
     public function setStyleValue($key, $value)
     {
         $this->$key = $value;
     }
 
+    /**
+     * Set tblHeader
+     *
+     * @param boolean $pValue
+     * @return PHPWord_Style_Row
+     */
     public function setTblHeader($pValue = false)
     {
         if (!is_bool($pValue)) {
@@ -69,11 +78,22 @@ class PHPWord_Style_Row
         return $this;
     }
 
+    /**
+     * Get tblHeader
+     *
+     * @return boolean
+     */
     public function getTblHeader()
     {
         return $this->_tblHeader;
     }
 
+    /**
+     * Set cantSplit
+     *
+     * @param boolean $pValue
+     * @return PHPWord_Style_Row
+     */
     public function setCantSplit($pValue = false)
     {
         if (!is_bool($pValue)) {
@@ -83,6 +103,11 @@ class PHPWord_Style_Row
         return $this;
     }
 
+    /**
+     * Get cantSplit
+     *
+     * @return boolean
+     */
     public function getCantSplit()
     {
         return $this->_cantSplit;
diff --git a/Classes/PHPWord/Style/Table.php b/Classes/PHPWord/Style/Table.php
index c3ef2e01..223e31c2 100755
--- a/Classes/PHPWord/Style/Table.php
+++ b/Classes/PHPWord/Style/Table.php
@@ -30,12 +30,37 @@
  */
 class PHPWord_Style_Table
 {
-
+    /**
+     * Cell margin top
+     *
+     * @var int
+     */
     private $_cellMarginTop;
+
+    /**
+     * Cell margin left
+     *
+     * @var int
+     */
     private $_cellMarginLeft;
+
+    /**
+     * Cell margin right
+     *
+     * @var int
+     */
     private $_cellMarginRight;
+
+    /**
+     * Cell margin bottom
+     *
+     * @var int
+     */
     private $_cellMarginBottom;
 
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         $this->_cellMarginTop = null;
@@ -44,51 +69,92 @@ class PHPWord_Style_Table
         $this->_cellMarginBottom = null;
     }
 
+    /**
+     * Set style value
+     *
+     * @param string $key
+     * @param mixed $value
+     */
     public function setStyleValue($key, $value)
     {
         $this->$key = $value;
     }
 
+    /**
+     * Set cell margin top
+     *
+     * @param int $pValue
+     */
     public function setCellMarginTop($pValue = null)
     {
         $this->_cellMarginTop = $pValue;
     }
 
+    /**
+     * Get cell margin top
+     */
     public function getCellMarginTop()
     {
         return $this->_cellMarginTop;
     }
 
+    /**
+     * Set cell margin left
+     *
+     * @param int $pValue
+     */
     public function setCellMarginLeft($pValue = null)
     {
         $this->_cellMarginLeft = $pValue;
     }
 
+    /**
+     * Get cell margin left
+     */
     public function getCellMarginLeft()
     {
         return $this->_cellMarginLeft;
     }
 
+    /**
+     * Set cell margin right
+     *
+     * @param int $pValue
+     */
     public function setCellMarginRight($pValue = null)
     {
         $this->_cellMarginRight = $pValue;
     }
 
+    /**
+     * Get cell margin right
+     */
     public function getCellMarginRight()
     {
         return $this->_cellMarginRight;
     }
 
+    /**
+     * Set cell margin bottom
+     *
+     * @param int $pValue
+     */
     public function setCellMarginBottom($pValue = null)
     {
         $this->_cellMarginBottom = $pValue;
     }
 
+    /**
+     * Get cell margin bottom
+     */
     public function getCellMarginBottom()
     {
         return $this->_cellMarginBottom;
     }
 
+    /**
+     * Get cell margin
+     */
     public function getCellMargin()
     {
         return array($this->_cellMarginTop, $this->_cellMarginLeft, $this->_cellMarginRight, $this->_cellMarginBottom);
diff --git a/Classes/PHPWord/Style/TableFull.php b/Classes/PHPWord/Style/TableFull.php
index 573ae53b..8d145366 100755
--- a/Classes/PHPWord/Style/TableFull.php
+++ b/Classes/PHPWord/Style/TableFull.php
@@ -30,7 +30,6 @@
  */
 class PHPWord_Style_TableFull
 {
-
     /**
      * Style for first row
      *
@@ -160,6 +159,10 @@ class PHPWord_Style_TableFull
 
     /**
      * Create a new TableFull Font
+     *
+     * @param null|array $styleTable
+     * @param null|array $styleFirstRow
+     * @param null|array $styleLastRow
      */
     public function __construct($styleTable = null, $styleFirstRow = null, $styleLastRow = null)
     {
@@ -234,11 +237,19 @@ class PHPWord_Style_TableFull
         return $this->_lastRow;
     }
 
+    /**
+     * Get background color
+     */
     public function getBgColor()
     {
         return $this->_bgColor;
     }
 
+    /**
+     * Set background color
+     *
+     * @param string $pValue
+     */
     public function setBgColor($pValue = null)
     {
         $this->_bgColor = $pValue;
@@ -247,7 +258,7 @@ class PHPWord_Style_TableFull
     /**
      * Set TLRBVH Border Size
      *
-     * @param   int     $pValue Border size in eighths of a point (1/8 point)
+     * @param int $pValue Border size in eighths of a point (1/8 point)
      */
     public function setBorderSize($pValue = null)
     {
@@ -278,6 +289,8 @@ class PHPWord_Style_TableFull
 
     /**
      * Set TLRBVH Border Color
+     *
+     * @param string $pValue
      */
     public function setBorderColor($pValue = null)
     {
@@ -306,161 +319,293 @@ class PHPWord_Style_TableFull
         return array($t, $l, $r, $b, $h, $v);
     }
 
+    /**
+     * Set border top size
+     *
+     * @param int $pValue
+     */
     public function setBorderTopSize($pValue = null)
     {
         $this->_borderTopSize = $pValue;
     }
 
+    /**
+     * Get border top size
+     */
     public function getBorderTopSize()
     {
         return $this->_borderTopSize;
     }
 
+    /**
+     * Set border top color
+     *
+     * @param string $pValue
+     */
     public function setBorderTopColor($pValue = null)
     {
         $this->_borderTopColor = $pValue;
     }
 
+    /**
+     * Get border top color
+     */
     public function getBorderTopColor()
     {
         return $this->_borderTopColor;
     }
 
+    /**
+     * Set border left size
+     *
+     * @param int $pValue
+     */
     public function setBorderLeftSize($pValue = null)
     {
         $this->_borderLeftSize = $pValue;
     }
 
+    /**
+     * Get border left size
+     */
     public function getBorderLeftSize()
     {
         return $this->_borderLeftSize;
     }
 
+    /**
+     * Set border left color
+     *
+     * @param string $pValue
+     */
     public function setBorderLeftColor($pValue = null)
     {
         $this->_borderLeftColor = $pValue;
     }
 
+    /**
+     * Get border left color
+     */
     public function getBorderLeftColor()
     {
         return $this->_borderLeftColor;
     }
 
+    /**
+     * Set border right size
+     *
+     * @param int $pValue
+     */
     public function setBorderRightSize($pValue = null)
     {
         $this->_borderRightSize = $pValue;
     }
 
+    /**
+     * Get border right size
+     *
+     * @param int $pValue
+     */
     public function getBorderRightSize()
     {
         return $this->_borderRightSize;
     }
 
+    /**
+     * Set border right color
+     *
+     * @param string $pValue
+     */
     public function setBorderRightColor($pValue = null)
     {
         $this->_borderRightColor = $pValue;
     }
 
+    /**
+     * Get border right color
+     */
     public function getBorderRightColor()
     {
         return $this->_borderRightColor;
     }
 
+    /**
+     * Set border bottom size
+     *
+     *
+     * @param string $pValue
+     * @param int $pValue
+     */
     public function setBorderBottomSize($pValue = null)
     {
         $this->_borderBottomSize = $pValue;
     }
 
+    /**
+     * Get border bottom size
+     */
     public function getBorderBottomSize()
     {
         return $this->_borderBottomSize;
     }
 
+    /**
+     * Set border bottom color
+     *
+     * @param string $pValue
+     */
     public function setBorderBottomColor($pValue = null)
     {
         $this->_borderBottomColor = $pValue;
     }
 
+    /**
+     * Get border bottom color
+     */
     public function getBorderBottomColor()
     {
         return $this->_borderBottomColor;
     }
 
+    /**
+     * Set border inside horizontal color
+     *
+     * @param string $pValue
+     */
     public function setBorderInsideHColor($pValue = null)
     {
         $this->_borderInsideHColor = $pValue;
     }
 
+    /**
+     * Get border inside horizontal color
+     */
     public function getBorderInsideHColor()
     {
         return (isset($this->_borderInsideHColor)) ? $this->_borderInsideHColor : null;
     }
 
+    /**
+     * Set border inside vertical color
+     *
+     * @param string $pValue
+     */
     public function setBorderInsideVColor($pValue = null)
     {
         $this->_borderInsideVColor = $pValue;
     }
 
+    /**
+     * Get border inside vertical color
+     */
     public function getBorderInsideVColor()
     {
         return (isset($this->_borderInsideVColor)) ? $this->_borderInsideVColor : null;
     }
 
+    /**
+     * Set border inside horizontal size
+     *
+     * @param int $pValue
+     */
     public function setBorderInsideHSize($pValue = null)
     {
         $this->_borderInsideHSize = $pValue;
     }
 
+    /**
+     * Get border inside horizontal size
+     */
     public function getBorderInsideHSize()
     {
         return (isset($this->_borderInsideHSize)) ? $this->_borderInsideHSize : null;
     }
 
+    /**
+     * Set border inside vertical size
+     *
+     * @param int $pValue
+     */
     public function setBorderInsideVSize($pValue = null)
     {
         $this->_borderInsideVSize = $pValue;
     }
 
+    /**
+     * Get border inside vertical size
+     */
     public function getBorderInsideVSize()
     {
         return (isset($this->_borderInsideVSize)) ? $this->_borderInsideVSize : null;
     }
 
+    /**
+     * Set cell margin top
+     *
+     * @param int $pValue
+     */
     public function setCellMarginTop($pValue = null)
     {
         $this->_cellMarginTop = $pValue;
     }
 
+    /**
+     * Get cell margin top
+     */
     public function getCellMarginTop()
     {
         return $this->_cellMarginTop;
     }
 
+    /**
+     * Set cell margin left
+     *
+     * @param int $pValue
+     */
     public function setCellMarginLeft($pValue = null)
     {
         $this->_cellMarginLeft = $pValue;
     }
 
+    /**
+     * Get cell margin left
+     */
     public function getCellMarginLeft()
     {
         return $this->_cellMarginLeft;
     }
 
+    /**
+     * Set cell margin right
+     *
+     * @param int $pValue
+     */
     public function setCellMarginRight($pValue = null)
     {
         $this->_cellMarginRight = $pValue;
     }
 
+    /**
+     * Get cell margin right
+     */
     public function getCellMarginRight()
     {
         return $this->_cellMarginRight;
     }
 
+    /**
+     * Set cell margin bottom
+     *
+     * @param int $pValue
+     */
     public function setCellMarginBottom($pValue = null)
     {
         $this->_cellMarginBottom = $pValue;
     }
 
+    /**
+     * Get cell margin bottom
+     */
     public function getCellMarginBottom()
     {
         return $this->_cellMarginBottom;
@@ -479,6 +624,9 @@ class PHPWord_Style_TableFull
         $this->_cellMarginBottom = $pValue;
     }
 
+    /**
+     * Get cell margin
+     */
     public function getCellMargin()
     {
         return array($this->_cellMarginTop, $this->_cellMarginLeft, $this->_cellMarginRight, $this->_cellMarginBottom);
diff --git a/Classes/PHPWord/Style/Tabs.php b/Classes/PHPWord/Style/Tabs.php
index a5e1a8bb..ece1315f 100755
--- a/Classes/PHPWord/Style/Tabs.php
+++ b/Classes/PHPWord/Style/Tabs.php
@@ -39,6 +39,7 @@ class PHPWord_Style_Tabs
     private $_tabs;
 
     /**
+     * Constructor
      *
      * @param array $tabs
      */
@@ -48,6 +49,7 @@ class PHPWord_Style_Tabs
     }
 
     /**
+     * Convert to XML
      *
      * @param PHPWord_Shared_XMLWriter $objWriter
      */
diff --git a/Classes/PHPWord/TOC.php b/Classes/PHPWord/TOC.php
index c81fca22..499fdd64 100755
--- a/Classes/PHPWord/TOC.php
+++ b/Classes/PHPWord/TOC.php
@@ -105,6 +105,8 @@ class PHPWord_TOC
     /**
      * Add a Title
      *
+     * @param string $text
+     * @param int $depth
      * @return array
      */
     public static function addTitle($text, $depth = 0)
diff --git a/Classes/PHPWord/Writer/IWriter.php b/Classes/PHPWord/Writer/IWriter.php
index f5ca8299..d00d2d40 100755
--- a/Classes/PHPWord/Writer/IWriter.php
+++ b/Classes/PHPWord/Writer/IWriter.php
@@ -33,8 +33,8 @@ interface PHPWord_Writer_IWriter
     /**
      * Save PHPWord to file
      *
-     * @param     string $pFileName
-     * @throws     Exception
+     * @param string $pFilename
+     * @throws Exception
      */
     public function save($pFilename = null);
 }
diff --git a/Classes/PHPWord/Writer/ODText.php b/Classes/PHPWord/Writer/ODText.php
index 7d8c2e4b..e8ab61ee 100755
--- a/Classes/PHPWord/Writer/ODText.php
+++ b/Classes/PHPWord/Writer/ODText.php
@@ -68,7 +68,7 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
     /**
      * Create a new PHPWord_Writer_ODText
      *
-     * @param    PHPWord $pPHPWord
+     * @param PHPWord $pPHPWord
      */
     public function __construct(PHPWord $pPHPWord = null)
     {
@@ -98,8 +98,8 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
     /**
      * Save PHPWord to file
      *
-     * @param    string $pFileName
-     * @throws    Exception
+     * @param string $pFilename
+     * @throws Exception
      */
     public function save($pFilename = null)
     {
@@ -212,8 +212,8 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
     /**
      * Get PHPWord object
      *
-     * @param    PHPWord $pPHPWord PHPWord object
-     * @throws    Exception
+     * @param PHPWord $pPHPWord PHPWord object
+     * @throws Exception
      * @return PHPWord_Writer_ODText
      */
     public function setPHPWord(PHPWord $pPHPWord = null)
@@ -226,6 +226,7 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
      * Get PHPWord_Worksheet_BaseDrawing HashTable
      *
      * @return PHPWord_HashTable
+     * @codeCoverageIgnore
      */
     public function getDrawingHashTable()
     {
@@ -235,8 +236,8 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
     /**
      * Get writer part
      *
-     * @param    string $pPartName Writer part name
-     * @return    PHPWord_Writer_ODText_WriterPart
+     * @param string $pPartName Writer part name
+     * @return PHPWord_Writer_ODText_WriterPart
      */
     public function getWriterPart($pPartName = '')
     {
@@ -260,9 +261,9 @@ class PHPWord_Writer_ODText implements PHPWord_Writer_IWriter
     /**
      * Set use disk caching where possible?
      *
-     * @param    boolean $pValue
-     * @param    string $pDirectory Disk caching directory
-     * @throws    Exception    Exception when directory does not exist
+     * @param boolean $pValue
+     * @param string $pDirectory Disk caching directory
+     * @throws Exception    Exception when directory does not exist
      * @return PHPWord_Writer_ODText
      */
     public function setUseDiskCaching($pValue = false, $pDirectory = null)
diff --git a/Classes/PHPWord/Writer/ODText/Content.php b/Classes/PHPWord/Writer/ODText/Content.php
index 316e56fc..772e5408 100755
--- a/Classes/PHPWord/Writer/ODText/Content.php
+++ b/Classes/PHPWord/Writer/ODText/Content.php
@@ -344,9 +344,9 @@ class PHPWord_Writer_ODText_Content extends PHPWord_Writer_ODText_WriterPart
     /**
      * Write TextRun section
      *
-     * @param   PHPWord_Shared_XMLWriter    $objWriter
-     * @param   PHPWord_Section_TextRun     $textrun
-     * @todo    Enable all other section types
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param PHPWord_Section_TextRun $textrun
+     * @todo Enable all other section types
      */
     protected function _writeTextRun(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_TextRun $textrun)
     {
@@ -364,6 +364,8 @@ class PHPWord_Writer_ODText_Content extends PHPWord_Writer_ODText_WriterPart
 
     /**
      * Write TextBreak
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
      */
     protected function _writeTextBreak(PHPWord_Shared_XMLWriter $objWriter = null)
     {
@@ -373,10 +375,22 @@ class PHPWord_Writer_ODText_Content extends PHPWord_Writer_ODText_WriterPart
     }
 
     // @codeCoverageIgnoreStart
+    /**
+     * Write end section
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param PHPWord_Section $section
+     */
     private function _writeEndSection(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section $section = null)
     {
     }
 
+    /**
+     * Write section
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param PHPWord_Section $section
+     */
     private function _writeSection(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section $section = null)
     {
     }
diff --git a/Classes/PHPWord/Writer/RTF.php b/Classes/PHPWord/Writer/RTF.php
index a090fb17..03aee542 100755
--- a/Classes/PHPWord/Writer/RTF.php
+++ b/Classes/PHPWord/Writer/RTF.php
@@ -44,14 +44,31 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
      */
     private $_drawingHashTable;
 
+    /**
+     * Color table
+     *
+     * @var array
+     */
     private $_colorTable;
+
+    /**
+     * Font table
+     *
+     * @var array
+     */
     private $_fontTable;
+
+    /**
+     * Last paragraph style
+     *
+     * @var PHPWord_Style_Paragraph
+     */
     private $_lastParagraphStyle;
 
     /**
      * Create a new PHPWord_Writer_ODText
      *
-     * @param    PHPWord $pPHPWord
+     * @param PHPWord $pPHPWord
      */
     public function __construct(PHPWord $pPHPWord = null)
     {
@@ -65,8 +82,8 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
     /**
      * Save PHPWord to file
      *
-     * @param    string $pFileName
-     * @throws    Exception
+     * @param string $pFilename
+     * @throws Exception
      */
     public function save($pFilename = null)
     {
@@ -115,8 +132,8 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
     /**
      * Get PHPWord object
      *
-     * @param    PHPWord $pPHPWord PHPWord object
-     * @throws    Exception
+     * @param PHPWord $pPHPWord PHPWord object
+     * @throws Exception
      * @return PHPWord_Writer_RTF
      */
     public function setPHPWord(PHPWord $pPHPWord = null)
@@ -129,12 +146,18 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
      * Get PHPWord_Worksheet_BaseDrawing HashTable
      *
      * @return PHPWord_HashTable
+     * @codeCoverageIgnore
      */
     public function getDrawingHashTable()
     {
         return $this->_drawingHashTable;
     }
 
+    /**
+     * Get document data
+     *
+     * @return string
+     */
     private function getData()
     {
         // PHPWord object : $this->_document
@@ -188,6 +211,11 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
         return $sRTFContent;
     }
 
+    /**
+     * Get font table
+     *
+     * @return array
+     */
     private function getDataFont()
     {
         $pPHPWord = $this->_document;
@@ -238,6 +266,11 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
         return $arrFonts;
     }
 
+    /**
+     * Get color tables
+     *
+     * @return array
+     */
     private function getDataColor()
     {
         $pPHPWord = $this->_document;
@@ -294,6 +327,11 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
         return $arrColors;
     }
 
+    /**
+     * Get content
+     *
+     * @return string
+     */
     private function getDataContent()
     {
         $pPHPWord = $this->_document;
@@ -342,6 +380,10 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
 
     /**
      * Get text
+     *
+     * @param PHPWord_Section_Text $text
+     * @param boolean $withoutP
+     * @return string
      */
     private function getDataContentText(PHPWord_Section_Text $text, $withoutP = false)
     {
@@ -428,11 +470,15 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
         if (!$withoutP) {
             $sRTFText .= '\par' . PHP_EOL;
         }
+
         return $sRTFText;
     }
 
     /**
      * Get text run content
+     *
+     * @param PHPWord_Section_TextRun $textrun
+     * @return string
      */
     private function getDataContentTextRun(PHPWord_Section_TextRun $textrun)
     {
@@ -449,9 +495,15 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
             }
             $sRTFText .= '\par' . PHP_EOL;
         }
+
         return $sRTFText;
     }
 
+    /**
+     * Get text break
+     *
+     * @return string
+     */
     private function getDataContentTextBreak()
     {
         $this->_lastParagraphStyle = '';
@@ -463,6 +515,7 @@ class PHPWord_Writer_RTF implements PHPWord_Writer_IWriter
      * Write unsupported element
      *
      * @param   string  $element
+     * @return string
      */
     private function getDataContentUnsupportedElement($element)
     {
diff --git a/Classes/PHPWord/Writer/Word2007.php b/Classes/PHPWord/Writer/Word2007.php
index 989fa93f..16d66c66 100755
--- a/Classes/PHPWord/Writer/Word2007.php
+++ b/Classes/PHPWord/Writer/Word2007.php
@@ -24,7 +24,6 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    0.8.0
  */
-
 use PhpOffice\PhpWord\Exceptions\InvalidImageException;
 use PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException;
 
@@ -33,15 +32,54 @@ use PhpOffice\PhpWord\Exceptions\UnsupportedImageTypeException;
  */
 class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
 {
-
+    /**
+     * PHPWord object
+     *
+     * @var PHPWord
+     */
     private $_document;
+
+    /**
+     * Writer parts
+     *
+     * @var array
+     */
     private $_writerParts;
+
+    /**
+     * Directory for caching
+     *
+     * @var string
+     */
     private $_diskCachingDirectory;
+
+    /**
+     * Use disk caching
+     *
+     * @var boolean
+     */
     private $_useDiskCaching = false;
+
+    /**
+     * Image types
+     *
+     * @var array
+     */
     private $_imageTypes = array();
+
+    /**
+     * Object types
+     *
+     * @var array
+     */
     private $_objectTypes = array();
 
-    public function __construct(PHPWord $PHPWord = null)
+    /**
+     * Constructor
+     *
+     * @param PHPWord $PHPWord
+     */
+   public function __construct(PHPWord $PHPWord = null)
     {
         $this->_document = $PHPWord;
 
@@ -63,6 +101,11 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         }
     }
 
+    /**
+     * Save
+     *
+     * @param string $pFilename
+     */
     public function save($pFilename = null)
     {
         if (!is_null($this->_document)) {
@@ -204,6 +247,8 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
     }
 
     /**
+     * Check content types
+     *
      * @param string $src
      */
     private function checkContentTypes($src)
@@ -230,6 +275,11 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         }
     }
 
+    /**
+     * Get writer part
+     *
+     * @param string $pPartName
+     */
     public function getWriterPart($pPartName = '')
     {
         if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) {
@@ -239,11 +289,20 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         }
     }
 
+    /**
+     * Get use disk catching setting
+     */
     public function getUseDiskCaching()
     {
         return $this->_useDiskCaching;
     }
 
+    /**
+     * Set use disk catching setting
+     *
+     * @param boolean $pValue
+     * @param string $pDirectory
+     */
     public function setUseDiskCaching($pValue = false, $pDirectory = null)
     {
         $this->_useDiskCaching = $pValue;
@@ -259,6 +318,12 @@ class PHPWord_Writer_Word2007 implements PHPWord_Writer_IWriter
         return $this;
     }
 
+    /**
+     * Add file to package
+     *
+     * @param mixed $objZip
+     * @param array $element
+     */
     private function _addFileToPackage($objZip, $element)
     {
         if (isset($element['isMemImage']) && $element['isMemImage']) {
diff --git a/Classes/PHPWord/Writer/Word2007/Base.php b/Classes/PHPWord/Writer/Word2007/Base.php
index e9249120..d829bf92 100755
--- a/Classes/PHPWord/Writer/Word2007/Base.php
+++ b/Classes/PHPWord/Writer/Word2007/Base.php
@@ -31,9 +31,10 @@
  */
 class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
 {
-
     /**
      * Write text
+     *
+     * @param boolean $withoutP
      */
     protected function _writeText(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_Text $text, $withoutP = false)
     {
@@ -232,6 +233,8 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
 
     /**
      * Write link
+     *
+     * @param boolean $withoutP
      */
     protected function _writeLink(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_Link $link, $withoutP = false)
     {
@@ -791,8 +794,11 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
     }
 
     /**
+     * Write image
+     *
      * @param \PHPWord_Shared_XMLWriter $objWriter
      * @param \PHPWord_Section_Image|\PHPWord_Section_MemoryImage $image
+     * @param boolean $withoutP
      */
     protected function _writeImage(PHPWord_Shared_XMLWriter $objWriter = null, $image, $withoutP = false)
     {
@@ -873,6 +879,8 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
 
     /**
      * Write watermark
+     *
+     * @param PHP_Section_Image|PHP_Section_MemoryImage $image
      */
     protected function _writeWatermark(PHPWord_Shared_XMLWriter $objWriter = null, $image)
     {
@@ -1003,6 +1011,8 @@ class PHPWord_Writer_Word2007_Base extends PHPWord_Writer_Word2007_WriterPart
 
     /**
      * Write footnote reference
+     *
+     * @param boolean $withoutP
      */
     protected function _writeFootnoteReference(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_Footnote $footnote, $withoutP = false)
     {
diff --git a/Classes/PHPWord/Writer/Word2007/ContentTypes.php b/Classes/PHPWord/Writer/Word2007/ContentTypes.php
index 8a6e39ef..26032ae1 100755
--- a/Classes/PHPWord/Writer/Word2007/ContentTypes.php
+++ b/Classes/PHPWord/Writer/Word2007/ContentTypes.php
@@ -30,7 +30,15 @@
  */
 class PHPWord_Writer_Word2007_ContentTypes extends PHPWord_Writer_Word2007_WriterPart
 {
-
+    /**
+     * Write contenttypes.xml
+     *
+     * @param array $_imageTypes
+     * @param array $_objectTypes
+     * @param int $_cHdrs
+     * @param array $footers
+     * @return string XML data
+     */
     public function writeContentTypes($_imageTypes, $_objectTypes, $_cHdrs, $footers)
     {
         // Create XML writer
@@ -163,7 +171,6 @@ class PHPWord_Writer_Word2007_ContentTypes extends PHPWord_Writer_Word2007_Write
             }
         }
 
-
         $objWriter->endElement();
 
         // Return
@@ -173,9 +180,9 @@ class PHPWord_Writer_Word2007_ContentTypes extends PHPWord_Writer_Word2007_Write
     /**
      * Get image mime type
      *
-     * @param    string $pFile Filename
-     * @return    string    Mime Type
-     * @throws    Exception
+     * @param string $pFile Filename
+     * @return string    Mime Type
+     * @throws Exception
      */
     private function _getImageMimeType($pFile = '')
     {
@@ -190,10 +197,10 @@ class PHPWord_Writer_Word2007_ContentTypes extends PHPWord_Writer_Word2007_Write
     /**
      * Write Default content type
      *
-     * @param    PHPWord_Shared_XMLWriter $objWriter XML Writer
-     * @param    string $pPartname Part name
-     * @param    string $pContentType Content type
-     * @throws    Exception
+     * @param PHPWord_Shared_XMLWriter $objWriter XML Writer
+     * @param string $pPartname Part name
+     * @param string $pContentType Content type
+     * @throws Exception
      */
     private function _writeDefaultContentType(PHPWord_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
     {
@@ -211,10 +218,10 @@ class PHPWord_Writer_Word2007_ContentTypes extends PHPWord_Writer_Word2007_Write
     /**
      * Write Override content type
      *
-     * @param    PHPWord_Shared_XMLWriter $objWriter XML Writer
-     * @param    string $pPartname Part name
-     * @param    string $pContentType Content type
-     * @throws    Exception
+     * @param PHPWord_Shared_XMLWriter $objWriter XML Writer
+     * @param string $pPartname Part name
+     * @param string $pContentType Content type
+     * @throws Exception
      */
     private function _writeOverrideContentType(PHPWord_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
     {
diff --git a/Classes/PHPWord/Writer/Word2007/DocProps.php b/Classes/PHPWord/Writer/Word2007/DocProps.php
index 2e8f8b5a..b2ec6f39 100755
--- a/Classes/PHPWord/Writer/Word2007/DocProps.php
+++ b/Classes/PHPWord/Writer/Word2007/DocProps.php
@@ -30,7 +30,12 @@
  */
 class PHPWord_Writer_Word2007_DocProps extends PHPWord_Writer_Word2007_WriterPart
 {
-
+    /**
+     * Write app.xml
+     *
+     * @param PHPWord $pPHPWord
+     * @return string XML data
+     */
     public function writeDocPropsApp(PHPWord $pPHPWord = null)
     {
         // Create XML writer
@@ -122,7 +127,12 @@ class PHPWord_Writer_Word2007_DocProps extends PHPWord_Writer_Word2007_WriterPar
         return $objWriter->getData();
     }
 
-
+    /**
+     * Write core.xml
+     *
+     * @param PHPWord $pPHPWord
+     * @return string XML data
+     */
     public function writeDocPropsCore(PHPWord $pPHPWord = null)
     {
         // Create XML writer
diff --git a/Classes/PHPWord/Writer/Word2007/Document.php b/Classes/PHPWord/Writer/Word2007/Document.php
index abdd92cc..1bd86152 100755
--- a/Classes/PHPWord/Writer/Word2007/Document.php
+++ b/Classes/PHPWord/Writer/Word2007/Document.php
@@ -30,7 +30,9 @@
  */
 class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
 {
-
+    /**
+     * Write document.xml
+     */
     public function writeDocument(PHPWord $pPHPWord = null)
     {
         // Create XML writer
@@ -114,6 +116,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         return $objWriter->getData();
     }
 
+    /**
+     * Write section start
+     */
     private function _writeSection(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section $section)
     {
         $objWriter->startElement('w:p');
@@ -123,6 +128,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement();
     }
 
+    /**
+     * Write section end
+     */
     private function _writeEndSection(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section $section)
     {
         $settings = $section->getSettings();
@@ -256,6 +264,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement();
     }
 
+    /**
+     * Write page break element
+     */
     private function _writePageBreak(PHPWord_Shared_XMLWriter $objWriter = null)
     {
         $objWriter->startElement('w:p');
@@ -267,6 +278,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement();
     }
 
+    /**
+     * Write list item element
+     */
     public function _writeListItem(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_ListItem $listItem)
     {
         $textObject = $listItem->getTextObject();
@@ -306,6 +320,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement();
     }
 
+    /**
+     * Write object element
+     */
     protected function _writeObject(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Section_Object $object)
     {
         $rIdObject = $object->getRelationId();
@@ -365,6 +382,9 @@ class PHPWord_Writer_Word2007_Document extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement(); // w:p
     }
 
+    /**
+     * Write TOC element
+     */
     private function _writeTOC(PHPWord_Shared_XMLWriter $objWriter = null)
     {
         $titles = PHPWord_TOC::getTitles();
diff --git a/Classes/PHPWord/Writer/Word2007/DocumentRels.php b/Classes/PHPWord/Writer/Word2007/DocumentRels.php
index 9817a31f..eda62c5e 100755
--- a/Classes/PHPWord/Writer/Word2007/DocumentRels.php
+++ b/Classes/PHPWord/Writer/Word2007/DocumentRels.php
@@ -30,7 +30,12 @@
  */
 class PHPWord_Writer_Word2007_DocumentRels extends PHPWord_Writer_Word2007_WriterPart
 {
-
+    /**
+     * Write word/_rels/document.xml.rels
+     *
+     * @param array $_relsCollection
+     * @return string XML data
+     */
     public function writeDocumentRels($_relsCollection)
     {
         // Create XML writer
@@ -119,6 +124,12 @@ class PHPWord_Writer_Word2007_DocumentRels extends PHPWord_Writer_Word2007_Write
         return $objWriter->getData();
     }
 
+    /**
+     * Write word/_rels/(header|footer)(\d).xml.rels
+     *
+     * @param array $_relsCollection
+     * @return string XML data
+     */
     public function writeHeaderFooterRels($_relsCollection)
     {
         // Create XML writer
@@ -150,13 +161,21 @@ class PHPWord_Writer_Word2007_DocumentRels extends PHPWord_Writer_Word2007_Write
             );
         }
 
-
         $objWriter->endElement();
 
         // Return
         return $objWriter->getData();
     }
 
+    /**
+     * Write individual relations
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param int $pId
+     * @param string $pType
+     * @param string $pTarget
+     * @param string $pTargetMode
+     */
     private function _writeRelationship(PHPWord_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
     {
         if ($pType != '' && $pTarget != '') {
diff --git a/Classes/PHPWord/Writer/Word2007/Footer.php b/Classes/PHPWord/Writer/Word2007/Footer.php
index 6ee18d66..ef81fdb0 100755
--- a/Classes/PHPWord/Writer/Word2007/Footer.php
+++ b/Classes/PHPWord/Writer/Word2007/Footer.php
@@ -30,7 +30,12 @@
  */
 class PHPWord_Writer_Word2007_Footer extends PHPWord_Writer_Word2007_Base
 {
-
+    /**
+     * Write footer
+     *
+     * @param PHPWord_Section_Footer $footer
+     * @return string XML data
+     */
     public function writeFooter(PHPWord_Section_Footer $footer)
     {
         // Create XML writer
diff --git a/Classes/PHPWord/Writer/Word2007/Footnotes.php b/Classes/PHPWord/Writer/Word2007/Footnotes.php
index 28d087c7..5d0680ce 100644
--- a/Classes/PHPWord/Writer/Word2007/Footnotes.php
+++ b/Classes/PHPWord/Writer/Word2007/Footnotes.php
@@ -25,9 +25,17 @@
  * @version    0.8.0
  */
 
-
+/**
+ * Class PHPWord_Writer_Word2007_Footnotes
+ */
 class PHPWord_Writer_Word2007_Footnotes extends PHPWord_Writer_Word2007_Base
 {
+    /**
+     * Write footnotes.xml
+     *
+     * @param array $allFootnotesCollection
+     * @return string XML data
+     */
     public function writeFootnotes($allFootnotesCollection)
     {
         // Create XML writer
diff --git a/Classes/PHPWord/Writer/Word2007/FootnotesRels.php b/Classes/PHPWord/Writer/Word2007/FootnotesRels.php
index 0e562b59..48721985 100644
--- a/Classes/PHPWord/Writer/Word2007/FootnotesRels.php
+++ b/Classes/PHPWord/Writer/Word2007/FootnotesRels.php
@@ -25,9 +25,16 @@
  * @version    0.8.0
  */
 
-
+/**
+ * Class PHPWord_Writer_Word2007_FootnotesRels
+ */
 class PHPWord_Writer_Word2007_FootnotesRels extends PHPWord_Writer_Word2007_WriterPart
 {
+    /**
+     * Write footnotes relationships
+     *
+     * @param array $_relsCollection
+     */
     public function writeFootnotesRels($_relsCollection)
     {
         // Create XML writer
@@ -61,6 +68,15 @@ class PHPWord_Writer_Word2007_FootnotesRels extends PHPWord_Writer_Word2007_Writ
         return $objWriter->getData();
     }
 
+    /**
+     * Write individual relations
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param int $pId
+     * @param string $pType
+     * @param string $pTarget
+     * @param string $pTargetMode
+     */
     private function _writeRelationship(PHPWord_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
     {
         if ($pType != '' && $pTarget != '') {
diff --git a/Classes/PHPWord/Writer/Word2007/Header.php b/Classes/PHPWord/Writer/Word2007/Header.php
index 59eebd91..0c11183b 100755
--- a/Classes/PHPWord/Writer/Word2007/Header.php
+++ b/Classes/PHPWord/Writer/Word2007/Header.php
@@ -30,7 +30,12 @@
  */
 class PHPWord_Writer_Word2007_Header extends PHPWord_Writer_Word2007_Base
 {
-
+    /**
+     * Write header
+     *
+     * @param PHPWord_Section_Header $header
+     * @return string XML data
+     */
     public function writeHeader(PHPWord_Section_Header $header)
     {
         // Create XML writer
diff --git a/Classes/PHPWord/Writer/Word2007/Rels.php b/Classes/PHPWord/Writer/Word2007/Rels.php
index 06eb59cc..9304bda6 100755
--- a/Classes/PHPWord/Writer/Word2007/Rels.php
+++ b/Classes/PHPWord/Writer/Word2007/Rels.php
@@ -30,7 +30,11 @@
  */
 class PHPWord_Writer_Word2007_Rels extends PHPWord_Writer_Word2007_WriterPart
 {
-
+    /**
+     * Write _rels/.rels
+     *
+     * @param PHPWord $pPHPWord
+     */
     public function writeRelationships(PHPWord $pPHPWord = null)
     {
         // Create XML writer
diff --git a/Classes/PHPWord/Writer/Word2007/Styles.php b/Classes/PHPWord/Writer/Word2007/Styles.php
index 3724323e..1f61051a 100755
--- a/Classes/PHPWord/Writer/Word2007/Styles.php
+++ b/Classes/PHPWord/Writer/Word2007/Styles.php
@@ -30,9 +30,18 @@
  */
 class PHPWord_Writer_Word2007_Styles extends PHPWord_Writer_Word2007_Base
 {
-
+    /**
+     * PHPWord object
+     *
+     * @var PHPWord
+     */
     private $_document;
 
+    /**
+     * Write styles
+     *
+     * @param PHPWord $pPHPWord
+     */
     public function writeStyles(PHPWord $pPHPWord = null)
     {
         // Create XML writer
@@ -181,6 +190,12 @@ class PHPWord_Writer_Word2007_Styles extends PHPWord_Writer_Word2007_Base
         return $objWriter->getData();
     }
 
+    /**
+     * Write style
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param PHPWord_Style_TableFull $style
+     */
     private function _writeFullTableStyle(PHPWord_Shared_XMLWriter $objWriter = null, PHPWord_Style_TableFull $style)
     {
 
@@ -302,6 +317,13 @@ class PHPWord_Writer_Word2007_Styles extends PHPWord_Writer_Word2007_Base
         }
     }
 
+    /**
+     * Write row style
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     * @param string $type
+     * @param PHPWord_Style_TableFull $style
+     */
     private function _writeRowStyle(PHPWord_Shared_XMLWriter $objWriter = null, $type, PHPWord_Style_TableFull $style)
     {
         $brdSz = $style->getBorderSize();
@@ -362,7 +384,11 @@ class PHPWord_Writer_Word2007_Styles extends PHPWord_Writer_Word2007_Base
         $objWriter->endElement();
     }
 
-
+    /**
+     * Write doc defaults
+     *
+     * @param PHPWord_Shared_XMLWriter $objWriter
+     */
     private function _writeDocDefaults(PHPWord_Shared_XMLWriter $objWriter = null)
     {
         $fontName = $this->_document->getDefaultFontName();
diff --git a/Classes/PHPWord/Writer/Word2007/WriterPart.php b/Classes/PHPWord/Writer/Word2007/WriterPart.php
index cc004254..35cf348f 100755
--- a/Classes/PHPWord/Writer/Word2007/WriterPart.php
+++ b/Classes/PHPWord/Writer/Word2007/WriterPart.php
@@ -30,13 +30,28 @@
  */
 abstract class PHPWord_Writer_Word2007_WriterPart
 {
+    /**
+     * Parent writer object
+     *
+     * @var PHPWord_Writer_Word2007
+     */
     private $_parentWriter;
 
+    /**
+     * Set parent writer
+     *
+     * @param PHPWord_Writer_IWriter
+     */
     public function setParentWriter(PHPWord_Writer_IWriter $pWriter = null)
     {
         $this->_parentWriter = $pWriter;
     }
 
+    /**
+     * Get parent writer
+     *
+     * @return PHPWord_Writer_IWriter
+     */
     public function getParentWriter()
     {
         if (!is_null($this->_parentWriter)) {