Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit d84065c

Browse files
Makinamiweierophinney
authored andcommitted
Replace deprecated each() with foreach()
Fixes #28
1 parent b41116f commit d84065c

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

src/AbstractValue.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,11 @@ protected static function createSimpleXMLElement(&$xml)
440440
protected static function extractTypeAndValue(\SimpleXMLElement $xml, &$type, &$value)
441441
{
442442
// Casting is necessary to work with strict-typed systems
443-
$xmlAsArray = (array) $xml;
444-
list($type, $value) = each($xmlAsArray);
443+
foreach((array) $xml as $type => $value) break;
445444
if (!$type and $value === null) {
446445
$namespaces = ['ex' => 'http://ws.apache.org/xmlrpc/namespaces/extensions'];
447446
foreach ($namespaces as $namespaceName => $namespaceUri) {
448-
$namespaceXml = $xml->children($namespaceUri);
449-
$namespaceXmlAsArray = (array) $namespaceXml;
450-
list($type, $value) = each($namespaceXmlAsArray);
447+
foreach ((array)$xml->children($namespaceUri) as $type => $value) break;
451448
if ($type !== null) {
452449
$type = $namespaceName . ':' . $type;
453450
break;

test/RequestTest.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,17 +263,11 @@ protected function assertXmlRequest($xml, $argv)
263263
$sx = new \SimpleXMLElement($xml);
264264

265265
$result = $sx->xpath('//methodName');
266-
$count = 0;
267-
while (list(, $node) = each($result)) {
268-
++$count;
269-
}
266+
$count = count($result);
270267
$this->assertEquals(1, $count, $xml);
271268

272269
$result = $sx->xpath('//params');
273-
$count = 0;
274-
while (list(, $node) = each($result)) {
275-
++$count;
276-
}
270+
$count = count($result);
277271
$this->assertEquals(1, $count, $xml);
278272

279273
$methodName = (string) $sx->methodName;

0 commit comments

Comments
 (0)