Merge pull request #107 from gabrielbull/develop

Fixed bug with footer preserve text

Author: Progi1984

Classes/PHPWord/Writer/Word2007/Base.php

@@ -285,6 +285,9 @@ protected function _writePreserveText(PHPWord_Shared_XMLWriter $objWriter = null
         $SpIsObject = ($styleParagraph instanceof PHPWord_Style_Paragraph) ? true : false;
 
         $arrText = $textrun->getText();
+        if (!is_array($arrText)) {
+            $arrText = array($arrText);
+        }
 
         $objWriter->startElement('w:p');
 

Tests/PHPWord/Writer/Word2007/BaseTest.php

@@ -108,4 +108,19 @@ public function testWriteParagraphStyle_Pagination()
             $this->assertEquals($expected, $element->getAttribute('w:val'));
         }
     }
-}
+
+    public function testWritePreserveText()
+    {
+        $PHPWord = new PHPWord();
+        $section = $PHPWord->createSection();
+        $footer = $section->createFooter();
+
+        $footer->addPreserveText('{PAGE}');
+
+        $doc = TestHelperDOCX::getDocument($PHPWord);
+        $preserve = $doc->getElement("w:p/w:r[2]/w:instrText", 'word/footer1.xml');
+
+        $this->assertEquals('PAGE', $preserve->nodeValue);
+        $this->assertEquals('preserve', $preserve->getAttribute('xml:space'));
+    }
+}

Tests/_inc/TestHelperDOCX.php

@@ -15,8 +15,8 @@ class TestHelperDOCX
     public static function getDocument(PHPWord $PHPWord)
     {
         self::$file = tempnam(sys_get_temp_dir(), 'PHPWord');
-        if(!is_dir(sys_get_temp_dir().'/PHPWord_Unit_Test/')){
-          mkdir(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+        if (!is_dir(sys_get_temp_dir() . '/PHPWord_Unit_Test/')) {
+            mkdir(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
         }
 
         $objWriter = \PHPWord_IOFactory::createWriter($PHPWord, 'Word2007');
@@ -29,16 +29,16 @@ public static function getDocument(PHPWord $PHPWord)
             $zip->close();
         }
 
-        return new Xml_Document(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+        return new Xml_Document(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
     }
 
     public static function clear()
     {
-        if(file_exists(self::$file)){
-          unlink(self::$file);
+        if (file_exists(self::$file)) {
+            unlink(self::$file);
         }
-        if(is_dir(sys_get_temp_dir().'/PHPWord_Unit_Test/')){
-          self::deleteDir(sys_get_temp_dir().'/PHPWord_Unit_Test/');
+        if (is_dir(sys_get_temp_dir() . '/PHPWord_Unit_Test/')) {
+            self::deleteDir(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
         }
     }
 

composer.json

@@ -24,7 +24,7 @@
         "ext-xml": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.28"
+        "phpunit/phpunit": "3.7.*"
     },
     "recommend": {
         "ext-zip": "*",