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

Merge remote-tracking branch

Browse Source 
'github_troosan/fix_for_different_even_odd_headers' into develop

Conflicts:
	tests/PhpWord/SettingsTest.php
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
This commit is contained in:
antoine 2017-01-29 14:54:08 +01:00
commit d8c5703e06
4 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/PhpWord/Settings.php
View File

@ -145,7 +145,14 @@ class Settings
* @var bool
*/
private static $outputEscapingEnabled = false;
/**
* Enables different header for odd and even pages.
*
* @var bool
*/
private static $evenAndOddHeaders = false;
/**
* Return the compatibility option used by the XMLWriter
*
@ -352,6 +359,22 @@ class Settings
self::$outputEscapingEnabled = $outputEscapingEnabled;
}
/**
* @return boolean
*/
public static function isEvenAndOddHeaders()
{
return self::$evenAndOddHeaders;
}
/**
* @param boolean $evenAndOddHeaders
*/
public static function setEvenAndOddHeaders($evenAndOddHeaders)
{
self::$evenAndOddHeaders = $evenAndOddHeaders;
}
/**
* Get default font name
*

1
src/PhpWord/Writer/Word2007/Part/Settings.php
View File

@ -105,6 +105,7 @@ class Settings extends AbstractPart
'w:defaultTabStop' => array('@attributes' => array('w:val' => '708')),
'w:hyphenationZone' => array('@attributes' => array('w:val' => '425')),
'w:characterSpacingControl' => array('@attributes' => array('w:val' => 'doNotCompress')),
'w:evenAndOddHeaders' => array('@attributes' => array('w:val' => DocumentSettings::isEvenAndOddHeaders() ? 'true': 'false')),
'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
'w:hideSpellingErrors' => array('@attributes' => array('w:val' => DocumentSettings::isSpellingErrorsHidden() ? 'true' : 'false')),
'w:hideGrammaticalErrors' => array('@attributes' => array('w:val' => DocumentSettings::isGrammaticalErrorsHidden() ? 'true' : 'false')),

10
tests/PhpWord/SettingsTest.php
View File

@ -128,6 +128,16 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(Settings::isGrammaticalErrorsHidden());
}
/**
* Test set/get even and odd headers
*/
public function testSetGetEvenAndOddHeaders()
{
$this->assertFalse(Settings::isEvenAndOddHeaders());
Settings::setEvenAndOddHeaders(true);
$this->assertTrue(Settings::isEvenAndOddHeaders());
}
/**
* Test load config
*/

19
tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
View File

@ -104,4 +104,23 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('true', $element->getAttribute('w:val'));
}
/**
* Test even and odd headers
*/
public function testEvenAndOddHeaders()
{
$phpWord = new PhpWord();
Settings::setEvenAndOddHeaders(true);
$doc = TestHelperDOCX::getDocument($phpWord);
$file = 'word/settings.xml';
$path = '/w:settings/w:evenAndOddHeaders';
$this->assertTrue($doc->elementExists($path, $file));
$element = $doc->getElement($path, $file);
$this->assertEquals('true', $element->getAttribute('w:val'));
}
}