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/pdo | |
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/pdo')
-rw-r--r-- | ext/pdo/tests/bug47769.phpt | 5 | ||||
-rw-r--r-- | ext/pdo/tests/pdo_025.phpt | 5 | ||||
-rw-r--r-- | ext/pdo/tests/pdo_037.phpt | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ext/pdo/tests/bug47769.phpt b/ext/pdo/tests/bug47769.phpt index 3b2f1e89fc..f6f2749cc0 100644 --- a/ext/pdo/tests/bug47769.phpt +++ b/ext/pdo/tests/bug47769.phpt @@ -34,4 +34,7 @@ this is a protected method. this is a private method. foo -Fatal error: Call to protected method test::isProtected() from context '' in %s on line %d +Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method test::isProtected() from context ''' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt index d16d8dd9bd..4170cec88c 100644 --- a/ext/pdo/tests/pdo_025.phpt +++ b/ext/pdo/tests/pdo_025.phpt @@ -110,4 +110,7 @@ object(Test)#%d (3) { } ===FAIL=== -Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d%A +Fatal error: Uncaught exception 'EngineException' with message 'Cannot access protected property Fail::$id' in %spdo_025.php:%d +Stack trace: +#0 {main} + thrown in %spdo_025.php on line %d diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt index a0ead4b75f..2880a1b38a 100644 --- a/ext/pdo/tests/pdo_037.phpt +++ b/ext/pdo/tests/pdo_037.phpt @@ -16,4 +16,7 @@ var_dump($obj->foo()); ?> --EXPECTF-- -Fatal error: Call to undefined method MyStatement::foo() in %s on line %d +Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method MyStatement::foo()' in %s:%d +Stack trace: +#0 {main} + thrown in %s on line %d |