Bugfix: Preserve text doesn't render correctly when the text is not the first word, e.g. 'Page {PAGE}'

Author: ivanlanin

Classes/PHPWord/Section/Footer/PreserveText.php

@@ -93,7 +93,7 @@ public function __construct($text = null, $styleFont = null, $styleParagraph = n
 
         $matches = preg_split('/({.*?})/', $text, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
         if (isset($matches[0])) {
-            $this->_text = $matches[0];
+            $this->_text = $matches;
         }
 
         return $this;

Tests/PHPWord/Section/Footer/PreserveTextTest.php

@@ -18,7 +18,7 @@ public function testConstruct()
     public function testConstructWithString()
     {
         $oPreserveText = new PHPWord_Section_Footer_PreserveText('text', 'styleFont', 'styleParagraph');
-        $this->assertEquals($oPreserveText->getText(), 'text');
+        $this->assertEquals($oPreserveText->getText(), array('text'));
         $this->assertEquals($oPreserveText->getFontStyle(), 'styleFont');
         $this->assertEquals($oPreserveText->getParagraphStyle(), 'styleParagraph');
     }

Tests/PHPWord/Section/FooterTest.php

@@ -110,7 +110,7 @@ public function testAddPreserveTextNotUTF8()
 
         $this->assertCount(1, $oFooter->getElements());
         $this->assertInstanceOf('PHPWord_Section_Footer_PreserveText', $element);
-        $this->assertEquals($element->getText(), 'ééé');
+        $this->assertEquals($element->getText(), array('ééé'));
     }
 
     public function testGetElements()

Tests/PHPWord/Section/HeaderTest.php

@@ -106,7 +106,7 @@ public function testAddPreserveTextNotUTF8()
 
         $this->assertCount(1, $oHeader->getElements());
         $this->assertInstanceOf('PHPWord_Section_Footer_PreserveText', $element);
-        $this->assertEquals($element->getText(), 'ééé');
+        $this->assertEquals($element->getText(), array('ééé'));
     }
 
     public function testAddWatermark()

Tests/PHPWord/Section/Table/CellTest.php

@@ -188,7 +188,7 @@ public function testAddPreserveTextNotUTF8()
 
         $this->assertCount(1, $oCell->getElements());
         $this->assertInstanceOf('PHPWord_Section_Footer_PreserveText', $element);
-        $this->assertEquals($element->getText(), 'ééé');
+        $this->assertEquals($element->getText(), array('ééé'));
     }
 
     public function testCreateTextRun()

changelog.txt

@@ -23,6 +23,7 @@
 **************************************************************************************
 
 Changes in branch for release 0.9.0 :
+- Bugfix:   (ivanlanin)                         - Preserve text doesn't render correctly when the text is not the first word, e.g. 'Page {PAGE}'
 - QA:       (Progi1984)                         - Documentation
 
 Changes in branch for release 0.8.1 :

samples/Sample_12_HeaderFooter.php

@@ -25,7 +25,7 @@
 
 // Add footer
 $footer = $section->createFooter();
-$footer->addPreserveText('Page {PAGE} of {NUMPAGES}.', array('align' => 'center'));
+$footer->addPreserveText('Page {PAGE} of {NUMPAGES}', array('color' => 'FF0000'), array('align' => 'center'));
 
 // Write some text
 $section->addTextBreak();