Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix PHP 8.0 compatibility

This commit is contained in:
Libor M 2021-01-02 09:08:43 +01:00
parent 67b15986a7
commit 681d5c4709
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PhpWord/Shared/XMLReader.php
View File

@ -72,10 +72,14 @@ class XMLReader
*/ */
public function getDomFromString($content) public function getDomFromString($content)
{ {
$originalLibXMLEntityValue = libxml_disable_entity_loader(true); if (\PHP_VERSION_ID < 80000) {
$originalLibXMLEntityValue = libxml_disable_entity_loader(true);
}
$this->dom = new \DOMDocument(); $this->dom = new \DOMDocument();
$this->dom->loadXML($content); $this->dom->loadXML($content);
libxml_disable_entity_loader($originalLibXMLEntityValue); if (\PHP_VERSION_ID < 80000) {
libxml_disable_entity_loader($originalLibXMLEntityValue);
}
return $this->dom; return $this->dom;
} }

1
tests/PhpWord/Shared/XMLWriterTest.php
View File

@ -66,7 +66,6 @@ class XMLWriterTest extends \PHPUnit\Framework\TestCase
setlocale(LC_NUMERIC, 'de_DE.UTF-8', 'de'); setlocale(LC_NUMERIC, 'de_DE.UTF-8', 'de');
$this->assertSame('1,2', (string)$value);
$this->assertSame('<element name="1.2"/>' . chr(10), $xmlWriter->getData()); $this->assertSame('<element name="1.2"/>' . chr(10), $xmlWriter->getData());
setlocale(LC_NUMERIC, $currentLocale); setlocale(LC_NUMERIC, $currentLocale);