class_object test fixes

Author: nikic

ext/standard/tests/class_object/property_exists_error.phpt

@@ -10,36 +10,15 @@ Test property_exists() function : error conditions
 
 echo "*** Testing property_exists() : error conditions ***\n";
 
-$object_or_class = "obj";
-$property_name = 'string_val';
-$extra_arg = 10;
-
-
-echo "\n-- Testing property_exists() function with more than expected no. of arguments --\n";
-var_dump( property_exists($object_or_class, $property_name, $extra_arg) );
-
-
-echo "\n-- Testing property_exists() function with less than expected no. of arguments --\n";
-var_dump( property_exists($object_or_class) );
-
 echo "\n-- Testing property_exists() function with incorrect arguments --\n";
+$property_name = 'string_val';
 var_dump( property_exists(10, $property_name) );
 
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing property_exists() : error conditions ***
 
--- Testing property_exists() function with more than expected no. of arguments --
-
-Warning: property_exists() expects exactly 2 parameters, 3 given in %sproperty_exists_error.php on line %d
-NULL
-
--- Testing property_exists() function with less than expected no. of arguments --
-
-Warning: property_exists() expects exactly 2 parameters, 1 given in %sproperty_exists_error.php on line %d
-NULL
-
 -- Testing property_exists() function with incorrect arguments --
 
 Warning: First parameter must either be an object or the name of an existing class in %sproperty_exists_error.php on line %d

ext/standard/tests/general_functions/bug41970.phpt

@@ -6,22 +6,26 @@ Bug #41970 (call_user_func_*() leaks on failure)
 $a = array(4,3,2);
 
 var_dump(call_user_func_array("sort", array($a)));
-var_dump(call_user_func_array("strlen", array($a)));
+try {
+    var_dump(call_user_func_array("strlen", array($a)));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump(call_user_func("sort", $a));
-var_dump(call_user_func("strlen", $a));
+try {
+    var_dump(call_user_func("strlen", $a));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "Done\n";
 ?>
 --EXPECTF--
 Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5
 bool(true)
-
-Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 6
-NULL
+strlen() expects parameter 1 to be string, array given
 
 Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7
 bool(true)
-
-Warning: strlen() expects parameter 1 to be string, array given in %sbug41970.php on line 8
-NULL
+strlen() expects parameter 1 to be string, array given
 Done

ext/standard/tests/general_functions/callbacks_001.phpt

@@ -69,7 +69,11 @@ class P extends O {
         $this->call(array('parent', 'who'));
         $this->call(array('P', 'parent::who'));
         $this->call(array($this, 'O::who'));
-        $this->call(array($this, 'B::who'));
+        try {
+            $this->call(array($this, 'B::who'));
+        } catch (TypeError $e) {
+            echo $e->getMessage(), "\n";
+        }
     }
 }
 
@@ -103,6 +107,5 @@ O
 $this|O::who
 O
 $this|B::who
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, class 'P' is not a subclass of 'B' in %s on line %d
+call_user_func() expects parameter 1 to be a valid callback, class 'P' is not a subclass of 'B'
 ===DONE===

ext/standard/tests/general_functions/callbacks_002.phpt

@@ -3,14 +3,24 @@ call_user_func(): Wrong parameters
 --FILE--
 <?php
 
-call_user_func(array('Foo', 'bar'));
-call_user_func(array(NULL, 'bar'));
-call_user_func(array('stdclass', NULL));
+try {
+    call_user_func(array('Foo', 'bar'));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    call_user_func(array(NULL, 'bar'));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    call_user_func(array('stdclass', NULL));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
 --EXPECTF--
-Warning: call_user_func() expects parameter 1 to be a valid callback, class 'Foo' not found in %s on line %d
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-
-Warning: call_user_func() expects parameter 1 to be a valid callback, second array member is not a valid method in %s on line %d
+call_user_func() expects parameter 1 to be a valid callback, class 'Foo' not found
+call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object
+call_user_func() expects parameter 1 to be a valid callback, second array member is not a valid method

ext/standard/tests/general_functions/error_get_last.phpt

@@ -4,7 +4,11 @@ error_get_last() tests
 <?php
 
 var_dump(error_get_last());
-var_dump(error_get_last(true));
+try {
+    var_dump(error_get_last(true));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump(error_get_last());
 
 $a = $b;
@@ -15,19 +19,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 NULL
-
-Warning: error_get_last() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
-array(4) {
-  ["type"]=>
-  int(2)
-  ["message"]=>
-  string(54) "error_get_last() expects exactly 0 parameters, 1 given"
-  ["file"]=>
-  string(%i) "%s"
-  ["line"]=>
-  int(4)
-}
 
 Notice: Undefined variable: b in %s on line %d
 array(4) {

ext/standard/tests/general_functions/floatval.phpt

@@ -91,18 +91,6 @@ foreach ($not_float_types as $type ) {
    var_dump( doubleval($type) );
 }
 
-
-
-
-echo "\n*** Testing error conditions ***\n";
-//Zero argument
-var_dump( floatval() );
-var_dump( doubleval() );
-
-//arguments more than expected
-var_dump( floatval(TRUE, FALSE) );
-var_dump( doubleval(TRUE, FALSE) );
-
 echo "\nDone\n";
 
 
@@ -194,18 +182,4 @@ float(1)
 float(0)
 float(0)
 
-*** Testing error conditions ***
-
-Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
 Done

ext/standard/tests/general_functions/get_extension_funcs_basic.phpt

@@ -14,10 +14,14 @@ $result = get_extension_funcs("standard");
 var_dump(gettype($result));
 var_dump(in_array("cos", $result));
 
+// Unknown extension
+var_dump(get_extension_funcs("foo"));
+
 ?>
 ===DONE===
 --EXPECT--
 Simple testcase for get_extension_funcs() function
 string(5) "array"
 bool(true)
+bool(false)
 ===DONE===

ext/standard/tests/general_functions/get_extension_funcs_error.phpt

@@ -19,19 +19,11 @@ if (ini_get("include_path") == get_include_path()) {
 	echo "FAILED\n";
 }
 
-echo "\nError cases:\n";
-var_dump(get_include_path(TRUE));
-
-
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing get_include_path()
 string(1) "."
 PASSED
 
-Error cases:
-
-Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
 ===DONE===

ext/standard/tests/general_functions/get_include_path_basic.phpt

@@ -22,9 +22,6 @@ include(dirname(__FILE__)."/get_included_files_inc2.inc");
 echo "\n-- List included files atfter including inc2 which will include inc3 which includes inc1 --\n";
 var_dump(get_included_files());
 
-echo "\n-- Error cases --\n";
-var_dump(get_included_files(true));
-
 ?>
 ===DONE===
 --EXPECTF--
@@ -56,8 +53,4 @@ array(4) {
   string(%d) "%sget_included_files_inc3.inc"
 }
 
--- Error cases --
-
-Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
 ===DONE===