alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a few Scrutinizer issues

This commit is contained in:
Adrien Crivelli 2019-01-02 15:38:13 +11:00
parent 0e8fde9be6
commit d0dea580ad
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpSpreadsheet/Reader/Security/XmlScanner.php
View File

@ -101,7 +101,7 @@ class XmlScanner
$xml = call_user_func($this->callback, $xml); $xml = call_user_func($this->callback, $xml);
} }
} finally { } finally {
if ($this->libxmlDisableEntityLoader) { if (isset($previousLibxmlDisableEntityLoaderValue)) {
libxml_disable_entity_loader($previousLibxmlDisableEntityLoaderValue); libxml_disable_entity_loader($previousLibxmlDisableEntityLoaderValue);
} }
} }

10
tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
View File

@ -119,15 +119,15 @@ class XmlScannerTest extends TestCase
/** /**
* @dataProvider providerLibxmlSettings * @dataProvider providerLibxmlSettings
* *
* @param $libxmDisableLoader * @param $libxmlDisableLoader
*/ */
public function testNewInstanceCreationDoesntChangeLibxmlSettings($libxmDisableLoader) public function testNewInstanceCreationDoesntChangeLibxmlSettings($libxmlDisableLoader)
{ {
libxml_disable_entity_loader($libxmDisableLoader); libxml_disable_entity_loader($libxmlDisableLoader);
$reader = new Xml(); $reader = new Xml();
self::assertEquals($libxmlDisableLoader, libxml_disable_entity_loader($libxmlDisableLoader));
self::assertEquals($libxmDisableLoader, libxml_disable_entity_loader($libxmDisableLoader)); unset($reader);
} }
public function providerLibxmlSettings() public function providerLibxmlSettings()