libxml test fixes

Author: nikic

ext/libxml/tests/001.phpt

@@ -8,7 +8,6 @@ libxml_use_internal_errors()
 var_dump(libxml_use_internal_errors(false));
 var_dump(libxml_use_internal_errors(true));
 var_dump(libxml_use_internal_errors());
-var_dump(libxml_use_internal_errors(new stdclass));
 
 var_dump(libxml_get_errors());
 var_dump(libxml_get_last_error());
@@ -17,13 +16,10 @@ var_dump(libxml_clear_errors());
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
 bool(false)
 bool(true)
-
-Warning: libxml_use_internal_errors() expects parameter 1 to be bool, object given in %s001.php on line 6
-NULL
 array(0) {
 }
 bool(false)

ext/libxml/tests/004.phpt

@@ -18,7 +18,11 @@ $ctxs = array(
 
 
 foreach ($ctxs as $ctx) {
-	var_dump(libxml_set_streams_context($ctx));
+	try {
+        var_dump(libxml_set_streams_context($ctx));
+    } catch (TypeError $e) {
+        echo $e->getMessage(), "\n";
+    }
 	$dom = new DOMDocument();
 	var_dump($dom->load(dirname(__FILE__).'/test.xml'));
 }
@@ -28,25 +32,15 @@ echo "Done\n";
 ?>
 --EXPECTF--
 Warning: stream_context_create(): options should have the form ["wrappername"]["optionname"] = $value in %s004.php on line %d
-
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, null given in %s004.php on line %d
-NULL
+libxml_set_streams_context() expects parameter 1 to be resource, null given
 bool(true)
-
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, string given in %s004.php on line %d
-NULL
+libxml_set_streams_context() expects parameter 1 to be resource, string given
 bool(true)
-
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, int given in %s004.php on line %d
-NULL
+libxml_set_streams_context() expects parameter 1 to be resource, int given
 bool(true)
-
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, object given in %s004.php on line %d
-NULL
+libxml_set_streams_context() expects parameter 1 to be resource, object given
 bool(true)
-
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, array given in %s004.php on line %d
-NULL
+libxml_set_streams_context() expects parameter 1 to be resource, array given
 bool(true)
 NULL
 bool(true)

ext/libxml/tests/bug63389.phpt

@@ -6,9 +6,13 @@ Bug #63389 (Missing context check on libxml_set_streams_context() causes memleak
 <?php
 $fp = fopen("php://input", "r");
 libxml_set_streams_context($fp);
-libxml_set_streams_context("a");
+try {
+    libxml_set_streams_context("a");
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 echo "okey";
 ?>
---EXPECTF--
-Warning: libxml_set_streams_context() expects parameter 1 to be resource, string given in %sbug63389.php on line %d
+--EXPECT--
+libxml_set_streams_context() expects parameter 1 to be resource, string given
 okey

ext/libxml/tests/libxml_set_external_entity_loader_error1.phpt

@@ -12,10 +12,6 @@ XML;
 $dd = new DOMDocument;
 $r = $dd->loadXML($xml);
 
-var_dump(libxml_set_external_entity_loader([]));
-var_dump(libxml_set_external_entity_loader());
-var_dump(libxml_set_external_entity_loader(function() {}, 2));
-
 var_dump(libxml_set_external_entity_loader(function($a, $b, $c, $d) {}));
 try {
 	var_dump($dd->validate());
@@ -25,14 +21,6 @@ try {
 
 echo "Done.\n";
 --EXPECTF--
-Warning: libxml_set_external_entity_loader() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: libxml_set_external_entity_loader() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: libxml_set_external_entity_loader() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
 bool(true)
 
 Warning: DOMDocument::validate(): Could not load the external subset "http://example.com/foobar" in %s on line %d