From 93b501ed616ecc9abf864fa9f003a27aa595382c Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Mon, 25 Jul 2011 14:53:01 +0000 Subject: [PATCH] Test update. 5.4+ throws a catchable fatal error, 5.3 does not. --- ext/mysqli/tests/connect.inc | 18 +++++++++++- ext/mysqli/tests/mysqli_fetch_object.phpt | 29 +++++++++---------- ext/mysqli/tests/mysqli_fetch_object_oo.phpt | 30 +++++++++++--------- 3 files changed, 48 insertions(+), 29 deletions(-) diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc index 6c6c48b5fcd..f32592f43d2 100644 --- a/ext/mysqli/tests/connect.inc +++ b/ext/mysqli/tests/connect.inc @@ -225,4 +225,20 @@ } else { printf("skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n"); } -?> \ No newline at end of file + + function handle_catchable_fatal($errno, $error, $file, $line) { + static $errcodes = array(); + if (empty($errcodes)) { + $constants = get_defined_constants(); + foreach ($constants as $name => $value) { + if (substr($name, 0, 2) == "E_") + $errcodes[$value] = $name; + } + } + printf("[%s] %s in %s on line %s\n", + (isset($errcodes[$errno])) ? $errcodes[$errno] : $errno, + $error, $file, $line); + + return true; + } +?> diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index f164c4e19bb..c70871e6ea9 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -10,6 +10,8 @@ require_once('skipifconnectfailure.inc'); ID !== "3") || ($obj->label !== "c") || ($obj->a !== NULL) || ($obj->b !== NULL) || (get_class($obj) != 'mysqli_fetch_object_construct')) { printf("[006] Object seems wrong. [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -97,7 +99,7 @@ require_once('skipifconnectfailure.inc'); Also, I did not ask to get exceptions using the mysqli_options() */ try { - if (false !== ($obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a'))) + if (false !== ($obj = @mysqli_fetch_object($res, 'mysqli_fetch_object_construct', 'a'))) printf("[011] Should have failed\n"); } catch (Exception $e) { printf("%s\n", $e->getMessage()); @@ -136,22 +138,19 @@ require_once('skipifconnectfailure.inc'); require_once("clean_table.inc"); ?> --EXPECTF-- -Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Notice: Undefined variable: a in %s on line %d - -Notice: Undefined variable: b in %s on line %d - -Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Notice: Undefined variable: b in %s on line %d +[E_WARNING] mysqli_fetch_object() expects at least 1 parameter, 0 given in %s on line %d +[E_WARNING] mysqli_fetch_object() expects parameter 1 to be mysqli_result, null given in %s on line %d +[E_WARNING] Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_NOTICE] Undefined variable: a in %s on line %d +[E_NOTICE] Undefined variable: b in %s on line %d +[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_NOTICE] Undefined variable: b in %s on line %d NULL NULL - -Warning: mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d +[E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d NULL +[E_RECOVERABLE_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d Parameter ctor_params must be an array Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d \ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 3b263e49e4a..1d62c6dd4f0 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -9,6 +9,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- --EXPECTF-- -Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Notice: Undefined variable: a in %s on line %d - -Notice: Undefined variable: b in %s on line %d - -Warning: Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d - -Notice: Undefined variable: b in %s on line %d +[E_WARNING] mysqli_result::__construct(): invalid object or resource mysql%s +%s on line %d +[E_WARNING] mysqli_result::fetch_object(): Couldn't fetch mysqli_result in %s on line %d +[E_WARNING] mysqli_result::fetch_object() expects parameter 1 to be string, object given in %s on line %d +[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d +[E_WARNING] mysqli_result::fetch_object() expects parameter 1 to be string, object given in %s on line %d +[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d +[E_WARNING] mysqli_result::fetch_object() expects at most 2 parameters, 3 given in %s on line %d +[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, null given in %s on line %d +[E_WARNING] Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_NOTICE] Undefined variable: a in %s on line %d +[E_NOTICE] Undefined variable: b in %s on line %d +[E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d +[E_NOTICE] Undefined variable: b in %s on line %d NULL NULL - -Warning: mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d +[E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d NULL Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d \ No newline at end of file