Merged PHPOffice#495.

publiux · Aug 16, 2015 · e351717 · e351717
1 parent eff9ca2
commit e351717
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/samples/Sample_12_HeaderFooter.php b/samples/Sample_12_HeaderFooter.php
@@ -29,7 +29,7 @@
 
 // Add footer
 $footer = $section->addFooter();
-$footer->addPreserveText(htmlspecialchars('Page {PAGE} of {NUMPAGES}.'), array('align' => 'center'));
+$footer->addPreserveText(htmlspecialchars('Page {PAGE} of {NUMPAGES}.'), null, array('align' => 'center'));
 $footer->addLink('http://google.com', htmlspecialchars('Direct Google'));
 
 // Write some text

diff --git a/tests/PhpWord/Tests/Element/PreserveTextTest.php b/tests/PhpWord/Tests/Element/PreserveTextTest.php
@@ -57,8 +57,8 @@ public function testConstructWithArray()
     {
         $oPreserveText = new PreserveText(
             'text',
-            array('align' => 'center'),
-            array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)
+            array('size' => 16, 'color' => '1B2232'),
+            array('align' => 'center')
         );
         $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oPreserveText->getFontStyle());
         $this->assertInstanceOf(