summaryrefslogtreecommitdiff
path: root/ext/xmlreader/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/xmlreader/tests')
-rw-r--r--ext/xmlreader/tests/001.phpt4
-rw-r--r--ext/xmlreader/tests/002.phpt8
-rw-r--r--ext/xmlreader/tests/003-get-errors.phpt2
-rw-r--r--ext/xmlreader/tests/003-mb.phpt82
-rw-r--r--ext/xmlreader/tests/003-move-errors.phpt2
-rw-r--r--ext/xmlreader/tests/003.phpt112
-rw-r--r--ext/xmlreader/tests/004.phpt26
-rw-r--r--ext/xmlreader/tests/005.phpt6
-rw-r--r--ext/xmlreader/tests/006.phpt18
-rw-r--r--ext/xmlreader/tests/007.phpt4
-rw-r--r--ext/xmlreader/tests/008.phpt6
-rw-r--r--ext/xmlreader/tests/009.phpt2
-rw-r--r--ext/xmlreader/tests/010.phpt2
-rw-r--r--ext/xmlreader/tests/011.phpt2
-rw-r--r--ext/xmlreader/tests/012.phpt6
-rw-r--r--ext/xmlreader/tests/013.phpt10
-rw-r--r--ext/xmlreader/tests/014.phpt2
-rw-r--r--ext/xmlreader/tests/015-get-errors.phpt2
-rw-r--r--ext/xmlreader/tests/015-move-errors.phpt2
-rw-r--r--ext/xmlreader/tests/015.phpt2
-rw-r--r--ext/xmlreader/tests/bug64230.phpt8
-rw-r--r--ext/xmlreader/tests/bug71805.phpt42
-rw-r--r--ext/xmlreader/tests/bug73053.phpt2
-rw-r--r--ext/xmlreader/tests/bug74457.phpt2
-rw-r--r--ext/xmlreader/tests/expand.phpt2
-rw-r--r--ext/xmlreader/tests/static.phpt33
26 files changed, 187 insertions, 202 deletions
diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt
index fa87eba8b4..c10c1a5163 100644
--- a/ext/xmlreader/tests/001.phpt
+++ b/ext/xmlreader/tests/001.phpt
@@ -13,16 +13,14 @@ $reader->XML($xmlstring);
// Only go through
while ($reader->read()) {
- echo $reader->name."\n";
+ echo $reader->name."\n";
}
$xmlstring = '';
$reader = new XMLReader();
$reader->XML($xmlstring);
?>
-===DONE===
--EXPECTF--
books
books
Warning: XMLReader::XML(): Empty string supplied as input in %s on line %d
-===DONE===
diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index b2d50731ee..6d12f02204 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -14,13 +14,13 @@ if ($reader->open('')) exit();
$reader = new XMLReader();
if (!$reader->open($filename)) {
- $reader->close();
- exit();
+ $reader->close();
+ exit();
}
// Only go through
while ($reader->read()) {
- echo $reader->name."\n";
+ echo $reader->name."\n";
}
$reader->close();
unlink($filename);
@@ -31,9 +31,7 @@ $reader->close();
unlink($filename);
?>
-===DONE===
--EXPECTF--
Warning: XMLReader::open(): Empty string supplied as input in %s on line %d
books
books
-===DONE===
diff --git a/ext/xmlreader/tests/003-get-errors.phpt b/ext/xmlreader/tests/003-get-errors.phpt
index 9e5aa7e38f..a10529118f 100644
--- a/ext/xmlreader/tests/003-get-errors.phpt
+++ b/ext/xmlreader/tests/003-get-errors.phpt
@@ -57,7 +57,6 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/003-get-errors.xml');
@@ -74,4 +73,3 @@ NULL
num: 1
NULL
num: 1
-===DONE===
diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt
index 6d3282e6a5..5d0ec4de46 100644
--- a/ext/xmlreader/tests/003-mb.phpt
+++ b/ext/xmlreader/tests/003-mb.phpt
@@ -12,67 +12,66 @@ file_put_contents($filename, $xmlstring);
$reader = new XMLReader();
if (!$reader->open($filename)) {
- exit();
+ exit();
}
// Only go through
while ($reader->read()) {
- if ($reader->nodeType != XMLREADER::END_ELEMENT) {
- if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
- $attr = $reader->moveToFirstAttribute();
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ if ($reader->nodeType != XMLREADER::END_ELEMENT) {
+ if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
+ $attr = $reader->moveToFirstAttribute();
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- if ($reader->getAttribute($reader->name) == $reader->value) {
- echo "1st attr (num) failed\n";
- }
+ if ($reader->getAttribute($reader->name) == $reader->value) {
+ echo "1st attr (num) failed\n";
+ }
- $attr = $reader->moveToNextAttribute();
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ $attr = $reader->moveToNextAttribute();
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- if ($reader->getAttribute($reader->name) == $reader->value) {
- echo "2nd attr (idx) failed\n";
- }
+ if ($reader->getAttribute($reader->name) == $reader->value) {
+ echo "2nd attr (idx) failed\n";
+ }
- // Named attribute
- $attr = $reader->moveToAttribute('num');
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ // Named attribute
+ $attr = $reader->moveToAttribute('num');
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- if ($reader->getAttribute('num') == $reader->value) {
- echo "attr num failed\n";
- }
+ if ($reader->getAttribute('num') == $reader->value) {
+ echo "attr num failed\n";
+ }
- $attr = $reader->moveToAttribute('idx');
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ $attr = $reader->moveToAttribute('idx');
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- if ($reader->getAttribute('idx') == $reader->value) {
- echo "attr idx failed\n";
- }
+ if ($reader->getAttribute('idx') == $reader->value) {
+ echo "attr idx failed\n";
+ }
- // Numeric positions of attributes
- $attr = $reader->moveToAttributeNo(0);
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ // Numeric positions of attributes
+ $attr = $reader->moveToAttributeNo(0);
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- if ($reader->getAttributeNo(0) == $reader->value) {
- echo "attr 0 failed\n";
- }
+ if ($reader->getAttributeNo(0) == $reader->value) {
+ echo "attr 0 failed\n";
+ }
- $attr = $reader->moveToAttributeNo(1);
- echo $reader->name . ": ";
- echo $reader->value . "\n";
+ $attr = $reader->moveToAttributeNo(1);
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
- }
- }
+ }
+ }
}
$reader->close();
unlink($filename);
?>
-===DONE===
--EXPECT--
num: 1
idx: 2
@@ -80,4 +79,3 @@ num: 1
idx: 2
num: 1
idx: 2
-===DONE===
diff --git a/ext/xmlreader/tests/003-move-errors.phpt b/ext/xmlreader/tests/003-move-errors.phpt
index 0f21a2747b..a00dbaf524 100644
--- a/ext/xmlreader/tests/003-move-errors.phpt
+++ b/ext/xmlreader/tests/003-move-errors.phpt
@@ -56,7 +56,6 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/003-move-errors.xml');
@@ -73,4 +72,3 @@ bool(false)
num: 1
bool(false)
book
-===DONE===
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index ae255220b3..c52c932c97 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -12,70 +12,69 @@ file_put_contents($filename, $xmlstring);
$reader = new XMLReader();
if (!$reader->open($filename)) {
- exit();
+ exit();
}
// Only go through
while ($reader->read()) {
- if ($reader->nodeType != XMLREADER::END_ELEMENT) {
- if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
- $attr = $reader->moveToFirstAttribute();
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- if ($reader->getAttribute($reader->name) == $reader->value) {
- echo "1st attr (num) failed\n";
- }
-
-
- $attr = $reader->moveToNextAttribute();
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- if ($reader->getAttribute($reader->name) == $reader->value) {
- echo "2nd attr (idx) failed\n";
- }
-
- // Named attribute
- $attr = $reader->moveToAttribute('num');
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- if ($reader->getAttribute('num') == $reader->value) {
- echo "attr num failed\n";
- }
-
- $attr = $reader->moveToAttribute('idx');
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- if ($reader->getAttribute('idx') == $reader->value) {
- echo "attr idx failed\n";
- }
-
- // Numeric positions of attributes
- $attr = $reader->moveToAttributeNo(0);
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- if ($reader->getAttributeNo(0) == $reader->value) {
- echo "attr 0 failed\n";
- }
-
- $attr = $reader->moveToAttributeNo(1);
- echo $reader->name . ": ";
- echo $reader->value . "\n";
-
- var_dump($reader->moveToAttributeNo(20));
- var_dump($reader->moveToAttribute('missing-attribute'));
- var_dump($reader->moveToAttribute(''));
- }
- }
+ if ($reader->nodeType != XMLREADER::END_ELEMENT) {
+ if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
+ $attr = $reader->moveToFirstAttribute();
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ if ($reader->getAttribute($reader->name) == $reader->value) {
+ echo "1st attr (num) failed\n";
+ }
+
+
+ $attr = $reader->moveToNextAttribute();
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ if ($reader->getAttribute($reader->name) == $reader->value) {
+ echo "2nd attr (idx) failed\n";
+ }
+
+ // Named attribute
+ $attr = $reader->moveToAttribute('num');
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ if ($reader->getAttribute('num') == $reader->value) {
+ echo "attr num failed\n";
+ }
+
+ $attr = $reader->moveToAttribute('idx');
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ if ($reader->getAttribute('idx') == $reader->value) {
+ echo "attr idx failed\n";
+ }
+
+ // Numeric positions of attributes
+ $attr = $reader->moveToAttributeNo(0);
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ if ($reader->getAttributeNo(0) == $reader->value) {
+ echo "attr 0 failed\n";
+ }
+
+ $attr = $reader->moveToAttributeNo(1);
+ echo $reader->name . ": ";
+ echo $reader->value . "\n";
+
+ var_dump($reader->moveToAttributeNo(20));
+ var_dump($reader->moveToAttribute('missing-attribute'));
+ var_dump($reader->moveToAttribute(''));
+ }
+ }
}
$reader->close();
unlink($filename);
?>
-===DONE===
--EXPECTF--
num: 1
idx: 2
@@ -88,4 +87,3 @@ bool(false)
Warning: XMLReader::moveToAttribute(): Attribute Name is required in %s on line %d
bool(false)
-===DONE===
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index 915a14bccf..9362c2b1a1 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -12,26 +12,25 @@ file_put_contents($filename, $xmlstring);
$reader = new XMLReader();
if (!$reader->open($filename)) {
- exit();
+ exit();
}
while ($reader->read()) {
- if ($reader->nodeType != XMLREADER::END_ELEMENT) {
- echo $reader->name."\n";
- if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
- $attr = $reader->moveToFirstAttribute();
- while ($attr) {
- echo " Attribute Name: ".$reader->name."\n";
- echo " Attribute Value: ".$reader->value."\n";
- $attr = $reader->moveToNextAttribute();
- }
- }
- }
+ if ($reader->nodeType != XMLREADER::END_ELEMENT) {
+ echo $reader->name."\n";
+ if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
+ $attr = $reader->moveToFirstAttribute();
+ while ($attr) {
+ echo " Attribute Name: ".$reader->name."\n";
+ echo " Attribute Value: ".$reader->value."\n";
+ $attr = $reader->moveToNextAttribute();
+ }
+ }
+ }
}
$reader->close();
unlink($filename);
?>
-===DONE===
--EXPECT--
books
book
@@ -40,4 +39,3 @@ book
Attribute Name: idx
Attribute Value: 2
#text
-===DONE===
diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt
index ea34f89108..e50b840ef5 100644
--- a/ext/xmlreader/tests/005.phpt
+++ b/ext/xmlreader/tests/005.phpt
@@ -17,20 +17,18 @@ $a = $reader->setParserProperty(XMLReader::LOADDTD, false);
$b = $reader->getParserProperty(XMLReader::LOADDTD);
if (!$a && !$b) {
- echo "ok\n";
+ echo "ok\n";
}
$a = $reader->setParserProperty(XMLReader::SUBST_ENTITIES, true);
$b = $reader->getParserProperty(XMLReader::SUBST_ENTITIES);
if ($a && $b) {
- echo "ok\n";
+ echo "ok\n";
}
// Only go through
while ($reader->read());
$reader->close();
?>
-===DONE===
--EXPECT--
ok
-===DONE===
diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt
index fce705c262..9702e28270 100644
--- a/ext/xmlreader/tests/006.phpt
+++ b/ext/xmlreader/tests/006.phpt
@@ -17,19 +17,17 @@ $reader->read();
$reader->read();
if ($reader->nodeType != XMLREADER::END_ELEMENT) {
- if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
- $attr = $reader->moveToFirstAttribute();
- if ($reader->moveToElement()) {
- if ($reader->name == 'book') {
- echo "ok\n";
- }
- }
- }
+ if ($reader->nodeType == XMLREADER::ELEMENT && $reader->hasAttributes) {
+ $attr = $reader->moveToFirstAttribute();
+ if ($reader->moveToElement()) {
+ if ($reader->name == 'book') {
+ echo "ok\n";
+ }
+ }
+ }
}
$reader->close();
?>
-===DONE===
--EXPECT--
ok
-===DONE===
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index 88e8800054..796b9fa05c 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -43,14 +43,12 @@ $reader = new XMLReader();
$reader->XML($xmlstring);
if ($reader->setRelaxNGSchema('')) {
- echo 'failed';
+ echo 'failed';
}
$reader->close();
?>
-===DONE===
--EXPECTF--
file relaxNG: ok
string relaxNG: ok
Warning: XMLReader::setRelaxNGSchema(): Schema data source is required in %s on line %d
-===DONE===
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index ceb0972376..12361a0efc 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -32,7 +32,7 @@ $reader->setParserProperty(XMLREADER::LOADDTD, TRUE);
$reader->setParserProperty(XMLREADER::VALIDATE, TRUE);
while($reader->read());
if ($reader->isValid()) {
- echo "file DTD: ok\n";
+ echo "file DTD: ok\n";
}
$reader->close();
unlink($file);
@@ -60,11 +60,9 @@ $reader->setParserProperty(XMLREADER::LOADDTD, TRUE);
$reader->setParserProperty(XMLREADER::VALIDATE, TRUE);
while($reader->read());
if ($reader->isValid()) {
- echo "string DTD: ok\n";
+ echo "string DTD: ok\n";
}
?>
-===DONE===
--EXPECT--
file DTD: ok
string DTD: ok
-===DONE===
diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt
index e988563b42..d626ea6f35 100644
--- a/ext/xmlreader/tests/009.phpt
+++ b/ext/xmlreader/tests/009.phpt
@@ -21,7 +21,5 @@ echo " ";
echo $reader->getAttribute('num');
echo "\n";
?>
-===DONE===
--EXPECT--
book 2
-===DONE===
diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt
index 4a1ebe174e..1ad864b59c 100644
--- a/ext/xmlreader/tests/010.phpt
+++ b/ext/xmlreader/tests/010.phpt
@@ -20,7 +20,5 @@ echo " ";
echo $reader->getAttributeNs('isbn', 'uri');
echo "\n";
?>
-===DONE===
--EXPECT--
prefix:books 12isbn
-===DONE===
diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt
index 658c37f03b..3cf704b234 100644
--- a/ext/xmlreader/tests/011.phpt
+++ b/ext/xmlreader/tests/011.phpt
@@ -26,8 +26,6 @@ echo $reader->readOuterXml();
echo "\n";
$reader->close();
?>
-===DONE===
--EXPECT--
<book>test</book>
<books><book>test</book></books>
-===DONE===
diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index ba4455ade7..20d26eaa4b 100644
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -25,7 +25,7 @@ EOF;
$xmlstring = str_replace('012.dtd', __DIR__.'/012.dtd', $xmlstring);
if (DIRECTORY_SEPARATOR == '\\') {
- $xmlstring = str_replace('\\',"/", $xmlstring);
+ $xmlstring = str_replace('\\',"/", $xmlstring);
}
$reader = new XMLReader();
$reader->XML($xmlstring);
@@ -39,7 +39,7 @@ echo "\nUsing URI:\n";
$reader = new XMLReader();
$file = __DIR__ . '/012.xml';
if (DIRECTORY_SEPARATOR == '\\') {
- $file = str_replace('\\',"/", $file);
+ $file = str_replace('\\',"/", $file);
}
$reader->open($file);
@@ -59,7 +59,6 @@ var_dump($reader->getAttribute('baz'));
$reader->close();
?>
-===DONE===
--EXPECT--
string(0) ""
NULL
@@ -71,4 +70,3 @@ string(0) ""
NULL
string(0) ""
string(0) ""
-===DONE===
diff --git a/ext/xmlreader/tests/013.phpt b/ext/xmlreader/tests/013.phpt
index bceccced6b..1396485e9a 100644
--- a/ext/xmlreader/tests/013.phpt
+++ b/ext/xmlreader/tests/013.phpt
@@ -18,10 +18,10 @@ $reader = new XMLReader();
$reader->XML($xml);
$reader->setSchema(__DIR__ . '/013.xsd');
while($reader->read()) {
- if ($reader->nodeType == XMLReader::ELEMENT && $reader->name == 'item') {
- $reader->read();
- var_dump($reader->value);
- }
+ if ($reader->nodeType == XMLReader::ELEMENT && $reader->name == 'item') {
+ $reader->read();
+ var_dump($reader->value);
+ }
}
$reader->close();
@@ -41,11 +41,9 @@ while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
$reader->close();
?>
-===DONE===
--EXPECTF--
string(3) "123"
string(3) "456"
===FAIL===
Warning: XMLReader::read(): Element 'foo': %s
-===DONE===
diff --git a/ext/xmlreader/tests/014.phpt b/ext/xmlreader/tests/014.phpt
index 5969da62f2..fca94d2b1f 100644
--- a/ext/xmlreader/tests/014.phpt
+++ b/ext/xmlreader/tests/014.phpt
@@ -37,7 +37,6 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/_014.xml');
@@ -48,4 +47,3 @@ Warning: main(): Cannot write to read-only property in %s on line %d
Warning: main(): Cannot write to read-only property in %s on line %d
Warning: main(): Cannot write to read-only property in %s on line %d
-===DONE===
diff --git a/ext/xmlreader/tests/015-get-errors.phpt b/ext/xmlreader/tests/015-get-errors.phpt
index 06f7eef53b..5f17326b1b 100644
--- a/ext/xmlreader/tests/015-get-errors.phpt
+++ b/ext/xmlreader/tests/015-get-errors.phpt
@@ -37,7 +37,6 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/015-get-errors.xml');
@@ -46,4 +45,3 @@ unlink(__DIR__.'/015-get-errors.xml');
Warning: XMLReader::getAttributeNs(): Attribute Name and Namespace URI cannot be empty in %s on line %d
bool(false)
ns1:num: 1
-===DONE===
diff --git a/ext/xmlreader/tests/015-move-errors.phpt b/ext/xmlreader/tests/015-move-errors.phpt
index ab2472258f..5263b555b6 100644
--- a/ext/xmlreader/tests/015-move-errors.phpt
+++ b/ext/xmlreader/tests/015-move-errors.phpt
@@ -32,11 +32,9 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/015-move-errors.xml');
?>
--EXPECTF--
Warning: XMLReader::moveToAttributeNs(): Attribute Name and Namespace URI cannot be empty in %s on line %d
-===DONE===
diff --git a/ext/xmlreader/tests/015.phpt b/ext/xmlreader/tests/015.phpt
index b60d1395c8..a11da78fe5 100644
--- a/ext/xmlreader/tests/015.phpt
+++ b/ext/xmlreader/tests/015.phpt
@@ -52,7 +52,6 @@ while ($reader->read()) {
// clean up
$reader->close();
?>
-===DONE===
--CLEAN--
<?php
unlink(__DIR__.'/015.xml');
@@ -63,4 +62,3 @@ ns2:idx: 2
ns2:isbn: 4
Attribute does not exist
ns2:isbn: 4
-===DONE===
diff --git a/ext/xmlreader/tests/bug64230.phpt b/ext/xmlreader/tests/bug64230.phpt
index fb1ab4932f..b584d8f7cf 100644
--- a/ext/xmlreader/tests/bug64230.phpt
+++ b/ext/xmlreader/tests/bug64230.phpt
@@ -9,10 +9,10 @@ extension_loaded("xmlreader") or die("skip requires xmlreader");
echo "Test\n";
function show_internal_errors() {
- foreach (libxml_get_errors() as $error) {
- printf("Internal: %s\n", $error->message);
- }
- libxml_clear_errors();
+ foreach (libxml_get_errors() as $error) {
+ printf("Internal: %s\n", $error->message);
+ }
+ libxml_clear_errors();
}
echo "Internal errors TRUE\n";
diff --git a/ext/xmlreader/tests/bug71805.phpt b/ext/xmlreader/tests/bug71805.phpt
index 6f54b1347a..9fc66ea2a4 100644
--- a/ext/xmlreader/tests/bug71805.phpt
+++ b/ext/xmlreader/tests/bug71805.phpt
@@ -9,31 +9,29 @@ TestXML(__DIR__ . DIRECTORY_SEPARATOR . 'XMLReaderGood_bug71805.xml');
TestXML(__DIR__ . DIRECTORY_SEPARATOR . 'XMLReaderBad_bug71805.xml');
function TestXML($file) {
- $XR = new XMLReader;
- $XR->open($file, null, LIBXML_NOBLANKS);
+ $XR = new XMLReader;
+ $XR->open($file, null, LIBXML_NOBLANKS);
- while (($lastRead = $XR->read()) && ($XR->name !== 'records'));
- while (($lastRead = $XR->read()) && ($XR->name !== 'record'));
- while ($lastRead) {
- $xml = $XR->readOuterXML();
- if ($xml === '') {
- $err = '';
- if ($e = libxml_get_last_error()) { $err = $e->message.' (line: '.$e->line.')'; }
- $XR->close();
- echo $file.' : Problem with file'.($err ? ' — '.$err : '').'.';
- echo "\n";
- return;
- }
- while (($lastRead = $XR->next()) && ($XR->name !== 'record'));
- }
- $XR->close();
- echo $file.' : Good!';
- echo "\n";
- return;
+ while (($lastRead = $XR->read()) && ($XR->name !== 'records'));
+ while (($lastRead = $XR->read()) && ($XR->name !== 'record'));
+ while ($lastRead) {
+ $xml = $XR->readOuterXML();
+ if ($xml === '') {
+ $err = '';
+ if ($e = libxml_get_last_error()) { $err = $e->message.' (line: '.$e->line.')'; }
+ $XR->close();
+ echo $file.' : Problem with file'.($err ? ' — '.$err : '').'.';
+ echo "\n";
+ return;
+ }
+ while (($lastRead = $XR->next()) && ($XR->name !== 'record'));
+ }
+ $XR->close();
+ echo $file.' : Good!';
+ echo "\n";
+ return;
}
?>
-===DONE===
--EXPECTF--
%sXMLReaderGood_bug71805.xml : Good!
%sXMLReaderBad_bug71805.xml : Good!
-===DONE===
diff --git a/ext/xmlreader/tests/bug73053.phpt b/ext/xmlreader/tests/bug73053.phpt
index 4a7ace50eb..b22afb7afa 100644
--- a/ext/xmlreader/tests/bug73053.phpt
+++ b/ext/xmlreader/tests/bug73053.phpt
@@ -15,7 +15,5 @@ var_dump($xml->open($xmlfile, null, LIBXML_PARSEHUGE));
$xml->setSchema($xsdfile);
while($xml->read());
?>
-===DONE===
--EXPECT--
bool(true)
-===DONE===
diff --git a/ext/xmlreader/tests/bug74457.phpt b/ext/xmlreader/tests/bug74457.phpt
index 17ed5c5c69..1217021ff5 100644
--- a/ext/xmlreader/tests/bug74457.phpt
+++ b/ext/xmlreader/tests/bug74457.phpt
@@ -8,8 +8,6 @@ $rm = new ReflectionMethod(XMLReader::class, 'expand');
var_dump($rm->getNumberOfParameters());
var_dump($rm->getNumberOfRequiredParameters());
?>
-===DONE===
--EXPECT--
int(1)
int(0)
-===DONE===
diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt
index 3d9b0a53c3..d63e6e0d6d 100644
--- a/ext/xmlreader/tests/expand.phpt
+++ b/ext/xmlreader/tests/expand.phpt
@@ -31,7 +31,5 @@ while ($reader->read()) {
}
$reader->close();
?>
-===DONE===
--EXPECT--
base book
-===DONE===
diff --git a/ext/xmlreader/tests/static.phpt b/ext/xmlreader/tests/static.phpt
new file mode 100644
index 0000000000..a722e31105
--- /dev/null
+++ b/ext/xmlreader/tests/static.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Calling XMLReader::open() and ::XML() statically
+--SKIPIF--
+<?php
+if (!extension_loaded("xmlreader")) die('skip xmlreader extension not available');
+?>
+--FILE--
+<?php
+$filename = __DIR__ . '/static.xml';
+
+$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
+<books></books>';
+file_put_contents($filename, $xmlstring);
+
+$reader = XMLReader::open($filename);
+while ($reader->read()) {
+ echo $reader->name, "\n";
+}
+
+$reader = XMLReader::XML($xmlstring);
+while ($reader->read()) {
+ echo $reader->name, "\n";
+}
+?>
+--EXPECT--
+books
+books
+books
+books
+--CLEAN--
+<?php
+unlink(__DIR__ . '/static.xml');
+?>