Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged #495.

Browse Source
This commit is contained in:
Roman Syroeshko 2015-08-16 19:13:14 +04:00
parent eff9ca22cb
commit e351717f3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Sample_12_HeaderFooter.php
View File

@ -29,7 +29,7 @@ $subsequent->addImage('resources/_mars.jpg', array('width' => 80, 'height' => 80
// Add footer // Add footer
$footer = $section->addFooter(); $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')); $footer->addLink('http://google.com', htmlspecialchars('Direct Google'));
// Write some text // Write some text

4
tests/PhpWord/Tests/Element/PreserveTextTest.php
View File

@ -57,8 +57,8 @@ class PreserveTextTest extends \PHPUnit_Framework_TestCase
{ {
$oPreserveText = new PreserveText( $oPreserveText = new PreserveText(
'text', 'text',
array('align' => 'center'), array('size' => 16, 'color' => '1B2232'),
array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600) array('align' => 'center')
); );
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oPreserveText->getFontStyle()); $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oPreserveText->getFontStyle());
$this->assertInstanceOf( $this->assertInstanceOf(