ext/xmlreader: applied fixers to improve test robustness

ext/xmlreader/tests/001.phpt

@@ -21,11 +21,11 @@ $reader = new XMLReader();
 try {
     $reader->XML($xmlstring);
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 books
 books
-XMLReader::XML(): Argument #1 ($source) must not be empty
+ValueError: XMLReader::XML(): Argument #1 ($source) must not be empty

ext/xmlreader/tests/002.phpt

@@ -13,7 +13,7 @@ $reader = new XMLReader();
 try {
     $reader->open('');
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 $reader = new XMLReader();
@@ -36,6 +36,6 @@ unlink($filename);
 
 ?>
 --EXPECT--
-XMLReader::open(): Argument #1 ($uri) must not be empty
+ValueError: XMLReader::open(): Argument #1 ($uri) must not be empty
 books
 books

ext/xmlreader/tests/003-get-errors.phpt

@@ -34,7 +34,7 @@ while ($reader->read()) {
             try {
                 $reader->getAttribute('');
             } catch (ValueError $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
 
             // Ensure that node pointer has not changed position
@@ -69,7 +69,7 @@ unlink(__DIR__.'/003-get-errors.xml');
 book
 bool(true)
 num: 1
-XMLReader::getAttribute(): Argument #1 ($name) must not be empty
+ValueError: XMLReader::getAttribute(): Argument #1 ($name) must not be empty
 num: 1
 NULL
 num: 1

ext/xmlreader/tests/003-move-errors.phpt

@@ -34,7 +34,7 @@ while ($reader->read()) {
             try {
                 $reader->moveToAttribute('');
             } catch (ValueError $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
 
             // Ensure that node pointer has not changed position
@@ -68,7 +68,7 @@ unlink(__DIR__.'/003-move-errors.xml');
 book
 bool(true)
 num: 1
-XMLReader::moveToAttribute(): Argument #1 ($name) must not be empty
+ValueError: XMLReader::moveToAttribute(): Argument #1 ($name) must not be empty
 num: 1
 bool(false)
 num: 1

ext/xmlreader/tests/003.phpt

@@ -71,7 +71,7 @@ while ($reader->read()) {
             try {
                 $reader->moveToAttribute('');
             } catch (ValueError $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
         }
     }
@@ -88,4 +88,4 @@ num: 1
 idx: 2
 bool(false)
 bool(false)
-XMLReader::moveToAttribute(): Argument #1 ($name) must not be empty
+ValueError: XMLReader::moveToAttribute(): Argument #1 ($name) must not be empty

ext/xmlreader/tests/007.phpt

@@ -45,12 +45,12 @@ $reader->XML($xmlstring);
 try {
     $reader->setRelaxNGSchema('');
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 $reader->close();
 ?>
 --EXPECT--
 file relaxNG: ok
 string relaxNG: ok
-XMLReader::setRelaxNGSchema(): Argument #1 ($filename) must not be empty
+ValueError: XMLReader::setRelaxNGSchema(): Argument #1 ($filename) must not be empty

ext/xmlreader/tests/014.phpt

@@ -27,20 +27,20 @@ while ($reader->read()) {
             try {
                 $reader->value = 'movie1';
             } catch (Error $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
             // Try to set the value of the first "num" attribute from "1" to "num attribute 1"
             $attr = $reader->moveToFirstAttribute();
             try {
                 $reader->value = 'num attribute 1';
             } catch (Error $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
             // Try to set the name of the first attribute from "num" to "number"
             try {
                 $reader->name = 'number';
             } catch (Error $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
         }
     }
@@ -54,6 +54,6 @@ $reader->close();
 unlink(__DIR__.'/_014.xml');
 ?>
 --EXPECT--
-Cannot modify readonly property XMLReader::$value
-Cannot modify readonly property XMLReader::$value
-Cannot modify readonly property XMLReader::$name
+Error: Cannot modify readonly property XMLReader::$value
+Error: Cannot modify readonly property XMLReader::$value
+Error: Cannot modify readonly property XMLReader::$name

ext/xmlreader/tests/015-get-errors.phpt

@@ -29,7 +29,7 @@ while ($reader->read()) {
             try {
                 $attr = $reader->getAttributeNs('idx', null);
             } catch (ValueError $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
 
             echo $reader->name . ": ";
@@ -47,5 +47,5 @@ unlink(__DIR__.'/015-get-errors.xml');
 ?>
 --EXPECTF--
 Deprecated: XMLReader::getAttributeNs(): Passing null to parameter #2 ($namespace) of type string is deprecated in %s on line %d
-XMLReader::getAttributeNs(): Argument #2 ($namespace) must not be empty
+ValueError: XMLReader::getAttributeNs(): Argument #2 ($namespace) must not be empty
 ns1:num: 1

ext/xmlreader/tests/015-move-errors.phpt

@@ -27,7 +27,7 @@ while ($reader->read()) {
             try {
                 $reader->moveToAttributeNs('idx', null);
             } catch (ValueError $exception) {
-                echo $exception->getMessage() . "\n";
+                echo $exception::class, ': ', $exception->getMessage(), "\n";
             }
         }
     }
@@ -42,4 +42,4 @@ unlink(__DIR__.'/015-move-errors.xml');
 ?>
 --EXPECTF--
 Deprecated: XMLReader::moveToAttributeNs(): Passing null to parameter #2 ($namespace) of type string is deprecated in %s on line %d
-XMLReader::moveToAttributeNs(): Argument #2 ($namespace) must not be empty
+ValueError: XMLReader::moveToAttributeNs(): Argument #2 ($namespace) must not be empty

ext/xmlreader/tests/bug51936.phpt

@@ -14,7 +14,7 @@ try {
     $xmlreader2 = clone $xmlreader;
     $xmlreader2->next();
 } catch (Throwable $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
 ?>

ext/xmlreader/tests/bug73246.phpt

@@ -8,20 +8,20 @@ $reader = new XMLReader();
 try {
     $reader->open(__FILE__, "UTF\0-8");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $reader->XML('<?xml version="1.0"?><root/>', "UTF\0-8");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     XMLReader::fromStream(fopen('php://memory', 'r'), encoding: "UTF\0-8");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-XMLReader::open(): Argument #2 ($encoding) must not contain any null bytes
-XMLReader::XML(): Argument #2 ($encoding) must not contain any null bytes
-XMLReader::fromStream(): Argument #2 ($encoding) must not contain any null bytes
+ValueError: XMLReader::open(): Argument #2 ($encoding) must not contain any null bytes
+ValueError: XMLReader::XML(): Argument #2 ($encoding) must not contain any null bytes
+ValueError: XMLReader::fromStream(): Argument #2 ($encoding) must not contain any null bytes

ext/xmlreader/tests/bug81521.phpt

@@ -8,14 +8,14 @@ $reader = new XMLReader();
 try {
     var_dump($reader->setParserProperty(XMLReader::LOADDTD, 1));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump($reader->getParserProperty(XMLReader::LOADDTD));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Cannot access parser properties before loading data
-Cannot access parser properties before loading data
+Error: Cannot access parser properties before loading data
+Error: Cannot access parser properties before loading data

ext/xmlreader/tests/expand_error.phpt

@@ -18,7 +18,7 @@ $reader = new XMLReader();
 try {
     $reader->expand();
 } catch (Error $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 $reader->close();
@@ -29,7 +29,7 @@ var_dump($reader->expand());
 $reader->close();
 ?>
 --EXPECTF--
-Data must be loaded before expanding
+Error: Data must be loaded before expanding
 
 Warning: XMLReader::expand(): An Error Occurred while expanding in %s on line %d
 bool(false)

ext/xmlreader/tests/fromStream_custom_constructor.phpt

@@ -21,7 +21,7 @@ $reader = CustomXMLReader::fromStream($h, encoding: "UTF-8");
 try {
     var_dump($reader);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($reader->read());
 var_dump($reader->nodeType);
@@ -60,6 +60,6 @@ object(CustomXMLReader)#%d (14) {
   ["xmlLang"]=>
   string(0) ""
 }
-Failed to read property because no XML data has been read yet
+Error: Failed to read property because no XML data has been read yet
 bool(true)
 int(1)

ext/xmlreader/tests/fromStream_custom_constructor_error.phpt

@@ -17,10 +17,10 @@ fseek($h, 0);
 try {
     CustomXMLReader::fromStream($h, encoding: "UTF-8");
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 fclose($h);
 ?>
 --EXPECT--
-nope
+Error: nope

ext/xmlreader/tests/fromString_custom_constructor.phpt

@@ -17,7 +17,7 @@ $reader = CustomXMLReader::fromString("<root/>");
 try {
     var_dump($reader);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($reader->read());
 var_dump($reader->nodeType);
@@ -54,6 +54,6 @@ object(CustomXMLReader)#%d (14) {
   ["xmlLang"]=>
   string(0) ""
 }
-Failed to read property because no XML data has been read yet
+Error: Failed to read property because no XML data has been read yet
 bool(true)
 int(1)

ext/xmlreader/tests/fromString_custom_constructor_error.phpt

@@ -13,8 +13,8 @@ class CustomXMLReader extends XMLReader {
 try {
     CustomXMLReader::fromString("<root/>");
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-nope
+Error: nope

ext/xmlreader/tests/fromUri_custom_constructor_error.phpt

@@ -13,7 +13,7 @@ class CustomXMLReader extends XMLReader {
 try {
     CustomXMLReader::fromUri("nonexistent");
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $filename = __DIR__ . '/_fromUri_custom_constructor_error.xml';
@@ -24,12 +24,12 @@ file_put_contents($filename, $xmlstring);
 try {
     CustomXMLReader::fromUri($filename);
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Unable to open source data
-nope
+Error: Unable to open source data
+Error: nope
 --CLEAN--
 <?php
 @unlink(__DIR__ . '/_fromUri_custom_constructor_error.xml');

ext/xmlreader/tests/gh21682.phpt

@@ -9,7 +9,7 @@ try {
     serialize($r);
     echo "ERROR: should have thrown\n";
 } catch (\Exception $e) {
-    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 ?>
 --EXPECT--

ext/xmlreader/tests/invalid_encoding.phpt

@@ -8,24 +8,24 @@ $reader = new XMLReader();
 try {
     $reader->open(__FILE__, "does not exist");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $h = fopen("php://memory", "w+");
 try {
     XMLReader::fromStream($h, encoding: "does not exist");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 fclose($h);
 
 try {
     $reader->XML('<?xml version="1.0"?><root/>', "does not exist");
 } catch (ValueError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-XMLReader::open(): Argument #2 ($encoding) must be a valid character encoding
-XMLReader::fromStream(): Argument #2 ($encoding) must be a valid character encoding
-XMLReader::XML(): Argument #2 ($encoding) must be a valid character encoding
+ValueError: XMLReader::open(): Argument #2 ($encoding) must be a valid character encoding
+ValueError: XMLReader::fromStream(): Argument #2 ($encoding) must be a valid character encoding
+ValueError: XMLReader::XML(): Argument #2 ($encoding) must be a valid character encoding

ext/xmlreader/tests/next_basic.phpt

@@ -13,13 +13,13 @@ $reader = new XMLReader();
 try {
     $reader->read();
 } catch (Error $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 try {
     $reader->next();
 } catch (Error $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 $reader->close();
@@ -40,8 +40,8 @@ $reader->close();
 
 ?>
 --EXPECT--
-Data must be loaded before reading
-Data must be loaded before reading
+Error: Data must be loaded before reading
+Error: Data must be loaded before reading
 node1
 bool(true)
 node3

ext/xmlreader/tests/setParserProperty_error.phpt

@@ -13,9 +13,9 @@ $reader->XML($xml);
 try {
     $reader->setParserProperty(-1, true);
 } catch (ValueError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 $reader->close();
 ?>
 --EXPECT--
-XMLReader::setParserProperty(): Argument #1 ($property) must be a valid parser property
+ValueError: XMLReader::setParserProperty(): Argument #1 ($property) must be a valid parser property