Merge pull request #928 from likeuntomurphy/develop

Progi1984 · web-flow · commit 6da9d8a0bf03 · 2016-12-13T16:56:57.000+01:00
Fixes #927
diff --git a/src/PhpWord/Writer/Word2007/Part/Settings.php b/src/PhpWord/Writer/Word2007/Part/Settings.php
@@ -106,7 +106,7 @@ private function getSettings()
             'w:themeFontLang' => array('@attributes' => array('w:val' => 'en-US')),
             'w:decimalSymbol' => array('@attributes' => array('w:val' => '.')),
             'w:listSeparator' => array('@attributes' => array('w:val' => ';')),
-            'w:compat' => '',
+            'w:compat' => array(),
             'm:mathPr' => array(
                 'm:mathFont' => array('@attributes' => array('m:val' => 'Cambria Math')),
                 'm:brkBin' => array('@attributes' => array('m:val' => 'before')),
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -64,5 +64,6 @@ public function testCompatibility()
 
         $path = '/w:settings/w:compat/w:compatSetting';
         $this->assertTrue($doc->elementExists($path, $file));
+        $this->assertEquals($phpWord->getCompatibility()->getOoxmlVersion(), 15);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,6 @@ public function testCompatibility()`
`64`	`64`
`65`	`65`	`$path = '/w:settings/w:compat/w:compatSetting';`
`66`	`66`	`$this->assertTrue($doc->elementExists($path, $file));`
	`67`	`+ $this->assertEquals($phpWord->getCompatibility()->getOoxmlVersion(), 15);`
`67`	`68`	`}`
`68`	`69`	`}`