Misc test updates

nikic · nikic · commit 7ae628a9ab03 · 2019-03-08T13:47:49.000+01:00
diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt
@@ -43,9 +43,6 @@ float(NAN)
 float(NAN)
 float(NAN)
 float(NAN)
-
-Warning: atanh() expects parameter 1 to be float, string given in %s on line %d
-NULL
 float(NAN)
 
 Notice: A non well formed numeric value encountered in %s on line %d
diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt
@@ -43,9 +43,6 @@ float(4872401723)
 float(4872401723)
 float(7641446995)
 float(7641446995)
-
-Warning: cosh() expects parameter 1 to be float, string given in %s on line %d
-NULL
 float(INF)
 
 Notice: A non well formed numeric value encountered in %s on line %d
diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt
@@ -10,13 +10,12 @@ $tests = array(null, 'foo');
 foreach ($tests as $q) {
 
     if ($q === null) {
-	do {
-	    $id = ftok(__FILE__, chr(mt_rand(0, 255)));
-	} while (msg_queue_exists($id));
+		do {
+			$id = ftok(__FILE__, chr(mt_rand(0, 255))); } while (msg_queue_exists($id));
+    }
 
 	$q = msg_get_queue($id) or die("Failed to create queue");
 	msg_remove_queue($q) or die("Failed to close queue");
-    }
 
     echo "Using '$q' as queue resource:\n";
 
@@ -50,22 +49,16 @@ bool(false)
 Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d
 bool(false)
 bool(true)
-Using 'foo' as queue resource:
-
-Warning: msg_set_queue() expects parameter 1 to be resource, string given in %s on line %d
+Using 'Resource id #5' as queue resource:
 bool(false)
-
-Warning: msg_stat_queue() expects parameter 1 to be resource, string given in %s on line %d
-bool(false)
-
-Warning: msg_receive() expects parameter 1 to be resource, string given in %s on line %d
 bool(false)
 bool(false)
+bool(true)
 
-Warning: msg_receive() expects parameter 1 to be resource, string given in %s on line %d
+Warning: msg_receive(): maximum size of the message has to be greater than zero in %s on line %d
 bool(false)
 
-Warning: msg_send() expects parameter 1 to be resource, string given in %s on line %d
-bool(false)
+Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d
 bool(false)
+bool(true)
 Done
diff --git a/ext/sysvshm/tests/001.phpt b/ext/sysvshm/tests/001.phpt
@@ -8,10 +8,6 @@ if (!function_exists('ftok')){ print 'skip'; }
 --FILE--
 <?php
 
-var_dump(ftok());
-var_dump(ftok(1));
-var_dump(ftok(1,1,1));
-
 var_dump(ftok("",""));
 var_dump(ftok(-1, -1));
 var_dump(ftok("qwertyu","qwertyu"));
@@ -23,15 +19,6 @@ var_dump(ftok(__FILE__,"q"));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: ftok() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: ftok() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: ftok() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
 Warning: ftok(): Pathname is invalid in %s on line %d
 int(-1)
 
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
@@ -10,19 +10,14 @@ if (!function_exists('ftok')){ print 'skip'; }
 
 $key = ftok(__FILE__, 't');
 
-var_dump(shm_attach());
-var_dump(shm_attach(1,2,3,4));
-
 var_dump(shm_attach(-1, 0));
 var_dump(shm_attach(0, -1));
 var_dump(shm_attach(123, -1));
-var_dump($s = shm_attach($key, -1));
-shm_remove($s);
-var_dump($s = shm_attach($key, 0));
-shm_remove($s);
+var_dump(shm_attach($key, -1));
+var_dump(shm_attach($key, 0));
 
 var_dump($s = shm_attach($key, 1024));
-shm_remove($key);
+shm_remove($s);
 var_dump($s = shm_attach($key, 1024));
 shm_remove($s);
 var_dump($s = shm_attach($key, 1024, 0666));
@@ -36,12 +31,6 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: shm_attach() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
 Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
@@ -54,15 +43,9 @@ bool(false)
 Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
 
-Warning: shm_remove() expects parameter 1 to be resource, bool given in %s on line %d
-
 Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
 bool(false)
