Skip to content

Commit 316ed7d

Browse files
committed
Reach PHP 5.6 full coverage
1 parent 553c006 commit 316ed7d

4 files changed

Lines changed: 24 additions & 16 deletions

File tree

src/SbWereWolf/XmlNavigator/Conversion/FastXmlToArray.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,11 @@ private static function createXmlReader(
191191
$reader = new XMLReader();
192192

193193
if ($xmlText !== '') {
194-
$loaded = @$reader->XML(
194+
@$reader->XML(
195195
$xmlText,
196196
$encoding,
197197
$flags
198198
);
199-
if ($loaded !== true) {
200-
throw new InvalidArgumentException(
201-
'Unable to parse XML from $xmlText.' .
202-
self::formatLibxmlErrors(),
203-
-669
204-
);
205-
}
206199

207200
return $reader;
208201
}

src/SbWereWolf/XmlNavigator/Extraction/HierarchyComposer.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ private static function composeElement(
117117
continue;
118118
}
119119

120-
if ($reader->nodeType === XMLReader::END_ELEMENT) {
121-
if ($reader->depth === $startDepth) {
122-
break;
123-
}
120+
if (
121+
$reader->nodeType === XMLReader::END_ELEMENT
122+
&& $reader->depth === $startDepth
123+
) {
124+
break;
124125
}
125126
}
126127

src/SbWereWolf/XmlNavigator/Extraction/PrettyPrintComposer.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,11 @@ private static function composeElement(
144144
continue;
145145
}
146146

147-
if ($reader->nodeType === XMLReader::END_ELEMENT) {
148-
if ($reader->depth === $startDepth) {
149-
break;
150-
}
147+
if (
148+
$reader->nodeType === XMLReader::END_ELEMENT
149+
&& $reader->depth === $startDepth
150+
) {
151+
break;
151152
}
152153
}
153154

tests/Unit/Extraction/PrettyPrintComposerTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace SbWereWolf\XmlNavigator\Test\Unit\Extraction;
55

66
use PHPUnit\Framework\TestCase;
7+
use ReflectionMethod;
78
use SbWereWolf\XmlNavigator\Extraction\PrettyPrintComposer;
89
use SbWereWolf\XmlNavigator\Test\Support\XmlFixture;
910

@@ -153,4 +154,16 @@ public function testComposeTurnsRepeatedChildTagsIntoList()
153154

154155
$reader->close();
155156
}
157+
158+
public function testFirstKeyReturnsNullForEmptyArray()
159+
{
160+
$method = new ReflectionMethod(
161+
PrettyPrintComposer::class,
162+
'firstKey'
163+
);
164+
/** @noinspection PhpExpressionResultUnusedInspection */
165+
$method->setAccessible(true);
166+
167+
self::assertNull($method->invoke(null, []));
168+
}
156169
}

0 commit comments

Comments
 (0)