QA: Additional tests for Word2007 writer

Author: ivanlanin

src/PhpWord/Element/AbstractElement.php

@@ -9,15 +9,13 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Element\Element;
-use PhpOffice\PhpWord\Element\Footnote as FootnoteElement;
 use PhpOffice\PhpWord\Endnotes;
-use PhpOffice\PhpWord\Exception\InvalidObjectException;
 use PhpOffice\PhpWord\Footnotes;
 use PhpOffice\PhpWord\Media;
-use PhpOffice\PhpWord\Shared\String;
 use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\TOC;
+use PhpOffice\PhpWord\Exception\InvalidObjectException;
+use PhpOffice\PhpWord\Shared\String;
 
 /**
  * Container abstract class
@@ -323,13 +321,13 @@ public function addObject($src, $style = null)
      * Add footnote element
      *
      * @param mixed $paragraphStyle
-     * @return FootnoteElement
+     * @return Footnote
      */
     public function addFootnote($paragraphStyle = null)
     {
         $this->checkValidity('footnote');
 
-        $footnote = new FootnoteElement($paragraphStyle);
+        $footnote = new Footnote($paragraphStyle);
         $rId = Footnotes::addElement($footnote);
 
         $footnote->setDocPart('footnote', $this->getDocPartId());

src/PhpWord/Element/Row.php

@@ -13,6 +13,8 @@
 
 /**
  * Table row element
+ *
+ * @since 0.8.0
  */
 class Row extends AbstractElement
 {

src/PhpWord/Reader/Word2007.php

@@ -20,7 +20,7 @@
 /**
  * Reader for Word2007
  *
- * @since 0.10.0
+ * @since 0.8.0
  * @todo title, list, watermark, checkbox, toc
  * @todo Partly done: image, object
  */

src/PhpWord/Settings.php

@@ -10,7 +10,9 @@
 namespace PhpOffice\PhpWord;
 
 /**
- * Settings
+ * PHPWord settings class
+ *
+ * @since 0.8.0
  */
 class Settings
 {

src/PhpWord/Style/Row.php

@@ -11,6 +11,8 @@
 
 /**
  * Table row style
+ *
+ * @since 0.8.0
  */
 class Row extends AbstractStyle
 {

src/PhpWord/Template.php

@@ -298,6 +298,7 @@ public function save()
      * Save XML to defined name
      *
      * @param string $strFilename
+     * @since 0.8.0
      */
     public function saveAs($strFilename)
     {

src/PhpWord/Writer/HTML.php

@@ -9,6 +9,10 @@
 
 namespace PhpOffice\PhpWord\Writer;
 
+use PhpOffice\PhpWord\Endnotes;
+use PhpOffice\PhpWord\Footnotes;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Element\Endnote;
 use PhpOffice\PhpWord\Element\Footnote;
 use PhpOffice\PhpWord\Element\Image;
@@ -22,11 +26,7 @@
 use PhpOffice\PhpWord\Element\TextBreak;
 use PhpOffice\PhpWord\Element\TextRun;
 use PhpOffice\PhpWord\Element\Title;
-use PhpOffice\PhpWord\Endnotes;
 use PhpOffice\PhpWord\Exception\Exception;
-use PhpOffice\PhpWord\Footnotes;
-use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Style;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
 
@@ -703,12 +703,14 @@ private function assembleCss($css, $curlyBracket = false)
      */
     private function getBase64ImageData(Image $element)
     {
-        $imageData = null;
-        $imageBinary = null;
         $source = $element->getSource();
         $imageType = $element->getImageType();
+        $imageData = null;
+        $imageBinary = null;
+        $actualSource = null;
 
-        // Get actual source from archive image
+        // Get actual source from archive image or other source
+        // Return null if not found
         if ($element->getSourceType() == Image::SOURCE_ARCHIVE) {
             $source = substr($source, 6);
             list($zipFilename, $imageFilename) = explode('#', $source);
@@ -723,6 +725,9 @@ private function getBase64ImageData(Image $element)
         } else {
             $actualSource = $source;
         }
+        if (is_null($actualSource)) {
+            return null;
+        }
 
         // Read image binary data and convert into Base64
         if ($element->getSourceType() == Image::SOURCE_GD) {

src/PhpWord/Writer/ODText.php

@@ -19,6 +19,8 @@
 
 /**
  * ODText writer
+ *
+ * @since 0.7.0
  */
 class ODText extends AbstractWriter implements WriterInterface
 {

src/PhpWord/Writer/RTF.php

@@ -28,6 +28,8 @@
 
 /**
  * RTF writer
+ *
+ * @since 0.7.0
  */
 class RTF extends AbstractWriter implements WriterInterface
 {

src/PhpWord/Writer/Word2007/DocProps.php

@@ -10,6 +10,7 @@
 namespace PhpOffice\PhpWord\Writer\Word2007;
 
 use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Exception\Exception;
 
 /**
  * Word2007 document properties part writer
@@ -46,7 +47,7 @@ public function writeDocPropsApp(PhpWord $phpWord = null)
      *
      * @param \PhpOffice\PhpWord\PhpWord $phpWord
      */
-    public function writeDocPropsCore(PhpWord $phpWord)
+    public function writeDocPropsCore(PhpWord $phpWord = null)
     {
         if (is_null($phpWord)) {
             throw new Exception("No PhpWord assigned.");