-
-Warning: shm_remove() expects parameter 1 to be resource, bool given in %s on line %d
 resource(%d) of type (sysvshm)
-
-Warning: shm_remove() expects parameter 1 to be resource, int given in %s on line %d
 resource(%d) of type (sysvshm)
 resource(%d) of type (sysvshm)
 resource(%d) of type (sysvshm)
diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
@@ -10,19 +10,12 @@ if (!function_exists('ftok')){ print 'skip'; }
 
 $key = ftok(dirname(__FILE__)."/003.phpt", 'q');
 
-var_dump(shm_detach());
-var_dump(shm_detach(1,1));
-
 $s = shm_attach($key);
 
 var_dump(shm_detach($s));
 var_dump(shm_detach($s));
 shm_remove($s);
 
-var_dump(shm_detach(0));
-var_dump(shm_detach(1));
-var_dump(shm_detach(-1));
-
 echo "Done\n";
 ?>
 --CLEAN--
@@ -34,24 +27,10 @@ shm_remove($s);
 
 ?>
 --EXPECTF--
-Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on line %d
-NULL
-
-Warning: shm_detach() expects exactly 1 parameter, 2 given in %s003.php on line %d
-NULL
 bool(true)
 
 Warning: shm_detach(): supplied resource is not a valid sysvshm resource in %s003.php on line %d
 bool(false)
 
 Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s003.php on line %d
-
-Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
-NULL
-
-Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
-NULL
-
-Warning: shm_detach() expects parameter 1 to be resource, int given in %s003.php on line %d
-NULL
 Done
diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt
@@ -11,9 +11,6 @@ if (!function_exists('ftok')){ print 'skip'; }
 $key = ftok(__FILE__, 't');
 $s = shm_attach($key, 1024);
 
-var_dump(shm_put_var());
-var_dump(shm_put_var(-1, -1, -1));
-var_dump(shm_put_var(-1, 10, "qwerty"));
 var_dump(shm_put_var($s, -1, "qwerty"));
 var_dump(shm_put_var($s, 10, "qwerty"));
 var_dump(shm_put_var($s, 10, "qwerty"));
@@ -26,18 +23,10 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d
-NULL
-
-Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
-NULL
-
-Warning: shm_put_var() expects parameter 1 to be resource, int given in %s004.php on line %d
-NULL
 bool(true)
 bool(true)
 bool(true)
 
-Warning: shm_put_var(): not enough shared memory left in %s004.php on line 14
+Warning: shm_put_var(): not enough shared memory left in %s004.php on line %d
 bool(false)
 Done
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
@@ -17,14 +17,9 @@ shm_put_var($s, 1, array(1,2,3));
 shm_put_var($s, 2, false);
 shm_put_var($s, 3, null);
 
-var_dump(shm_get_var());
-
-var_dump(shm_get_var(-1, -1));
-
 var_dump(shm_get_var($s, 1000));
 var_dump(shm_get_var($s, -10000));
 
-var_dump(shm_get_var($s, array()));
 var_dump(shm_get_var($s, -1));
 var_dump(shm_get_var($s, 0));
 var_dump(shm_get_var($s, 1));
@@ -41,20 +36,11 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
-NULL
-
-Warning: shm_get_var() expects parameter 1 to be resource, int given in %s005.php on line %d
-NULL
-
 Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d
 bool(false)
 
 Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d
 bool(false)
-
-Warning: shm_get_var() expects parameter 2 to be int, array given in %s005.php on line %d
-NULL
 string(11) "test string"
 object(stdClass)#%d (0) {
 }
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
@@ -13,8 +13,6 @@ $s = shm_attach($key, 1024);
 
 shm_put_var($s, 1, "test string");
 
-var_dump(shm_remove_var());
-var_dump(shm_remove_var(-1, -1));
 var_dump(shm_remove_var($s, -10));
 
 var_dump(shm_get_var($s, 1));
