mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78 from box/fix_xml_reader_open_overriding

Browse Source 
Fix XMLReader open() overriding
This commit is contained in:
Adrien Loison 2015-07-29 10:17:34 -07:00
commit e3f7ecfa64
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Spout/Reader/Wrapper/XMLReader.php
View File

@ -19,9 +19,11 @@ class XMLReader extends \XMLReader
* @see \XMLReader::open * @see \XMLReader::open
* *
* @param string $URI URI pointing to the document * @param string $URI URI pointing to the document
* @param string|null|void $encoding The document encoding
* @param int $options A bitmask of the LIBXML_* constants
* @return bool TRUE on success or FALSE on failure * @return bool TRUE on success or FALSE on failure
*/ */
public function open($URI) public function open($URI, $encoding = null, $options = 0)
{ {
$wasOpenSuccessful = false; $wasOpenSuccessful = false;
@ -29,10 +31,10 @@ class XMLReader extends \XMLReader
// @link https://github.com/facebook/hhvm/issues/5779 // @link https://github.com/facebook/hhvm/issues/5779
if ($this->isRunningHHVM() && $this->isZipStream($URI)) { if ($this->isRunningHHVM() && $this->isZipStream($URI)) {
if ($this->fileExistsWithinZip($URI)) { if ($this->fileExistsWithinZip($URI)) {
$wasOpenSuccessful = parent::open($URI, null, LIBXML_NONET); $wasOpenSuccessful = parent::open($URI, $encoding, $options|LIBXML_NONET);
} }
} else { } else {
$wasOpenSuccessful = parent::open($URI, null, LIBXML_NONET); $wasOpenSuccessful = parent::open($URI, $encoding, $options|LIBXML_NONET);
} }
return $wasOpenSuccessful; return $wasOpenSuccessful;