diff options
| author | Nikita Popov <nikic@php.net> | 2015-05-15 21:04:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-05-15 23:40:32 +0200 |
| commit | c9f27ee4227268bc74fc54e0e06102317e614804 (patch) | |
| tree | 35680688ecebfd7bc1321f21a6919133dffa666f /ext/mysqli | |
| parent | 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (diff) | |
| download | php-git-c9f27ee4227268bc74fc54e0e06102317e614804.tar.gz | |
Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/tests/bug33491.phpt | 6 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug38003.phpt | 5 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_driver_unclonable.phpt | 5 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt | 5 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_result_unclonable.phpt | 5 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_stmt_unclonable.phpt | 5 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_unclonable.phpt | 5 |
7 files changed, 29 insertions, 7 deletions
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index 8cab16ca4d..dbb3b7218c 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -26,4 +26,8 @@ $DB->query_single('SELECT DATE()'); ?> --EXPECTF-- -Fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d +Fatal error: Uncaught exception 'EngineException' with message 'Call to a member function fetch_row() on boolean' in %sbug33491.php:%d +Stack trace: +#0 %s(%d): DB->query_single('SELECT DATE()') +#1 {main} + thrown in %sbug33491.php on line %d diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt index af71f85f2c..f1efa56b30 100644 --- a/ext/mysqli/tests/bug38003.phpt +++ b/ext/mysqli/tests/bug38003.phpt @@ -17,4 +17,7 @@ $DB = new DB(); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Call to private DB::__construct() from invalid context in %s on line %d +Fatal error: Uncaught exception 'EngineException' with message 'Call to private DB::__construct() from invalid context' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/ext/mysqli/tests/mysqli_driver_unclonable.phpt b/ext/mysqli/tests/mysqli_driver_unclonable.phpt index 0e2438eef9..fe3a91af63 100644 --- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt @@ -10,4 +10,7 @@ Trying to clone mysqli_driver object print "done!"; ?> --EXPECTF-- -Fatal error: Trying to clone an uncloneable object of class mysqli_driver in %s on line %d
\ No newline at end of file +Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_driver' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index 2fa80cfa94..d0786f9e1a 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -62,4 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you Fatal error with PHP (but no exception!): -Fatal error: Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test() in %s on line %d +Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test()' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 0ecc30b62a..0b400396c7 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -21,4 +21,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Trying to clone an uncloneable object of class mysqli_result in %s on line %d
\ No newline at end of file +Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_result' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index 57d8d6d6a6..efec3dbc08 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -22,4 +22,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Trying to clone an uncloneable object of class mysqli_stmt in %s on line %d
\ No newline at end of file +Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli_stmt' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index e332b9f24f..7b54fe5e81 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -20,4 +20,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Trying to clone an uncloneable object of class mysqli in %s on line %d
\ No newline at end of file +Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class mysqli' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d
\ No newline at end of file |