Skip to content

Commit 39b34e2

Browse files
committed
Fix PHP 5.6 XMLReader init
1 parent 4950bcc commit 39b34e2

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

src/SbWereWolf/XmlNavigator/Conversion/FastXmlToArray.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,22 +180,31 @@ private static function createXmlReader(
180180
);
181181
}
182182

183+
$reader = new XMLReader();
184+
183185
if ($xmlText !== '') {
184-
/** @var XMLReader $reader */
185-
$reader = @XMLReader::XML(
186+
$loaded = @$reader->XML(
186187
$xmlText,
187188
$encoding,
188189
$flags
189190
);
191+
if ($loaded !== true) {
192+
throw new InvalidArgumentException(
193+
'Unable to parse XML from $xmlText.' .
194+
self::formatLibxmlErrors(),
195+
-669
196+
);
197+
}
198+
190199
return $reader;
191200
}
192201

193-
$reader = @XMLReader::open(
202+
$opened = @$reader->open(
194203
$xmlUri,
195204
$encoding,
196205
$flags
197206
);
198-
if (!$reader instanceof XMLReader) {
207+
if ($opened !== true) {
199208
throw new InvalidArgumentException(
200209
'Unable to open XML source from URI `' . $xmlUri . '`.',
201210
-671

0 commit comments

Comments
 (0)