@@ -29,12 +27,6 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
-NULL
-
-Warning: shm_remove_var() expects parameter 1 to be resource, int given in %s006.php on line %d
-NULL
-
 Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d
 bool(false)
 string(11) "test string"
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
@@ -11,11 +11,6 @@ if (!function_exists('ftok')){ print 'skip'; }
 $key = ftok(__FILE__, 't');
 $s = shm_attach($key, 1024);
 
-var_dump(shm_remove());
-var_dump(shm_remove(-1));
-var_dump(shm_remove(0));
-var_dump(shm_remove(""));
-
 var_dump(shm_remove($s));
 
 shm_detach($s);
@@ -24,17 +19,6 @@ var_dump(shm_remove($s));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
-NULL
-
-Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
-NULL
-
-Warning: shm_remove() expects parameter 1 to be resource, int given in %s007.php on line %d
-NULL
-
-Warning: shm_remove() expects parameter 1 to be resource, string given in %s007.php on line %d
-NULL
 bool(true)
 
 Warning: shm_remove(): supplied resource is not a valid sysvshm resource in %s007.php on line %d
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt
@@ -7,17 +7,14 @@ tidy_repair_*() and invalid parameters
 
 $l = 1;
 $s = "";
-$a = array();
 
 tidy_repair_string($s, $l, $l, $l);
 tidy_repair_string($s, $s, $s, $s);
 tidy_repair_string($l, $l, $l ,$l);
-tidy_repair_string($a, $a, $a, $a);
 
 tidy_repair_file($s, $l, $l, $l);
 tidy_repair_file($s, $s, $s, $s);
 tidy_repair_file($l, $l, $l ,$l);
-tidy_repair_file($a, $a, $a, $a);
 
 echo "Done\n";
 ?>
@@ -32,11 +29,7 @@ Warning: tidy_repair_string(): Could not load configuration file '1' in %s on li
 
 Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d
 
-Warning: tidy_repair_string() expects parameter 1 to be string, array given in %s on line %d
-
 Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
 
 Warning: tidy_repair_file(): Filename cannot be empty in %s on line %d
-
-Warning: tidy_repair_file() expects parameter 1 to be a valid path, array given in %s on line %d
 Done
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
@@ -126,8 +126,6 @@ echo token_name(T_HALT_COMPILER), "\n";
 
 echo token_name(-1), "\n";
 echo token_name(0x8000000F), "\n";
-echo token_name("string"), "\n";
-echo token_name(array()), "\n";
 
 echo "Done\n";
 ?>
@@ -251,10 +249,4 @@ T_CLONE
 T_HALT_COMPILER
 UNKNOWN
 UNKNOWN
-
-Warning: token_name() expects parameter 1 to be int, string given in %s on line %d
-
-
-Warning: token_name() expects parameter 1 to be int, array given in %s on line %d
-
 Done
diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt
@@ -5,20 +5,13 @@ token_get_all() and wrong parameters
 --FILE--
 <?php
 
-var_dump(token_get_all(array()));
-var_dump(token_get_all(new stdClass));
 var_dump(token_get_all(""));
 var_dump(token_get_all(0));
 var_dump(token_get_all(-1));
 
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
-Warning: token_get_all() expects parameter 1 to be string, object given in %s on line %d
-NULL
 array(0) {
 }
 array(1) {
diff --git a/ext/xmlrpc/tests/001.phpt b/ext/xmlrpc/tests/001.phpt
@@ -7,7 +7,6 @@ xmlrpc_encode_request() with wrong arguments
 
 var_dump(xmlrpc_encode_request(-1, 1));
 var_dump(xmlrpc_encode_request("", 1));
-var_dump(xmlrpc_encode_request(array(), 1));
 var_dump(xmlrpc_encode_request(3.4, 1));
 
 echo "Done\n";
@@ -37,9 +36,6 @@ string(160) "<?xml version="1.0" encoding="iso-8859-1"?>
 </params>
 </methodCall>
 "
-
-Warning: xmlrpc_encode_request() expects parameter 1 to be string, array given in %s on line %d
-NULL
 string(175) "<?xml version="1.0" encoding="iso-8859-1"?>
 <methodCall>
 <methodName>3.4</methodName>
diff --git a/ext/xmlrpc/tests/002.phpt b/ext/xmlrpc/tests/002.phpt
diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt
