Adjust tests for zpp TypeError change

Author: nikic

Zend/tests/011.phpt

@@ -23,8 +23,6 @@ class bar extends foo {
 	}
 }
 
-var_dump(property_exists());
-var_dump(property_exists(""));
 var_dump(property_exists("foo","pp1"));
 var_dump(property_exists("foo","pp2"));
 var_dump(property_exists("foo","pp3"));
@@ -53,11 +51,6 @@ $bar->test();
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
 bool(true)
 bool(true)
 bool(true)

Zend/tests/012.phpt

@@ -6,10 +6,8 @@ class_exists() tests
 class foo {
 }
 
-var_dump(class_exists());
 var_dump(class_exists("qwerty"));
 var_dump(class_exists(""));
-var_dump(class_exists(array()));
 var_dump(class_exists("test", false));
 var_dump(class_exists("foo", false));
 var_dump(class_exists("foo"));
@@ -18,14 +16,9 @@ var_dump(class_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--
-Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
+--EXPECT--
 bool(false)
 bool(false)
-
-Warning: class_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
 bool(false)
 bool(true)
 bool(true)

Zend/tests/013.phpt

@@ -6,10 +6,8 @@ interface_exists() tests
 interface foo {
 }
 
-var_dump(interface_exists());
 var_dump(interface_exists("qwerty"));
 var_dump(interface_exists(""));
-var_dump(interface_exists(array()));
 var_dump(interface_exists("test", false));
 var_dump(interface_exists("foo", false));
 var_dump(interface_exists("foo"));
@@ -18,14 +16,9 @@ var_dump(interface_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--
-Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
-NULL
+--EXPECT--
 bool(false)
 bool(false)
-
-Warning: interface_exists() expects parameter 1 to be string, array given in %s on line %d
-NULL
 bool(false)
 bool(true)
 bool(true)

Zend/tests/014.phpt

@@ -8,13 +8,9 @@ var_dump(get_included_files());
 include(dirname(__FILE__)."/014.inc");
 var_dump(get_included_files());
 
-var_dump(get_included_files(1,1));
-
 include_once(dirname(__FILE__)."/014.inc");
 var_dump(get_included_files());
 
-var_dump(get_included_files(1));
-
 include(dirname(__FILE__)."/014.inc");
 var_dump(get_included_files());
 
@@ -31,18 +27,12 @@ array(2) {
   [1]=>
   string(%d) "%s"
 }
-
-Warning: get_included_files() expects exactly 0 parameters, 2 given in %s on line %d
-NULL
 array(2) {
   [0]=>
   string(%d) "%s"
   [1]=>
   string(%d) "%s"
 }
-
-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
 array(2) {
   [0]=>
   string(%d) "%s"

Zend/tests/015.phpt

@@ -3,9 +3,7 @@ trigger_error() tests
 --FILE--
 <?php
 
-var_dump(trigger_error());
 var_dump(trigger_error("error"));
-var_dump(trigger_error(array()));
 var_dump(trigger_error("error", -1));
 var_dump(trigger_error("error", 0));
 var_dump(trigger_error("error", E_USER_WARNING));
@@ -14,15 +12,9 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Notice: error in %s on line %d
 bool(true)
 
-Warning: trigger_error() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
 Warning: Invalid error type specified in %s on line %d
 bool(false)
 

Zend/tests/017.phpt

@@ -3,8 +3,6 @@ builtin functions tests
 --FILE--
 <?php
 
-var_dump(get_resource_type());
-var_dump(get_resource_type(""));
 $fp = fopen(__FILE__, "r");
 var_dump(get_resource_type($fp));
 fclose($fp);
@@ -14,11 +12,9 @@ var_dump(gettype(get_loaded_extensions()));
 var_dump(count(get_loaded_extensions()));
 var_dump(gettype(get_loaded_extensions(true)));
 var_dump(count(get_loaded_extensions(true)));
-var_dump(get_loaded_extensions(true, true));
 
 define("USER_CONSTANT", "test");
 
-var_dump(get_defined_constants(true, true));
 var_dump(gettype(get_defined_constants(true)));
 var_dump(gettype(get_defined_constants()));
 var_dump(count(get_defined_constants()));
@@ -29,11 +25,9 @@ function test () {
 var_dump(gettype(get_defined_functions()));
 var_dump(count(get_defined_functions()));
 
-var_dump(get_declared_interfaces(true));
 var_dump(gettype(get_declared_interfaces()));
 var_dump(count(get_declared_interfaces()));
 
-var_dump(get_extension_funcs());
 var_dump(get_extension_funcs(true));
 var_dump(gettype(get_extension_funcs("standard")));
 var_dump(count(get_extension_funcs("standard")));
@@ -44,36 +38,19 @@ var_dump(count(get_extension_funcs("zend")));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: get_resource_type() expects parameter 1 to be resource, string given in %s on line %d
-NULL
 string(6) "stream"
 string(7) "Unknown"
 string(5) "array"
 int(%d)
 string(5) "array"
 int(%d)
-
-Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
-NULL
 string(5) "array"
 string(5) "array"
 int(%d)
 string(5) "array"
 int(%d)
-
-Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
 string(5) "array"
 int(%d)
-
-Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
 bool(false)
 string(5) "array"
 int(%d)

Zend/tests/018.phpt

@@ -3,12 +3,8 @@ constant() tests
 --FILE--
 <?php
 
-var_dump(constant());
-var_dump(constant("", ""));
 var_dump(constant(""));
 
-var_dump(constant(array()));
-
 define("TEST_CONST", 1);
 var_dump(constant("TEST_CONST"));
 
@@ -18,17 +14,8 @@ var_dump(constant("TEST_CONST2"));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: constant() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
 Warning: constant(): Couldn't find constant  in %s on line %d
 NULL
-
-Warning: constant() expects parameter 1 to be string, array given in %s on line %d
-NULL
 int(1)
 string(4) "test"
 Done

Zend/tests/020.phpt

@@ -3,9 +3,7 @@ func_get_arg() invalid usage
 --FILE--
 <?php
 
-var_dump(func_get_arg(1,2,3));
 var_dump(func_get_arg(1));
-var_dump(func_get_arg());
 
 function bar() {
 	var_dump(func_get_arg(1));
@@ -20,15 +18,9 @@ foo(1,2);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d
-NULL
-
 Warning: func_get_arg():  Called from the global scope - no function context in %s on line %d
 bool(false)
 
-Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: func_get_arg():  Argument 1 not passed to function in %s on line %d
 bool(false)
 Done

Zend/tests/bug31720.phpt

@@ -4,11 +4,14 @@ Bug #31720 (Invalid object callbacks not caught in array_walk())
 <?php
 $array = array('at least one element');
 
-array_walk($array, array($nonesuchvar,'show'));
+try {
+    array_walk($array, array($nonesuchvar,'show'));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
 ===DONE===
 --EXPECTF--
 Notice: Undefined variable: nonesuchvar in %s on line %d
-
-Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
+array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object
 ===DONE===

Zend/tests/bug45186.phpt

@@ -31,10 +31,14 @@ $x->test();
 
 call_user_func(array('BAR','x'));
 call_user_func('BAR::www');
-call_user_func('self::y');
+try {
+    call_user_func('self::y');
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 __call:
 string(3) "ABC"
 __call:
@@ -50,5 +54,4 @@ string(1) "y"
 ok
 __callstatic:
 string(3) "www"
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active in %sbug45186.php on line 31
+call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active

Zend/tests/bug45186_2.phpt

@@ -26,11 +26,19 @@ $x = new bar;
 $x->test();
 
 call_user_func(array('BAR','x'));
-call_user_func('BAR::www');
-call_user_func('self::y');
+try {
+    call_user_func('BAR::www');
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    call_user_func('self::y');
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 __call:
 string(3) "ABC"
 __call:
@@ -44,7 +52,5 @@ string(1) "y"
 __call:
 string(1) "y"
 ok
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, class 'bar' does not have a method 'www' in %s on line %d
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active in %sbug45186_2.php on line 27
+call_user_func() expects parameter 1 to be a valid callback, class 'bar' does not have a method 'www'
+call_user_func() expects parameter 1 to be a valid callback, cannot access self:: when no class scope is active

Zend/tests/bug46106.phpt

@@ -15,8 +15,13 @@ function test($x) {
 }
 
 $x = new ReflectionFunction('str_pad');
-test($x);
+try {
+    test($x);
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
 DONE
 --EXPECT--
+str_pad() expects at least 2 parameters, 1 given
 DONE

Zend/tests/bug51827.phpt

@@ -16,4 +16,8 @@ register_shutdown_function('exploDe');
 --EXPECTF--
 int(1)
 
-Warning: explode() expects at least 2 parameters, 0 given in Unknown on line %d
+Fatal error: Uncaught ArgumentCountError: explode() expects at least 2 parameters, 0 given in [no active file]:0
+Stack trace:
+#0 [internal function]: explode()
+#1 {main}
+  thrown in [no active file] on line 0

Zend/tests/bug70895.phpt

@@ -3,13 +3,23 @@ Bug #70895 null ptr deref and segfault with crafted callable
 --FILE--
 <?php
 
-array_map("%n", 0);
-array_map("%n %i", 0);
-array_map("%n %i aoeu %f aoeu %p", 0);
+try {
+    array_map("%n", 0);
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    array_map("%n %i", 0);
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    array_map("%n %i aoeu %f aoeu %p", 0);
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
---EXPECTREGEX--
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n' not found or invalid function name in .+
-
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i' not found or invalid function name in .+
-
-Warning: array_map\(\) expects parameter 1 to be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name in .+bug70895.php on line \d+
+--EXPECT--
+array_map() expects parameter 1 to be a valid callback, function '%n' not found or invalid function name
+array_map() expects parameter 1 to be a valid callback, function '%n %i' not found or invalid function name
+array_map() expects parameter 1 to be a valid callback, function '%n %i aoeu %f aoeu %p' not found or invalid function name