Skip to content

Commit 792763e

Browse files
committed
ext/xmlwriter: applied fixers to improve test robustness
1 parent 588dd04 commit 792763e

6 files changed

Lines changed: 13 additions & 13 deletions

ext/xmlwriter/tests/010.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ var_dump(xmlwriter_end_attribute($xw));
1616
try {
1717
xmlwriter_start_attribute($xw, "-1");
1818
} catch (ValueError $e) {
19-
echo $e->getMessage(), "\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121

2222
var_dump(xmlwriter_end_attribute($xw));
2323

2424
try {
2525
xmlwriter_start_attribute($xw, "\"");
2626
} catch (ValueError $e) {
27-
echo $e->getMessage(), "\n";
27+
echo $e::class, ': ', $e->getMessage(), "\n";
2828
}
2929

3030
var_dump(xmlwriter_end_attribute($xw));
@@ -45,9 +45,9 @@ echo "Done\n";
4545
bool(true)
4646
bool(true)
4747
bool(true)
48-
xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, "-1" given
48+
ValueError: xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, "-1" given
4949
bool(false)
50-
xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, """ given
50+
ValueError: xmlwriter_start_attribute(): Argument #2 ($name) must be a valid attribute name, """ given
5151
bool(false)
5252
bool(true)
5353
string(14) "<tag attr=""/>"

ext/xmlwriter/tests/gh21682.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ try {
99
serialize($w);
1010
echo "ERROR: should have thrown\n";
1111
} catch (\Exception $e) {
12-
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
12+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1313
}
1414
?>
1515
--EXPECT--

ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ xmlwriter
77
try {
88
xmlwriter_open_uri('');
99
} catch (ValueError $exception) {
10-
echo $exception->getMessage() . "\n";
10+
echo $exception::class, ': ', $exception->getMessage(), "\n";
1111
}
1212
?>
1313
--CREDITS--
1414
Koen Kuipers koenk82@gmail.com
1515
Theo van der Zee
1616
#Test Fest Utrecht 09-05-2009
1717
--EXPECT--
18-
xmlwriter_open_uri(): Argument #1 ($uri) must not be empty
18+
ValueError: xmlwriter_open_uri(): Argument #1 ($uri) must not be empty

ext/xmlwriter/tests/xmlwriter_toMemory_custom_constructor_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class CustomXMLWriter extends XMLWriter {
1414
try {
1515
CustomXMLWriter::toMemory();
1616
} catch (Throwable $e) {
17-
echo $e->getMessage(), "\n";
17+
echo $e::class, ': ', $e->getMessage(), "\n";
1818
}
1919

2020
?>
2121
--EXPECT--
22-
nope
22+
Error: nope

ext/xmlwriter/tests/xmlwriter_toStream_custom_constructor_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ $h = fopen("php://output", "w");
1616
try {
1717
CustomXMLWriter::toStream($h);
1818
} catch (Throwable $e) {
19-
echo $e->getMessage(), "\n";
19+
echo $e::class, ': ', $e->getMessage(), "\n";
2020
}
2121

2222
?>
2323
--EXPECT--
24-
nope
24+
Error: nope

ext/xmlwriter/tests/xmlwriter_toStream_open_invalidated_stream.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ fclose($h);
1111
try {
1212
XMLWriter::toStream($h);
1313
} catch (TypeError $e) {
14-
echo $e->getMessage(), "\n";
14+
echo $e::class, ': ', $e->getMessage(), "\n";
1515
}
1616

1717
?>
1818
--EXPECT--
19-
XMLWriter::toStream(): supplied resource is not a valid stream resource
19+
TypeError: XMLWriter::toStream(): supplied resource is not a valid stream resource

0 commit comments

Comments
 (0)