diff options
author | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
---|---|---|
committer | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
commit | fb7206e452008f72f8bf185ca658a9c306de23b6 (patch) | |
tree | b454c6bb6439dbb605b15c11825df2e47966b5ef | |
parent | 0eba6f597aecf5febcdf8468fb80550d05643b4b (diff) | |
parent | 440481fb3e15d78d0d92432c3adba9067989f43a (diff) | |
download | php-git-fb7206e452008f72f8bf185ca658a9c306de23b6.tar.gz |
Merge branch 'master' into throwable-interface
446 files changed, 945 insertions, 622 deletions
diff --git a/Zend/tests/028.phpt b/Zend/tests/028.phpt index 701561f9c8..7152c99195 100644 --- a/Zend/tests/028.phpt +++ b/Zend/tests/028.phpt @@ -20,7 +20,7 @@ bool(true) Notice: Undefined offset: 2 in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught EngineException: Function name must be a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/037.phpt b/Zend/tests/037.phpt index ca96f867c0..12ae69b8c6 100644 --- a/Zend/tests/037.phpt +++ b/Zend/tests/037.phpt @@ -16,7 +16,7 @@ var_dump($x::$x); --EXPECTF-- int(1) -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: Closure::$x' in %s:%d +Fatal error: Uncaught EngineException: Access to undeclared static property: Closure::$x in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers_010.phpt index 07a1b594de..fe774fefbc 100644 --- a/Zend/tests/access_modifiers_010.phpt +++ b/Zend/tests/access_modifiers_010.phpt @@ -28,7 +28,7 @@ new c; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private method d::test2() from context 'a'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method d::test2() from context 'a' in %s:%d Stack trace: #0 %s(%d): a->test() #1 %s(%d): c->__construct() diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt index 5d35f55723..8868fca2e2 100644 --- a/Zend/tests/add_002.phpt +++ b/Zend/tests/add_002.phpt @@ -10,7 +10,7 @@ $o->prop = "value"; try { var_dump($a + $o); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -26,7 +26,7 @@ Exception: Unsupported operand types Notice: Object of class stdClass could not be converted to int in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt index 6921d72651..7a9391038c 100644 --- a/Zend/tests/add_003.phpt +++ b/Zend/tests/add_003.phpt @@ -10,7 +10,7 @@ $o->prop = "value"; try { var_dump($o + $a); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -26,7 +26,7 @@ Exception: Unsupported operand types Notice: Object of class stdClass could not be converted to int in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/add_004.phpt b/Zend/tests/add_004.phpt index c0c390faef..cf19f2fc1d 100644 --- a/Zend/tests/add_004.phpt +++ b/Zend/tests/add_004.phpt @@ -7,7 +7,7 @@ $a = array(1,2,3); try { var_dump($a + 5); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -19,7 +19,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt index 562dd3e642..2616196c90 100644 --- a/Zend/tests/add_007.phpt +++ b/Zend/tests/add_007.phpt @@ -9,7 +9,7 @@ $s1 = "some string"; try { var_dump($a + $s1); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -21,7 +21,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt index 8753a26d7a..f5cc76de1d 100644 --- a/Zend/tests/array_type_hint_001.phpt +++ b/Zend/tests/array_type_hint_001.phpt @@ -12,4 +12,8 @@ foo(123); --EXPECTF-- 3 -Fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2 +Fatal error: Uncaught TypeException: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2 +Stack trace: +#0 %s(%d): foo() +#1 {main} + thrown in %sarray_type_hint_001.php on line 2 diff --git a/Zend/tests/assert/expect_002.phpt b/Zend/tests/assert/expect_002.phpt index 2e54b1a459..f3062b7997 100644 --- a/Zend/tests/assert/expect_002.phpt +++ b/Zend/tests/assert/expect_002.phpt @@ -9,7 +9,7 @@ assert(false); var_dump(true); ?> --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_002.php:%d +Fatal error: Uncaught AssertionException: assert(false) in %sexpect_002.php:%d Stack trace: #0 %sexpect_002.php(%d): assert(false, 'assert(false)') #1 {main} diff --git a/Zend/tests/assert/expect_007.phpt b/Zend/tests/assert/expect_007.phpt index 5b6aeffb4a..feed56e84f 100644 --- a/Zend/tests/assert/expect_007.phpt +++ b/Zend/tests/assert/expect_007.phpt @@ -16,7 +16,7 @@ class HeaderMalfunctionException extends AssertionException {} assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionException("malformed key found at {$next} \"{$data["key"]}\"")); ?> --EXPECTF-- -Fatal error: Uncaught exception 'HeaderMalfunctionException' with message 'malformed key found at 1 "X-HTTP "' in %sexpect_007.php:10 +Fatal error: Uncaught HeaderMalfunctionException: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10 Stack trace: #0 {main} thrown in %sexpect_007.php on line 10 diff --git a/Zend/tests/assert/expect_009.phpt b/Zend/tests/assert/expect_009.phpt index 7e64c64bc7..a41cba44f4 100644 --- a/Zend/tests/assert/expect_009.phpt +++ b/Zend/tests/assert/expect_009.phpt @@ -17,7 +17,7 @@ class Two extends One { new Two(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_009.php:%d +Fatal error: Uncaught AssertionException: assert(false) in %sexpect_009.php:%d Stack trace: #0 %sexpect_009.php(%d): assert(false, 'assert(false)') #1 %sexpect_009.php(%d): Two->__construct() diff --git a/Zend/tests/assert/expect_010.phpt b/Zend/tests/assert/expect_010.phpt index 8d52f6479b..8301d40f72 100644 --- a/Zend/tests/assert/expect_010.phpt +++ b/Zend/tests/assert/expect_010.phpt @@ -15,7 +15,7 @@ class Two extends One {} new Two(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexpect_010.php:%d +Fatal error: Uncaught AssertionException: assert(false) in %sexpect_010.php:%d Stack trace: #0 %sexpect_010.php(%d): assert(false, 'assert(false)') #1 %sexpect_010.php(%d): One->__construct() diff --git a/Zend/tests/assert/expect_011.phpt b/Zend/tests/assert/expect_011.phpt index 0b5cf99b43..a48aa9f95f 100644 --- a/Zend/tests/assert/expect_011.phpt +++ b/Zend/tests/assert/expect_011.phpt @@ -22,7 +22,7 @@ class Two extends One {} new Two(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message '[Message]: MyExpectations' in %sexpect_011.php:%d +Fatal error: Uncaught AssertionException: [Message]: MyExpectations in %sexpect_011.php:%d Stack trace: #0 %sexpect_011.php(%d): assert(false, '[Message]: MyEx...') #1 %sexpect_011.php(%d): One->__construct() diff --git a/Zend/tests/bug24773.phpt b/Zend/tests/bug24773.phpt index a87ab2ebce..d2b1db3985 100644 --- a/Zend/tests/bug24773.phpt +++ b/Zend/tests/bug24773.phpt @@ -6,7 +6,7 @@ Bug #24773 (unset() of integers treated as arrays causes a crash) unset($array["lvl1"]["lvl2"]["b"]); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use string offset as an array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use string offset as an array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug29015.phpt b/Zend/tests/bug29015.phpt index 19c9206fe2..2b116383ff 100644 --- a/Zend/tests/bug29015.phpt +++ b/Zend/tests/bug29015.phpt @@ -8,7 +8,7 @@ $a->$x = "string('')"; var_dump($a); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot access empty property' in %sbug29015.php:4 +Fatal error: Uncaught EngineException: Cannot access empty property in %sbug29015.php:4 Stack trace: #0 {main} thrown in %sbug29015.php on line 4 diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt index ed0cee6eb9..7aa7ba1ffc 100644 --- a/Zend/tests/bug29674.phpt +++ b/Zend/tests/bug29674.phpt @@ -38,7 +38,7 @@ NULL ===CHILD=== string(4) "Base" -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property ChildClass::$private_child' in %sbug29674.php:%d +Fatal error: Uncaught EngineException: Cannot access private property ChildClass::$private_child in %sbug29674.php:%d Stack trace: #0 %s(%d): BaseClass->printVars() #1 {main} diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt index aaff58d07e..9937d2ad02 100644 --- a/Zend/tests/bug31102.phpt +++ b/Zend/tests/bug31102.phpt @@ -45,7 +45,7 @@ __autoload(Test2,2) Caught: __autoload __autoload(Test3,3) -Fatal error: Uncaught exception 'Error' with message 'Class 'Test3' not found' in %sbug31102.php(%d) : eval()'d code:1 +Fatal error: Uncaught EngineException: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1 Stack trace: #0 %s(%d): eval() #1 {main} diff --git a/Zend/tests/bug32660.phpt b/Zend/tests/bug32660.phpt index d3c1bf841c..e241eed44b 100644 --- a/Zend/tests/bug32660.phpt +++ b/Zend/tests/bug32660.phpt @@ -36,7 +36,7 @@ A Object Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23 -Fatal error: Uncaught exception 'Error' with message 'Cannot assign by reference to overloaded object' in %sbug32660.php:23 +Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %sbug32660.php:23 Stack trace: #0 {main} thrown in %sbug32660.php on line 23 diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/bug33318.phpt index 96c60d65d7..24752cdccf 100644 --- a/Zend/tests/bug33318.phpt +++ b/Zend/tests/bug33318.phpt @@ -5,7 +5,7 @@ Bug #33318 (throw 1; results in Invalid opcode 108/1/8) throw 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Can only throw objects' in %sbug33318.php:2 +Fatal error: Uncaught EngineException: Can only throw objects in %sbug33318.php:2 Stack trace: #0 {main} thrown in %sbug33318.php on line 2
\ No newline at end of file diff --git a/Zend/tests/bug33996.phpt b/Zend/tests/bug33996.phpt index 678f10053e..66ea0822a2 100644 --- a/Zend/tests/bug33996.phpt +++ b/Zend/tests/bug33996.phpt @@ -26,4 +26,8 @@ FooTest(new Foo()); --EXPECTF-- Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d Hi! -Fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php:%d +Stack trace: +#0 %s(%d): FooTest() +#1 {main} + thrown in %sbug33996.php on line %d diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt index bc4ba20e8d..46bbaf8751 100644 --- a/Zend/tests/bug34064.phpt +++ b/Zend/tests/bug34064.phpt @@ -31,7 +31,7 @@ array(1) { string(2) "ok" } -Fatal error: Uncaught exception 'Error' with message 'Cannot use [] for reading' in %sbug34064.php:18 +Fatal error: Uncaught EngineException: Cannot use [] for reading in %sbug34064.php:18 Stack trace: #0 %s(%d): XmlTest->run() #1 {main} diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/bug36071.phpt index 7826e58423..08a0ddd94b 100644 --- a/Zend/tests/bug36071.phpt +++ b/Zend/tests/bug36071.phpt @@ -8,7 +8,7 @@ $a = clone 0; $a[0]->b = 0; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message '__clone method called on non-object' in %sbug36071.php:2 +Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug36071.php:2 Stack trace: #0 {main} thrown in %sbug36071.php on line 2
\ No newline at end of file diff --git a/Zend/tests/bug36268.phpt b/Zend/tests/bug36268.phpt index 0bb3910ce8..42f4b5076f 100644 --- a/Zend/tests/bug36268.phpt +++ b/Zend/tests/bug36268.phpt @@ -11,7 +11,7 @@ $x = new Foo(); bar(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function bar()' in %sbug36268.php:8 +Fatal error: Uncaught EngineException: Call to undefined function bar() in %sbug36268.php:8 Stack trace: #0 {main} thrown in %sbug36268.php on line 8 diff --git a/Zend/tests/bug37632.phpt b/Zend/tests/bug37632.phpt index 1c6b43567c..d97aba0f4c 100644 --- a/Zend/tests/bug37632.phpt +++ b/Zend/tests/bug37632.phpt @@ -132,7 +132,7 @@ B2::doTest C2::test B4::doTest -Fatal error: Uncaught exception 'Error' with message 'Call to protected C4::__construct() from context 'B4'' in %sbug37632.php:%d +Fatal error: Uncaught EngineException: Call to protected C4::__construct() from context 'B4' in %sbug37632.php:%d Stack trace: #0 %s(%d): B4::doTest() #1 {main} diff --git a/Zend/tests/bug38624.phpt b/Zend/tests/bug38624.phpt index 081e35c72a..322ccc7fb3 100644 --- a/Zend/tests/bug38624.phpt +++ b/Zend/tests/bug38624.phpt @@ -26,7 +26,7 @@ $impl = new impl(); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'doesn't work' in %s:%d +Fatal error: Uncaught Exception: doesn't work in %s:%d Stack trace: #0 %s(%d): impl->__get('counter') #1 %s(%d): impl->__construct() diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt index 8b2c87ce9e..80ed7c897f 100644 --- a/Zend/tests/bug39003.phpt +++ b/Zend/tests/bug39003.phpt @@ -21,4 +21,8 @@ test($obj); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): test() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/bug40621.phpt b/Zend/tests/bug40621.phpt index 04b76c5f69..ef1e6c9383 100644 --- a/Zend/tests/bug40621.phpt +++ b/Zend/tests/bug40621.phpt @@ -17,7 +17,7 @@ echo "Done\n"; --EXPECTF-- Deprecated: Non-static method Foo::get() should not be called statically in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Non-static method Foo::__construct() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method Foo::__construct() cannot be called statically in %s:%d Stack trace: #0 %s(%d): Foo::get() #1 {main} diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt index 5498ede020..5e61750fa7 100644 --- a/Zend/tests/bug41209.phpt +++ b/Zend/tests/bug41209.phpt @@ -39,7 +39,7 @@ var_dump(isset($cache[$id])); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'ErrorException' with message 'Undefined variable: id' in %s:%d +Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d Stack trace: #0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array) #1 {main} diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/bug41421.phpt index f39fb15dda..e223e6fc78 100644 --- a/Zend/tests/bug41421.phpt +++ b/Zend/tests/bug41421.phpt @@ -21,7 +21,7 @@ echo "Done\n"; --EXPECTF-- Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on line %d -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 [internal function]: wrapper->stream_eof() #1 %s(%d): feof(Resource id #%d) diff --git a/Zend/tests/bug41633_2.phpt b/Zend/tests/bug41633_2.phpt index ea122d7c48..2df51af924 100644 --- a/Zend/tests/bug41633_2.phpt +++ b/Zend/tests/bug41633_2.phpt @@ -8,7 +8,7 @@ class Foo { echo Foo::A."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined class constant 'self::B'' in %sbug41633_2.php:5 +Fatal error: Uncaught EngineException: Undefined class constant 'self::B' in %sbug41633_2.php:5 Stack trace: #0 {main} thrown in %sbug41633_2.php on line 5 diff --git a/Zend/tests/bug41633_3.phpt b/Zend/tests/bug41633_3.phpt index 3750926742..beb32e8b8e 100644 --- a/Zend/tests/bug41633_3.phpt +++ b/Zend/tests/bug41633_3.phpt @@ -9,7 +9,7 @@ class Foo { echo Foo::A; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot declare self-referencing constant 'Foo::B'' in %sbug41633_3.php:%d +Fatal error: Uncaught EngineException: Cannot declare self-referencing constant 'Foo::B' in %sbug41633_3.php:%d Stack trace: #0 {main} thrown in %sbug41633_3.php on line %d diff --git a/Zend/tests/bug41813.phpt b/Zend/tests/bug41813.phpt index 27d616399d..4a38e062e2 100644 --- a/Zend/tests/bug41813.phpt +++ b/Zend/tests/bug41813.phpt @@ -9,7 +9,7 @@ $foo[0]->bar = "xyz"; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use string offset as an array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use string offset as an array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug41919.phpt b/Zend/tests/bug41919.phpt index 6ac89ffd4d..cb6a87e83c 100644 --- a/Zend/tests/bug41919.phpt +++ b/Zend/tests/bug41919.phpt @@ -8,7 +8,7 @@ $foo[3]->bar[1] = "bang"; echo "ok\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use string offset as an object' in %sbug41919.php:%d +Fatal error: Uncaught EngineException: Cannot use string offset as an object in %sbug41919.php:%d Stack trace: #0 {main} thrown in %sbug41919.php on line %d diff --git a/Zend/tests/bug42802.phpt b/Zend/tests/bug42802.phpt index b74ace1999..abbac47c9e 100644 --- a/Zend/tests/bug42802.phpt +++ b/Zend/tests/bug42802.phpt @@ -37,4 +37,8 @@ ok ok ok -Fatal error: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php:%d +Stack trace: +#0 %s(%d): foo\test5() +#1 {main} + thrown in %sbug42802.php on line %d diff --git a/Zend/tests/bug42817.phpt b/Zend/tests/bug42817.phpt index ea20999c21..0c2c531169 100644 --- a/Zend/tests/bug42817.phpt +++ b/Zend/tests/bug42817.phpt @@ -6,7 +6,7 @@ $a = clone(null); array_push($a->b, $c); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message '__clone method called on non-object' in %sbug42817.php:2 +Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug42817.php:2 Stack trace: #0 {main} thrown in %sbug42817.php on line 2 diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/bug42818.phpt index 0795abbad7..11d9895be9 100644 --- a/Zend/tests/bug42818.phpt +++ b/Zend/tests/bug42818.phpt @@ -5,7 +5,7 @@ Bug #42818 ($foo = clone(array()); leaks memory) $foo = clone(array()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message '__clone method called on non-object' in %sbug42818.php:2 +Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug42818.php:2 Stack trace: #0 {main} thrown in %sbug42818.php on line 2 diff --git a/Zend/tests/bug42819.phpt b/Zend/tests/bug42819.phpt index 20a182e100..84a3bfb640 100644 --- a/Zend/tests/bug42819.phpt +++ b/Zend/tests/bug42819.phpt @@ -299,7 +299,7 @@ Array [1] => 1 ) -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'foo\foo\unknown'' in %sbug42819.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'foo\foo\unknown' in %sbug42819.php:%d Stack trace: #0 %s(%d): foo\oops() #1 {main} diff --git a/Zend/tests/bug42937.phpt b/Zend/tests/bug42937.phpt index 6de7aef137..9d13a79d93 100644 --- a/Zend/tests/bug42937.phpt +++ b/Zend/tests/bug42937.phpt @@ -39,7 +39,7 @@ test3 test4 test5 -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method C::test6()' in %sbug42937.php:21 +Fatal error: Uncaught EngineException: Call to undefined method C::test6() in %sbug42937.php:21 Stack trace: #0 %s(%d): B->test() #1 {main} diff --git a/Zend/tests/bug43332_1.phpt b/Zend/tests/bug43332_1.phpt index 1642d6aed0..6506f9c591 100644 --- a/Zend/tests/bug43332_1.phpt +++ b/Zend/tests/bug43332_1.phpt @@ -12,4 +12,8 @@ $foo = new foo; $foo->bar($foo); // Ok! $foo->bar(new \stdclass); // Error, ok! --EXPECTF-- -Fatal error: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php:5 +Stack trace: +#0 %s(%d): foobar\foo->bar() +#1 {main} + thrown in %sbug43332_1.php on line 5 diff --git a/Zend/tests/bug43344_10.phpt b/Zend/tests/bug43344_10.phpt index 439199fd72..23bb8e9ad6 100644 --- a/Zend/tests/bug43344_10.phpt +++ b/Zend/tests/bug43344_10.phpt @@ -5,7 +5,7 @@ Bug #43344.10 (Wrong error message for undefined namespace constant) echo namespace\bar."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'bar'' in %sbug43344_10.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_10.php:%d Stack trace: #0 {main} thrown in %sbug43344_10.php on line %d diff --git a/Zend/tests/bug43344_11.phpt b/Zend/tests/bug43344_11.phpt index cfbaa62cd3..9529e7e582 100644 --- a/Zend/tests/bug43344_11.phpt +++ b/Zend/tests/bug43344_11.phpt @@ -8,7 +8,7 @@ function f($a=namespace\bar) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'bar'' in %sbug43344_11.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_11.php:%d Stack trace: #0 %s(%d): f() #1 {main} diff --git a/Zend/tests/bug43344_12.phpt b/Zend/tests/bug43344_12.phpt index 7cf1c915bb..b487421757 100644 --- a/Zend/tests/bug43344_12.phpt +++ b/Zend/tests/bug43344_12.phpt @@ -8,7 +8,7 @@ function f($a=array(namespace\bar)) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'bar'' in %sbug43344_12.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_12.php:%d Stack trace: #0 %s(%d): f() #1 {main} diff --git a/Zend/tests/bug43344_13.phpt b/Zend/tests/bug43344_13.phpt index 4a7b57de60..aab7d93da2 100644 --- a/Zend/tests/bug43344_13.phpt +++ b/Zend/tests/bug43344_13.phpt @@ -9,7 +9,7 @@ function f($a=array(namespace\bar=>0)) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'bar'' in %sbug43344_13.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_13.php:%d Stack trace: #0 %s(%d): f() #1 {main} diff --git a/Zend/tests/bug43344_2.phpt b/Zend/tests/bug43344_2.phpt index 05a379956d..6b74e76a0b 100644 --- a/Zend/tests/bug43344_2.phpt +++ b/Zend/tests/bug43344_2.phpt @@ -6,7 +6,7 @@ namespace Foo; echo Foo::bar."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Class 'Foo\Foo' not found' in %sbug43344_2.php:%d +Fatal error: Uncaught EngineException: Class 'Foo\Foo' not found in %sbug43344_2.php:%d Stack trace: #0 {main} thrown in %sbug43344_2.php on line %d diff --git a/Zend/tests/bug43344_6.phpt b/Zend/tests/bug43344_6.phpt index b14edbadb6..c5c848f808 100644 --- a/Zend/tests/bug43344_6.phpt +++ b/Zend/tests/bug43344_6.phpt @@ -6,7 +6,7 @@ namespace Foo; echo namespace\bar."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'Foo\bar'' in %sbug43344_6.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_6.php:%d Stack trace: #0 {main} thrown in %sbug43344_6.php on line %d diff --git a/Zend/tests/bug43344_7.phpt b/Zend/tests/bug43344_7.phpt index 6b5b914e34..6d536c1dd2 100644 --- a/Zend/tests/bug43344_7.phpt +++ b/Zend/tests/bug43344_7.phpt @@ -9,7 +9,7 @@ function f($a=namespace\bar) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'Foo\bar'' in %sbug43344_7.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_7.php:%d Stack trace: #0 %s(%d): Foo\f() #1 {main} diff --git a/Zend/tests/bug43344_8.phpt b/Zend/tests/bug43344_8.phpt index 2d8b8b0421..7f621f9cbf 100644 --- a/Zend/tests/bug43344_8.phpt +++ b/Zend/tests/bug43344_8.phpt @@ -9,7 +9,7 @@ function f($a=array(namespace\bar)) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'Foo\bar'' in %sbug43344_8.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_8.php:%d Stack trace: #0 %s(%d): Foo\f() #1 {main} diff --git a/Zend/tests/bug43344_9.phpt b/Zend/tests/bug43344_9.phpt index 533db85b53..a6117385b6 100644 --- a/Zend/tests/bug43344_9.phpt +++ b/Zend/tests/bug43344_9.phpt @@ -10,7 +10,7 @@ function f($a=array(namespace\bar=>0)) { echo f()."\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'Foo\bar'' in %sbug43344_9.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_9.php:%d Stack trace: #0 %s(%d): Foo\f() #1 {main} diff --git a/Zend/tests/bug44141.phpt b/Zend/tests/bug44141.phpt index d3fe17b35d..021b4810f4 100644 --- a/Zend/tests/bug44141.phpt +++ b/Zend/tests/bug44141.phpt @@ -22,7 +22,7 @@ class Y extends X $y = Y::cheat(5); echo $y->x, PHP_EOL; --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private X::__construct() from context 'Y'' in %sbug44141.php:15 +Fatal error: Uncaught EngineException: Call to private X::__construct() from context 'Y' in %sbug44141.php:15 Stack trace: #0 %s(%d): Y::cheat(5) #1 {main} diff --git a/Zend/tests/bug45805.phpt b/Zend/tests/bug45805.phpt index f8a2484438..1bb03e917e 100644 --- a/Zend/tests/bug45805.phpt +++ b/Zend/tests/bug45805.phpt @@ -38,7 +38,7 @@ $o = new B; $o->bar(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' in %sbug45805.php:%d +Fatal error: Uncaught RuntimeException in %sbug45805.php:%d Stack trace: #0 %sbug45805.php(%d): PHPUnit_Util_ErrorHandler::handleError(8, 'Only variables ...', '%s', %d, Array) #1 [internal function]: B->foo() diff --git a/Zend/tests/bug46304.phpt b/Zend/tests/bug46304.phpt index e14ec7af4d..19374047cf 100644 --- a/Zend/tests/bug46304.phpt +++ b/Zend/tests/bug46304.phpt @@ -62,7 +62,7 @@ value6 value6 value6 -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'NS1\ns2\coNSt1'' in %sbug46304.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'NS1\ns2\coNSt1' in %sbug46304.php:%d Stack trace: #0 {main} thrown in %sbug46304.php on line %d diff --git a/Zend/tests/bug46381.phpt b/Zend/tests/bug46381.phpt index f617ebca61..f86b5f07d5 100644 --- a/Zend/tests/bug46381.phpt +++ b/Zend/tests/bug46381.phpt @@ -14,7 +14,7 @@ $test->method(); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method ArrayIterator::current() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method ArrayIterator::current() cannot be called statically in %s:%d Stack trace: #0 %s(%d): test->method() #1 {main} diff --git a/Zend/tests/bug47054.phpt b/Zend/tests/bug47054.phpt index fdbff823a2..7433baba24 100644 --- a/Zend/tests/bug47054.phpt +++ b/Zend/tests/bug47054.phpt @@ -36,7 +36,7 @@ Warning: get_called_class() called from outside a class in %s on line %d Deprecated: Non-static method D::m() should not be called statically in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught EngineException: Using $this when not in object context in %s:%d Stack trace: #0 %s(%d): D::m() #1 {main} diff --git a/Zend/tests/bug47699.phpt b/Zend/tests/bug47699.phpt index 3291e58735..8cb3280bcf 100644 --- a/Zend/tests/bug47699.phpt +++ b/Zend/tests/bug47699.phpt @@ -15,7 +15,7 @@ new X(); ?> --EXPECTF-- BB -Fatal error: Uncaught exception 'Error' with message 'Class 'X' not found' in %sbug47699.php:%d +Fatal error: Uncaught EngineException: Class 'X' not found in %sbug47699.php:%d Stack trace: #0 {main} thrown in %sbug47699.php on line %d diff --git a/Zend/tests/bug47704.phpt b/Zend/tests/bug47704.phpt index e2e6ceb959..306443f8bb 100644 --- a/Zend/tests/bug47704.phpt +++ b/Zend/tests/bug47704.phpt @@ -6,7 +6,7 @@ $s = "abd"; $s[0]->a += 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use string offset as an object' in %sbug47704.php:%d +Fatal error: Uncaught EngineException: Cannot use string offset as an object in %sbug47704.php:%d Stack trace: #0 {main} thrown in %sbug47704.php on line %d diff --git a/Zend/tests/bug48215_2.phpt b/Zend/tests/bug48215_2.phpt index 7db4b9c492..034b3f1a4c 100644 --- a/Zend/tests/bug48215_2.phpt +++ b/Zend/tests/bug48215_2.phpt @@ -16,7 +16,7 @@ $c = new c(); ?> ===DONE=== --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method b::b()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method b::b() in %s:%d Stack trace: #0 %s(%d): c->__construct() #1 {main} diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/bug48228.phpt index ae8ba617b8..1f0d0a54a1 100644 --- a/Zend/tests/bug48228.phpt +++ b/Zend/tests/bug48228.phpt @@ -24,7 +24,7 @@ $l_aa->dosome(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s +Fatal error: Uncaught Exception in %s Stack trace: #0 %s(%d): do_throw() #1 %s(%d): aa->dosome() diff --git a/Zend/tests/bug48408.phpt b/Zend/tests/bug48408.phpt index 20a019807b..7ae32a5d48 100644 --- a/Zend/tests/bug48408.phpt +++ b/Zend/tests/bug48408.phpt @@ -23,7 +23,7 @@ catch(Exception $e){ ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s +Fatal error: Uncaught Exception in %s Stack trace: #0 %s(%d): C->generate(0) #1 {main} diff --git a/Zend/tests/bug48693.phpt b/Zend/tests/bug48693.phpt index cb6beb3a3d..c4fbb4f297 100644 --- a/Zend/tests/bug48693.phpt +++ b/Zend/tests/bug48693.phpt @@ -5,22 +5,22 @@ Bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted) try { $x = create_function('', 'return 1; }'); -} catch (ParseError $e) { +} catch (ParseException $e) { echo "$e\n\n"; } try { $y = create_function('', 'function a() { }; return 2;'); -} catch (ParseError $e) { +} catch (ParseException $e) { echo "$e\n\n"; } try { $z = create_function('', '{'); -} catch (ParseError $e) { +} catch (ParseException $e) { echo "$e\n\n"; } try { $w = create_function('', 'return 3;'); -} catch (ParseError $e) { +} catch (ParseException $e) { echo "$e\n\n"; } @@ -31,12 +31,12 @@ var_dump( ?> --EXPECTF-- -exception 'ParseError' with message 'syntax error, unexpected '}', expecting end of file' in %sbug48693.php(4) : runtime-created function:1 +ParseException: syntax error, unexpected '}', expecting end of file in %sbug48693.php(4) : runtime-created function:1 Stack trace: #0 %sbug48693.php(4): create_function('', 'return 1; }') #1 {main} -exception 'ParseError' with message 'syntax error, unexpected end of file' in %sbug48693.php(14) : runtime-created function:1 +ParseException: syntax error, unexpected end of file in %sbug48693.php(14) : runtime-created function:1 Stack trace: #0 %sbug48693.php(14): create_function('', '{') #1 {main} diff --git a/Zend/tests/bug49866.phpt b/Zend/tests/bug49866.phpt index 28198e0e60..956367f693 100644 --- a/Zend/tests/bug49866.phpt +++ b/Zend/tests/bug49866.phpt @@ -7,7 +7,7 @@ $b = &$a[1]; $b = "f"; echo $a; --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot create references to/from string offsets nor overloaded objects' in %sbug49866.php:3 +Fatal error: Uncaught EngineException: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php:3 Stack trace: #0 {main} thrown in %sbug49866.php on line 3 diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt index 08d6383d83..ea05f2b567 100644 --- a/Zend/tests/bug49908.phpt +++ b/Zend/tests/bug49908.phpt @@ -20,7 +20,7 @@ new Foo; %unicode|string%(3) "Foo" %unicode|string%(3) "Bar" -Fatal error: Uncaught exception 'Exception' with message 'Bar' in %s:%d +Fatal error: Uncaught Exception: Bar in %s:%d Stack trace: #0 %s(7): __autoload('Bar') #1 %s(13): __autoload('Foo') diff --git a/Zend/tests/bug50005.phpt b/Zend/tests/bug50005.phpt index bf4fbbda68..2ed055a129 100644 --- a/Zend/tests/bug50005.phpt +++ b/Zend/tests/bug50005.phpt @@ -13,7 +13,7 @@ throw new a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'a' in :%d +Fatal error: Uncaught a in :%d Stack trace: #0 {main} thrown in Unknown on line %d diff --git a/Zend/tests/bug50146.phpt b/Zend/tests/bug50146.phpt index f5871f726d..ffd07edbd3 100644 --- a/Zend/tests/bug50146.phpt +++ b/Zend/tests/bug50146.phpt @@ -17,7 +17,7 @@ var_dump(isset($obj->a)); bool(false) bool(false) -Fatal error: Uncaught exception 'Error' with message 'Closure object cannot have properties' in %s:%d +Fatal error: Uncaught EngineException: Closure object cannot have properties in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/bug51394.phpt index b0dddffaf8..e2d260b2b2 100644 --- a/Zend/tests/bug51394.phpt +++ b/Zend/tests/bug51394.phpt @@ -13,7 +13,7 @@ function eh() set_error_handler("eh"); $a = $empty($b); --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:%d +Fatal error: Uncaught Exception: error! in %sbug51394.php:%d Stack trace: #0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d, Array) #1 {main} diff --git a/Zend/tests/bug52361.phpt b/Zend/tests/bug52361.phpt index e6e891337d..4159ac0b8c 100644 --- a/Zend/tests/bug52361.phpt +++ b/Zend/tests/bug52361.phpt @@ -23,12 +23,12 @@ try { } ?> --EXPECTF-- -1. exception 'Exception' with message 'aaa' in %sbug52361.php:5 +1. Exception: aaa in %sbug52361.php:5 Stack trace: #0 %sbug52361.php(13): aaa->__destruct() #1 %sbug52361.php(16): bbb() #2 {main} -2. exception 'Exception' with message 'bbb' in %sbug52361.php:13 +2. Exception: bbb in %sbug52361.php:13 Stack trace: #0 %sbug52361.php(16): bbb() #1 {main} diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/bug52484.phpt index 6f053775c7..6000418a29 100644 --- a/Zend/tests/bug52484.phpt +++ b/Zend/tests/bug52484.phpt @@ -16,7 +16,7 @@ unset($a->$prop); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d Stack trace: #0 %s(%d): A->__unset('') #1 {main} diff --git a/Zend/tests/bug52484_2.phpt b/Zend/tests/bug52484_2.phpt index fa0e3fa0b2..5181a425f0 100644 --- a/Zend/tests/bug52484_2.phpt +++ b/Zend/tests/bug52484_2.phpt @@ -16,7 +16,7 @@ $a->$prop = 2; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d Stack trace: #0 %s(%d): A->__set('', 2) #1 {main} diff --git a/Zend/tests/bug52484_3.phpt b/Zend/tests/bug52484_3.phpt index d5518f9508..b7646ab047 100644 --- a/Zend/tests/bug52484_3.phpt +++ b/Zend/tests/bug52484_3.phpt @@ -16,7 +16,7 @@ var_dump($a->$prop); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d Stack trace: #0 %s(%d): A->__get('') #1 {main} diff --git a/Zend/tests/bug53511.phpt b/Zend/tests/bug53511.phpt index 88f0cbe8f4..0075655428 100644 --- a/Zend/tests/bug53511.phpt +++ b/Zend/tests/bug53511.phpt @@ -20,12 +20,12 @@ function test() { test(); echo "bug\n"; --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'ops 2' in %sbug53511.php:11 +Fatal error: Uncaught Exception: ops 2 in %sbug53511.php:11 Stack trace: #0 %sbug53511.php(17): test() #1 {main} -Next exception 'Exception' with message 'ops 1' in %sbug53511.php:4 +Next Exception: ops 1 in %sbug53511.php:4 Stack trace: #0 %sbug53511.php(12): Foo->__destruct() #1 %sbug53511.php(17): test() diff --git a/Zend/tests/bug55705.phpt b/Zend/tests/bug55705.phpt index e2656cbddb..4b3e9413db 100644 --- a/Zend/tests/bug55705.phpt +++ b/Zend/tests/bug55705.phpt @@ -6,4 +6,8 @@ function f(callable $c) {} f(); ?> --EXPECTF-- -Fatal error: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s:%d +Stack trace: +#0 %s(%d): f() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/bug60738_variation.phpt b/Zend/tests/bug60738_variation.phpt index d7cf00ecdb..f9e2e73458 100644 --- a/Zend/tests/bug60738_variation.phpt +++ b/Zend/tests/bug60738_variation.phpt @@ -16,7 +16,7 @@ NULL object(Closure)#1 (0) { } -Fatal error: Uncaught exception 'Exception' with message 'Exception!' in %s:%d +Fatal error: Uncaught Exception: Exception! in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug60909_1.phpt b/Zend/tests/bug60909_1.phpt index cfe4289287..e4c07face1 100644 --- a/Zend/tests/bug60909_1.phpt +++ b/Zend/tests/bug60909_1.phpt @@ -11,7 +11,7 @@ set_error_handler(function($errno, $errstr, $errfile, $errline){ require 'notfound.php'; --EXPECTF-- error(require(notfound.php): failed to open stream: %s) -Warning: Uncaught exception 'Exception' with message 'Foo' in %sbug60909_1.php:5 +Warning: Uncaught Exception: Foo in %sbug60909_1.php:5 Stack trace: #0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array) #1 %sbug60909_1.php(8): require() diff --git a/Zend/tests/bug61025.phpt b/Zend/tests/bug61025.phpt index eb541bd7c4..4b06d7f704 100644 --- a/Zend/tests/bug61025.phpt +++ b/Zend/tests/bug61025.phpt @@ -24,7 +24,7 @@ Warning: The magic method __invoke() must have public visibility and cannot be s Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d Bar -Fatal error: Uncaught exception 'Error' with message 'Call to private method Bar::__invoke() from context ''' in %sbug61025.php:%d +Fatal error: Uncaught EngineException: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d Stack trace: #0 {main} thrown in %sbug61025.php on line %d diff --git a/Zend/tests/bug61767.phpt b/Zend/tests/bug61767.phpt index 9bd9c907bd..5e949706e8 100644 --- a/Zend/tests/bug61767.phpt +++ b/Zend/tests/bug61767.phpt @@ -17,7 +17,7 @@ $undefined->foo(); --EXPECTF-- Error handler called (Undefined variable: undefined) -Fatal error: Uncaught exception 'ErrorException' with message 'Undefined variable: undefined' in %sbug61767.php:%d +Fatal error: Uncaught ErrorException: Undefined variable: undefined in %sbug61767.php:%d Stack trace: #0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d, Array) #1 {main} diff --git a/Zend/tests/bug63111.phpt b/Zend/tests/bug63111.phpt index 01550cf158..38d6fafefc 100644 --- a/Zend/tests/bug63111.phpt +++ b/Zend/tests/bug63111.phpt @@ -31,7 +31,7 @@ bool(true) bool(true) ok -Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method Foo::bar()' in %sbug63111.php:20 +Fatal error: Uncaught EngineException: Cannot call abstract method Foo::bar() in %sbug63111.php:20 Stack trace: #0 {main} thrown in %sbug63111.php on line 20 diff --git a/Zend/tests/bug63173.phpt b/Zend/tests/bug63173.phpt index 99fb04199d..af2611fc04 100644 --- a/Zend/tests/bug63173.phpt +++ b/Zend/tests/bug63173.phpt @@ -9,7 +9,7 @@ $callback(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Array callback has to contain indices 0 and 1' in %s:%d +Fatal error: Uncaught EngineException: Array callback has to contain indices 0 and 1 in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt index 894c93c55c..20fceff7fd 100644 --- a/Zend/tests/bug64720.phpt +++ b/Zend/tests/bug64720.phpt @@ -22,7 +22,7 @@ class Foo { } } -class ErrorTest { +class Error { private $trace; public function __construct() { $this->trace = debug_backtrace(1); @@ -32,11 +32,11 @@ class ErrorTest { class Bar { public function __destruct() { Stat::getInstance(); - new ErrorTest(); + new Error(); } public function test() { - new ErrorTest(); + new Error(); } } @@ -45,7 +45,7 @@ $bar = new Bar(); $bar->test(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: Stat::$requests' in %sbug64720.php:12 +Fatal error: Uncaught EngineException: Access to undeclared static property: Stat::$requests in %sbug64720.php:12 Stack trace: #0 [internal function]: Stat->__destruct() #1 {main} diff --git a/Zend/tests/bug64821.1.phpt b/Zend/tests/bug64821.1.phpt index 5e2093c472..39bec77a45 100644 --- a/Zend/tests/bug64821.1.phpt +++ b/Zend/tests/bug64821.1.phpt @@ -16,7 +16,7 @@ throw new a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'a' in %s:0 +Fatal error: Uncaught a in %s:0 Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug64821.2.phpt b/Zend/tests/bug64821.2.phpt index 91a43f500b..5650c48872 100644 --- a/Zend/tests/bug64821.2.phpt +++ b/Zend/tests/bug64821.2.phpt @@ -13,7 +13,7 @@ throw new a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'a' in %s:0 +Fatal error: Uncaught a in %s:0 Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug64821.3.phpt b/Zend/tests/bug64821.3.phpt index 9e96075d49..831665e364 100644 --- a/Zend/tests/bug64821.3.phpt +++ b/Zend/tests/bug64821.3.phpt @@ -14,7 +14,7 @@ throw new a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'a' in :0 +Fatal error: Uncaught a in :0 Stack trace: #0 {main} thrown in Unknown on line %d diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt index b31cca3dc6..cf36fef6da 100644 --- a/Zend/tests/bug64960.phpt +++ b/Zend/tests/bug64960.phpt @@ -31,7 +31,7 @@ $a['waa']; --EXPECTF-- Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3 -Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19 +Fatal error: Uncaught Exception in %sbug64960.php:19 Stack trace: #0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array) #1 %sbug64960.php(9): ob_end_clean() diff --git a/Zend/tests/bug64966.phpt b/Zend/tests/bug64966.phpt index f533093e60..329503e5af 100644 --- a/Zend/tests/bug64966.phpt +++ b/Zend/tests/bug64966.phpt @@ -21,7 +21,7 @@ $a = new A(); $a->b(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %sbug64966.php:6 +Fatal error: Uncaught Exception in %sbug64966.php:6 Stack trace: #0 %sbug64966.php(13): test('iterator_apply') #1 %sbug64966.php(18): A->b() diff --git a/Zend/tests/bug65784.phpt b/Zend/tests/bug65784.phpt index 5f363fc38c..8b9f7dfc75 100644 --- a/Zend/tests/bug65784.phpt +++ b/Zend/tests/bug65784.phpt @@ -57,7 +57,7 @@ $bar = foo3(); string(9) "not catch" NULL -Fatal error: Uncaught exception 'Error' with message 'Class 'NotExists' not found' in %sbug65784.php:%d +Fatal error: Uncaught EngineException: Class 'NotExists' not found in %sbug65784.php:%d Stack trace: #0 %s(%d): foo3() #1 {main} diff --git a/Zend/tests/bug65911.phpt b/Zend/tests/bug65911.phpt index c9b5eef09d..4f3a613834 100644 --- a/Zend/tests/bug65911.phpt +++ b/Zend/tests/bug65911.phpt @@ -17,7 +17,7 @@ $obj = new B(); $obj->go(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: A::$this' in %s:%d +Fatal error: Uncaught EngineException: Access to undeclared static property: A::$this in %s:%d Stack trace: #0 %s(%d): B->go() #1 {main} diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt index e19610b5ca..6a7f914810 100644 --- a/Zend/tests/bug68446.phpt +++ b/Zend/tests/bug68446.phpt @@ -32,5 +32,9 @@ array(1) { int(1) } -Fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): a() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/bug68652.phpt b/Zend/tests/bug68652.phpt index 054e5e3f4c..f0a66ceb60 100644 --- a/Zend/tests/bug68652.phpt +++ b/Zend/tests/bug68652.phpt @@ -36,7 +36,7 @@ class Bar { $foo = new Foo(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: Bar::$instance' in %sbug68652.php:%d +Fatal error: Uncaught EngineException: Access to undeclared static property: Bar::$instance in %sbug68652.php:%d Stack trace: #0 %s(%d): Bar::getInstance() #1 [internal function]: Foo->__destruct() diff --git a/Zend/tests/bug69599.phpt b/Zend/tests/bug69599.phpt index fa8eaa3db4..f8e77f2a36 100644 --- a/Zend/tests/bug69599.phpt +++ b/Zend/tests/bug69599.phpt @@ -13,7 +13,7 @@ iterator_to_array(crash()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 [internal function]: crash() #1 %s(%d): iterator_to_array(Object(Generator)) diff --git a/Zend/tests/call_static_004.phpt b/Zend/tests/call_static_004.phpt index c2f36e0f35..022f4701ba 100644 --- a/Zend/tests/call_static_004.phpt +++ b/Zend/tests/call_static_004.phpt @@ -18,7 +18,7 @@ foo::$a(); --EXPECTF-- string(3) "AaA" -Fatal error: Uncaught exception 'Error' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught EngineException: Function name must be a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt index 69e3e2425f..2f55d71cc0 100644 --- a/Zend/tests/call_static_006.phpt +++ b/Zend/tests/call_static_006.phpt @@ -27,7 +27,7 @@ ok Deprecated: Non-static method foo::aa() should not be called statically in %s on line %d ok -Fatal error: Uncaught exception 'Error' with message 'Cannot call constructor' in %s:%d +Fatal error: Uncaught EngineException: Cannot call constructor in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/call_user_func_004.phpt b/Zend/tests/call_user_func_004.phpt index f7713950f0..6b5efcb6df 100644 --- a/Zend/tests/call_user_func_004.phpt +++ b/Zend/tests/call_user_func_004.phpt @@ -15,7 +15,7 @@ call_user_func(array('foo', 'teste')); --EXPECTF-- Deprecated: %son-static method foo::teste() should not be called statically in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught EngineException: Using $this when not in object context in %s:%d Stack trace: #0 %s(%d): foo::teste() #1 {main} diff --git a/Zend/tests/class_alias_008.phpt b/Zend/tests/class_alias_008.phpt index 4182654dd9..df2b4b95ea 100644 --- a/Zend/tests/class_alias_008.phpt +++ b/Zend/tests/class_alias_008.phpt @@ -13,7 +13,7 @@ new $a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class foo' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class foo in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/class_alias_016.phpt b/Zend/tests/class_alias_016.phpt index 085abef20f..5ae6b64479 100644 --- a/Zend/tests/class_alias_016.phpt +++ b/Zend/tests/class_alias_016.phpt @@ -18,7 +18,7 @@ var_dump(new foo); object(foo\bar)#%d (0) { } -Fatal error: Uncaught exception 'Error' with message 'Class 'foo\foo' not found' in %s:%d +Fatal error: Uncaught EngineException: Class 'foo\foo' not found in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/class_alias_020.phpt b/Zend/tests/class_alias_020.phpt index f7a30a597e..861f928793 100644 --- a/Zend/tests/class_alias_020.phpt +++ b/Zend/tests/class_alias_020.phpt @@ -30,7 +30,7 @@ object(foo\foo)#1 (0) { object(foo\bar\foo)#2 (0) { } -Fatal error: Uncaught exception 'Error' with message 'Class 'foo\bar' not found' in %s:%d +Fatal error: Uncaught EngineException: Class 'foo\bar' not found in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/class_constants_001.phpt index 89d0a01538..d7afc22e64 100644 --- a/Zend/tests/class_constants_001.phpt +++ b/Zend/tests/class_constants_001.phpt @@ -19,7 +19,7 @@ echo "Done\n"; string(6) "string" int(1) -Fatal error: Uncaught exception 'Error' with message 'Undefined class constant 'val3'' in %s:%d +Fatal error: Uncaught EngineException: Undefined class constant 'val3' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/class_name_as_scalar_error_005.phpt b/Zend/tests/class_name_as_scalar_error_005.phpt index 8dae871978..71eb9b84af 100644 --- a/Zend/tests/class_name_as_scalar_error_005.phpt +++ b/Zend/tests/class_name_as_scalar_error_005.phpt @@ -7,7 +7,7 @@ $x = static::class; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use "static" when no class scope is active' in %s:3 +Fatal error: Uncaught EngineException: Cannot use "static" when no class scope is active in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/Zend/tests/class_name_as_scalar_error_006.phpt b/Zend/tests/class_name_as_scalar_error_006.phpt index cc62713fbd..15f1ec347e 100644 --- a/Zend/tests/class_name_as_scalar_error_006.phpt +++ b/Zend/tests/class_name_as_scalar_error_006.phpt @@ -7,7 +7,7 @@ $x = parent::class; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use "parent" when no class scope is active' in %s:3 +Fatal error: Uncaught EngineException: Cannot use "parent" when no class scope is active in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/Zend/tests/class_name_as_scalar_error_007.phpt b/Zend/tests/class_name_as_scalar_error_007.phpt index 5b51a30409..01241f4226 100644 --- a/Zend/tests/class_name_as_scalar_error_007.phpt +++ b/Zend/tests/class_name_as_scalar_error_007.phpt @@ -7,7 +7,7 @@ var_dump(self::class); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use "self" when no class scope is active' in %s:3 +Fatal error: Uncaught EngineException: Cannot use "self" when no class scope is active in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/Zend/tests/clone_001.phpt b/Zend/tests/clone_001.phpt index 08cf1df061..8109aa6422 100644 --- a/Zend/tests/clone_001.phpt +++ b/Zend/tests/clone_001.phpt @@ -7,7 +7,7 @@ $a = clone array(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message '__clone method called on non-object' in %s:%d +Fatal error: Uncaught EngineException: __clone method called on non-object in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone_003.phpt index 6656026d64..b3adc2b09f 100644 --- a/Zend/tests/clone_003.phpt +++ b/Zend/tests/clone_003.phpt @@ -9,7 +9,7 @@ $a = clone $b; --EXPECTF-- Notice: Undefined variable: b in %s on line %d -Fatal error: Uncaught exception 'Error' with message '__clone method called on non-object' in %s:%d +Fatal error: Uncaught EngineException: __clone method called on non-object in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/clone_004.phpt b/Zend/tests/clone_004.phpt index 1e09902e93..e24795ec0a 100644 --- a/Zend/tests/clone_004.phpt +++ b/Zend/tests/clone_004.phpt @@ -17,7 +17,7 @@ $a = clone $c->b[1]; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type foo as array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use object of type foo as array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/closure_005.phpt b/Zend/tests/closure_005.phpt index 9c84115581..72535b466d 100644 --- a/Zend/tests/closure_005.phpt +++ b/Zend/tests/closure_005.phpt @@ -71,7 +71,7 @@ echo "Done\n"; 7 Destroyed -Fatal error: Uncaught exception 'Error' with message 'Using $this when not in object context' in %sclosure_005.php:28 +Fatal error: Uncaught EngineException: Using $this when not in object context in %sclosure_005.php:28 Stack trace: #0 %s(%d): A::{closure}() #1 {main} diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closure_019.phpt index c46db6b80b..5505fd2937 100644 --- a/Zend/tests/closure_019.phpt +++ b/Zend/tests/closure_019.phpt @@ -26,7 +26,7 @@ int(9) Notice: Only variable references should be returned by reference in %sclosure_019.php on line 4 int(81) -Fatal error: Uncaught exception 'Error' with message 'Cannot pass parameter 1 by reference' in %s:%d +Fatal error: Uncaught EngineException: Cannot pass parameter 1 by reference in %s:%d Stack trace: #0 %s(%d): test() #1 {main} diff --git a/Zend/tests/closure_020.phpt b/Zend/tests/closure_020.phpt index ad88d28cb5..a13d4a63c6 100644 --- a/Zend/tests/closure_020.phpt +++ b/Zend/tests/closure_020.phpt @@ -40,7 +40,7 @@ object(foo)#%d (2) { bool(true) bool(true) -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property foo::$test' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property foo::$test in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closure_022.phpt index 70cc74177f..1d48e6683e 100644 --- a/Zend/tests/closure_022.phpt +++ b/Zend/tests/closure_022.phpt @@ -8,7 +8,7 @@ $foo = function() use ($a) { $foo->a = 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Closure object cannot have properties' in %sclosure_022.php:5 +Fatal error: Uncaught EngineException: Closure object cannot have properties in %sclosure_022.php:5 Stack trace: #0 {main} thrown in %sclosure_022.php on line 5 diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closure_027.phpt index 442615c278..7024a93c55 100644 --- a/Zend/tests/closure_027.phpt +++ b/Zend/tests/closure_027.phpt @@ -28,4 +28,8 @@ Notice: Undefined variable: y in %s on line %d Warning: Missing argument 1 for {closure}(), called in %s on line %d and defined in %s on line %d NULL -Fatal error: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): test() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/closure_033.phpt b/Zend/tests/closure_033.phpt index 39b213ddf1..4e445721ea 100644 --- a/Zend/tests/closure_033.phpt +++ b/Zend/tests/closure_033.phpt @@ -25,7 +25,7 @@ $o->func(); --EXPECTF-- Test::{closure}() -Fatal error: Uncaught exception 'Error' with message 'Call to private method Test::func() from context ''' in %sclosure_033.php:%d +Fatal error: Uncaught EngineException: Call to private method Test::func() from context '' in %sclosure_033.php:%d Stack trace: #0 {main} thrown in %sclosure_033.php on line %d diff --git a/Zend/tests/closure_038.phpt b/Zend/tests/closure_038.phpt index 8f2ca65e4a..f3bcd831a9 100644 --- a/Zend/tests/closure_038.phpt +++ b/Zend/tests/closure_038.phpt @@ -55,12 +55,12 @@ Testing with scope as string int(23) int(24) -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property B::$x' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property B::$x in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'Error' with message 'Cannot access private property B::$x' in %s:%d +Next EngineException: Cannot access private property B::$x in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} diff --git a/Zend/tests/closure_039.phpt b/Zend/tests/closure_039.phpt index 8b702f7d63..2afd920105 100644 --- a/Zend/tests/closure_039.phpt +++ b/Zend/tests/closure_039.phpt @@ -55,12 +55,12 @@ Testing with scope as string int(23) int(24) -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property B::$x' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property B::$x in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'Error' with message 'Cannot access private property B::$x' in %s:%d +Next EngineException: Cannot access private property B::$x in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} diff --git a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt b/Zend/tests/constant_expressions_invalid_offset_type_error.phpt index d3b38fd035..5cee0a0bfe 100644 --- a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt +++ b/Zend/tests/constant_expressions_invalid_offset_type_error.phpt @@ -8,7 +8,7 @@ const C2 = [C1, [] => 1]; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Illegal offset type' in %s:%d +Fatal error: Uncaught EngineException: Illegal offset type in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/constant_expressions_self_referencing_array.phpt b/Zend/tests/constant_expressions_self_referencing_array.phpt index c31b5d47b8..fa14af2f28 100644 --- a/Zend/tests/constant_expressions_self_referencing_array.phpt +++ b/Zend/tests/constant_expressions_self_referencing_array.phpt @@ -9,7 +9,7 @@ class A { var_dump(A::FOO); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot declare self-referencing constant 'self::FOO'' in %s:%d +Fatal error: Uncaught EngineException: Cannot declare self-referencing constant 'self::FOO' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 2827ab1b74..695c8d2150 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -31,7 +31,7 @@ try { ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include -Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existent.Class' in %s +Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s Stack trace: #0 %s(%d): CL->load('class://non.exi...') #1 {main} diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference_002.phpt index c7ac94ab7a..c206e70b3e 100644 --- a/Zend/tests/dereference_002.phpt +++ b/Zend/tests/dereference_002.phpt @@ -76,7 +76,7 @@ NULL Notice: Undefined offset: 3 in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function bar() on null' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function bar() on null in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/dereference_010.phpt b/Zend/tests/dereference_010.phpt index a20288a687..ec62e5614e 100644 --- a/Zend/tests/dereference_010.phpt +++ b/Zend/tests/dereference_010.phpt @@ -24,7 +24,7 @@ var_dump(b()[1]); NULL NULL -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use object of type stdClass as array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/div_002.phpt b/Zend/tests/div_002.phpt index 9f8b6c9a31..34f377e229 100644 --- a/Zend/tests/div_002.phpt +++ b/Zend/tests/div_002.phpt @@ -8,7 +8,7 @@ $b = array(1); try { var_dump($a / $b); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/dynamic_call_001.phpt b/Zend/tests/dynamic_call_001.phpt index 44df985e64..c3c92e07cf 100644 --- a/Zend/tests/dynamic_call_001.phpt +++ b/Zend/tests/dynamic_call_001.phpt @@ -16,7 +16,7 @@ $a::$a(); --EXPECTF-- Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; foo has a deprecated constructor in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Non-static method foo::foo() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method foo::foo() cannot be called statically in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call_002.phpt index a323d34a57..5d05680918 100644 --- a/Zend/tests/dynamic_call_002.phpt +++ b/Zend/tests/dynamic_call_002.phpt @@ -9,7 +9,7 @@ $a::$a(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught EngineException: Function name must be a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call_003.phpt index 17d54da9e9..c929e8b04c 100644 --- a/Zend/tests/dynamic_call_003.phpt +++ b/Zend/tests/dynamic_call_003.phpt @@ -10,7 +10,7 @@ $a::$b(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught EngineException: Function name must be a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt index 9092492311..59da5c7ca5 100644 --- a/Zend/tests/dynamic_call_004.phpt +++ b/Zend/tests/dynamic_call_004.phpt @@ -9,7 +9,7 @@ $a::$b(); --EXPECTF-- Notice: Undefined variable: a in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Class name must be a valid object or a string' in %s:%d +Fatal error: Uncaught EngineException: Class name must be a valid object or a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/errmsg_044.phpt b/Zend/tests/errmsg_044.phpt index af7ec49fac..4b60b1600e 100644 --- a/Zend/tests/errmsg_044.phpt +++ b/Zend/tests/errmsg_044.phpt @@ -8,7 +8,7 @@ $a[0][0] = new stdclass; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use object of type stdClass as array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_001.phpt b/Zend/tests/exception_001.phpt index ab74a920e7..a206f3461c 100644 --- a/Zend/tests/exception_001.phpt +++ b/Zend/tests/exception_001.phpt @@ -32,7 +32,7 @@ string(0) "" string(0) "" string(0) "" -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exception_003.phpt index e060aace05..1f60f7874e 100644 --- a/Zend/tests/exception_003.phpt +++ b/Zend/tests/exception_003.phpt @@ -8,7 +8,7 @@ throw new Exception(1); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message '1' in %s:%d +Fatal error: Uncaught Exception: 1 in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exception_004.phpt index 0bcfc13042..b7b776572c 100644 --- a/Zend/tests/exception_004.phpt +++ b/Zend/tests/exception_004.phpt @@ -15,7 +15,7 @@ try { ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Exceptions must be valid objects implementing Throwable' in %s:%d +Fatal error: Uncaught EngineException: Exceptions must be valid objects derived from the Exception base class in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_005.phpt b/Zend/tests/exception_005.phpt index 032923392e..0d55f0c6b0 100644 --- a/Zend/tests/exception_005.phpt +++ b/Zend/tests/exception_005.phpt @@ -9,7 +9,7 @@ throw new a(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate interface a' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate interface a in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_006.phpt b/Zend/tests/exception_006.phpt index ac68c104d6..31dff03838 100644 --- a/Zend/tests/exception_006.phpt +++ b/Zend/tests/exception_006.phpt @@ -7,7 +7,7 @@ throw 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Can only throw objects' in %s:%d +Fatal error: Uncaught EngineException: Can only throw objects in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_007.phpt b/Zend/tests/exception_007.phpt index 953e76513b..b3da7099a2 100644 --- a/Zend/tests/exception_007.phpt +++ b/Zend/tests/exception_007.phpt @@ -18,19 +18,19 @@ catch (Exception $e) { ?> ===DONE=== --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'Another' in %sexception_007.php:%d +Fatal error: Uncaught Exception: Another in %sexception_007.php:%d Stack trace: #0 {main} -Next exception 'Exception' with message 'First' in %sexception_007.php:%d +Next Exception: First in %sexception_007.php:%d Stack trace: #0 {main} -Next exception 'Exception' with message 'Second' in %sexception_007.php:%d +Next Exception: Second in %sexception_007.php:%d Stack trace: #0 {main} -Next exception 'Exception' with message 'Third' in %sexception_007.php:%d +Next Exception: Third in %sexception_007.php:%d Stack trace: #0 {main} thrown in %sexception_007.php on line %d diff --git a/Zend/tests/exception_008.phpt b/Zend/tests/exception_008.phpt index 0d40541eee..fe4ee0d8ea 100644 --- a/Zend/tests/exception_008.phpt +++ b/Zend/tests/exception_008.phpt @@ -24,12 +24,12 @@ unset($ar); ?> ===DONE=== --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'First' in %sexception_008.php:%d +Fatal error: Uncaught Exception: First in %sexception_008.php:%d Stack trace: #0 %sexception_008.php(%d): TestFirst->__destruct() #1 {main} -Next exception 'Exception' with message 'Second' in %sexception_008.php:%d +Next Exception: Second in %sexception_008.php:%d Stack trace: #0 %sexception_008.php(%d): TestSecond->__destruct() #1 {main} diff --git a/Zend/tests/exception_011.phpt b/Zend/tests/exception_011.phpt index e02a75a2b0..d128f06ab8 100644 --- a/Zend/tests/exception_011.phpt +++ b/Zend/tests/exception_011.phpt @@ -13,7 +13,7 @@ assert(false); --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexception_011.php:%d +Fatal error: Uncaught AssertionException: assert(false) in %sexception_011.php:%d Stack trace: #0 %sexception_011.php(%d): assert(false, 'assert(false)') #1 {main} diff --git a/Zend/tests/exception_012.phpt b/Zend/tests/exception_012.phpt index 6493e2ccf7..eaeaef8604 100644 --- a/Zend/tests/exception_012.phpt +++ b/Zend/tests/exception_012.phpt @@ -13,7 +13,7 @@ $func(); --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'AssertionException' with message 'assert(false)' in %sexception_012.php(%d) : runtime-created function:%d +Fatal error: Uncaught AssertionException: assert(false) in %sexception_012.php(%d) : runtime-created function:%d Stack trace: #0 %sexception_012.php(%d) : runtime-created function(%d): assert(false, 'assert(false)') #1 %sexception_012.php(%d): __lambda_func() diff --git a/Zend/tests/exception_013.phpt b/Zend/tests/exception_013.phpt index 748e354bb3..e1a06cb0d0 100644 --- a/Zend/tests/exception_013.phpt +++ b/Zend/tests/exception_013.phpt @@ -8,19 +8,19 @@ class C { try { var_dump(C::$a); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { var_dump(C::$p); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { unset(C::$a); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } @@ -33,7 +33,7 @@ Exception: Cannot access private property C::$p in %sexception_013.php on line 1 Exception: Attempt to unset static property C::$a in %sexception_013.php on line 19 -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$a' in %sexception_013.php:24 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$a in %sexception_013.php:24 Stack trace: #0 {main} thrown in %sexception_013.php on line 24 diff --git a/Zend/tests/exception_014.phpt b/Zend/tests/exception_014.phpt index cee08e1d58..8da20dccfa 100644 --- a/Zend/tests/exception_014.phpt +++ b/Zend/tests/exception_014.phpt @@ -9,7 +9,7 @@ class C { $x = new C; try { var_dump($x->p); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } @@ -18,7 +18,7 @@ var_dump($x->p); --EXPECTF-- Exception: Cannot access private property C::$p in %sexception_014.php on line %d -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property C::$p' in %sexception_014.php:%d +Fatal error: Uncaught EngineException: Cannot access private property C::$p in %sexception_014.php:%d Stack trace: #0 {main} thrown in %sexception_014.php on line %d diff --git a/Zend/tests/exception_015.phpt b/Zend/tests/exception_015.phpt index c94bd3a467..a1b9ae48e2 100644 --- a/Zend/tests/exception_015.phpt +++ b/Zend/tests/exception_015.phpt @@ -5,7 +5,7 @@ Exceptions on improper access to string $s = "ABC"; try { $s[] = "D"; -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } @@ -14,7 +14,7 @@ $s[] = "D"; --EXPECTF-- Exception: [] operator not supported for strings in %sexception_015.php on line %d -Fatal error: Uncaught exception 'Error' with message '[] operator not supported for strings' in %sexception_015.php:%d +Fatal error: Uncaught EngineException: [] operator not supported for strings in %sexception_015.php:%d Stack trace: #0 {main} thrown in %sexception_015.php on line %d diff --git a/Zend/tests/exception_016.phpt b/Zend/tests/exception_016.phpt index 0c0470b8d9..7e4c4c3e24 100644 --- a/Zend/tests/exception_016.phpt +++ b/Zend/tests/exception_016.phpt @@ -4,7 +4,7 @@ Exceptions on improper usage of $this <?php try { $this->foo(); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } @@ -13,7 +13,7 @@ $this->foo(); --EXPECTF-- Exception: Using $this when not in object context in %sexception_016.php on line %d -Fatal error: Uncaught exception 'Error' with message 'Using $this when not in object context' in %sexception_016.php:%d +Fatal error: Uncaught EngineException: Using $this when not in object context in %sexception_016.php:%d Stack trace: #0 {main} thrown in %sexception_016.php on line %d diff --git a/Zend/tests/exception_017.phpt b/Zend/tests/exception_017.phpt index b81664ceae..261ce3d091 100644 --- a/Zend/tests/exception_017.phpt +++ b/Zend/tests/exception_017.phpt @@ -11,18 +11,18 @@ function foo(callable $x) { try { C::foo(); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { foo("C::foo"); -} catch (Error $e) { +} catch (EngineException $e) { echo "\n"; do { echo "Exception: " . $e->getMessage() . "\n"; $e = $e->getPrevious(); - } while ($e instanceof Error); + } while ($e instanceof EngineException); } C::foo(); @@ -33,7 +33,7 @@ Exception: Cannot call abstract method C::foo() in %sexception_017.php on line % Exception: Argument 1 passed to foo() must be callable, string given, called in %sexception_017.php on line %d Exception: Cannot call abstract method C::foo() -Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method C::foo()' in %sexception_017.php:%d +Fatal error: Uncaught EngineException: Cannot call abstract method C::foo() in %sexception_017.php:%d Stack trace: #0 {main} thrown in %sexception_017.php on line %d diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt index 7dfbb38fd1..5fd018f32c 100644 --- a/Zend/tests/exception_handler_002.phpt +++ b/Zend/tests/exception_handler_002.phpt @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- string(12) "test thrown!" -Fatal error: Uncaught exception 'Exception' in %sexception_handler_002.php:7 +Fatal error: Uncaught Exception in %sexception_handler_002.php:7 Stack trace: #0 [internal function]: foo(Object(test)) #1 {main} diff --git a/Zend/tests/exception_with_by_ref_message.phpt b/Zend/tests/exception_with_by_ref_message.phpt index f15c3e2719..c193c2f312 100644 --- a/Zend/tests/exception_with_by_ref_message.phpt +++ b/Zend/tests/exception_with_by_ref_message.phpt @@ -15,7 +15,7 @@ throw new MyException($msg); ?> --EXPECTF-- -Fatal error: Uncaught exception 'MyException' with message 'Message' in %s:%d +Fatal error: Uncaught MyException: Message in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/gc_030.phpt b/Zend/tests/gc_030.phpt index 4dff71a3bf..f8b7ac297d 100644 --- a/Zend/tests/gc_030.phpt +++ b/Zend/tests/gc_030.phpt @@ -20,13 +20,13 @@ unset($f1, $f2); gc_collect_cycles(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'foobar' in %sgc_030.php:%d +Fatal error: Uncaught Exception: foobar in %sgc_030.php:%d Stack trace: #0 [internal function]: foo->__destruct() #1 %sgc_030.php(%d): gc_collect_cycles() #2 {main} -Next exception 'Exception' with message 'foobar' in %sgc_030.php:%d +Next Exception: foobar in %sgc_030.php:%d Stack trace: #0 [internal function]: foo->__destruct() #1 %sgc_030.php(%d): gc_collect_cycles() diff --git a/Zend/tests/generators/basic_yield_from_exception_handling.phpt b/Zend/tests/generators/basic_yield_from_exception_handling.phpt index 180cbee9dd..c696f6486d 100644 --- a/Zend/tests/generators/basic_yield_from_exception_handling.phpt +++ b/Zend/tests/generators/basic_yield_from_exception_handling.phpt @@ -32,27 +32,27 @@ var_dump($gen->valid()); --EXPECTF-- int(0) catch in gen() -exception 'Exception' with message '0' in %s:%d +Exception: 0 in %s:%d Stack trace: #0 {main} int(1) catch in from() -exception 'Exception' with message '1' in %s:%d +Exception: 1 in %s:%d Stack trace: #0 {main} int(2) catch in gen() -exception 'Exception' with message '2' in %s:%d +Exception: 2 in %s:%d Stack trace: #0 {main} int(3) catch in from() -exception 'Exception' with message '3' in %s:%d +Exception: 3 in %s:%d Stack trace: #0 {main} int(4) catch in {main} -exception 'Exception' with message '4' in %s:%d +Exception: 4 in %s:%d Stack trace: #0 {main} bool(false) diff --git a/Zend/tests/generators/bug63066.phpt b/Zend/tests/generators/bug63066.phpt index c00e6d481e..a12eb0a809 100644 --- a/Zend/tests/generators/bug63066.phpt +++ b/Zend/tests/generators/bug63066.phpt @@ -13,7 +13,7 @@ foreach(gen(new stdClass()) as $value) --EXPECTF-- foo -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method stdClass::fatalError()' in %sbug63066.php:5 +Fatal error: Uncaught EngineException: Call to undefined method stdClass::fatalError() in %sbug63066.php:5 Stack trace: #0 %s(%d): gen(Object(stdClass)) #1 {main} diff --git a/Zend/tests/generators/bug65161.phpt b/Zend/tests/generators/bug65161.phpt index c11a1730a5..8c838cbdd3 100644 --- a/Zend/tests/generators/bug65161.phpt +++ b/Zend/tests/generators/bug65161.phpt @@ -17,7 +17,7 @@ foreach (testGenerator() as $i); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function foo()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function foo() in %s:%d Stack trace: #0 [internal function]: autoload('SyntaxError') #1 %s(%d): spl_autoload_call('SyntaxError') diff --git a/Zend/tests/generators/clone.phpt b/Zend/tests/generators/clone.phpt index 18c55a0cb5..e6720e70c1 100644 --- a/Zend/tests/generators/clone.phpt +++ b/Zend/tests/generators/clone.phpt @@ -12,7 +12,7 @@ clone $gen; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class Generator' in %s:%d +Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class Generator in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/errors/generator_instantiate_error.phpt b/Zend/tests/generators/errors/generator_instantiate_error.phpt index 39d9f40279..4244e9a90d 100644 --- a/Zend/tests/generators/errors/generator_instantiate_error.phpt +++ b/Zend/tests/generators/errors/generator_instantiate_error.phpt @@ -7,7 +7,7 @@ new Generator; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %s:%d +Fatal error: Uncaught EngineException: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt index 7878369591..4ea1b6505c 100644 --- a/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt +++ b/Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt @@ -10,7 +10,7 @@ foreach ($gen as &$value) { } ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'You can only iterate a generator by-reference if it declared that it yields by-reference' in %s:%d +Fatal error: Uncaught Exception: You can only iterate a generator by-reference if it declared that it yields by-reference in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/errors/resume_running_generator_error.phpt b/Zend/tests/generators/errors/resume_running_generator_error.phpt index 5a309428c3..48ad1e8df9 100644 --- a/Zend/tests/generators/errors/resume_running_generator_error.phpt +++ b/Zend/tests/generators/errors/resume_running_generator_error.phpt @@ -7,7 +7,7 @@ function gen() { $gen = yield; try { $gen->next(); - } catch (Error $e) { + } catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } $gen->next(); @@ -21,7 +21,7 @@ $gen->next(); --EXPECTF-- Exception: Cannot resume an already running generator -Fatal error: Uncaught exception 'Error' with message 'Cannot resume an already running generator' in %s:%d +Fatal error: Uncaught EngineException: Cannot resume an already running generator in %s:%d Stack trace: #0 %s(%d): Generator->next() #1 [internal function]: gen() diff --git a/Zend/tests/generators/errors/serialize_unserialize_error.phpt b/Zend/tests/generators/errors/serialize_unserialize_error.phpt index b5e77e5028..fc0647395d 100644 --- a/Zend/tests/generators/errors/serialize_unserialize_error.phpt +++ b/Zend/tests/generators/errors/serialize_unserialize_error.phpt @@ -27,7 +27,7 @@ try { ?> --EXPECTF-- -exception 'Exception' with message 'Serialization of 'Generator' is not allowed' in %s:%d +Exception: Serialization of 'Generator' is not allowed in %s:%d Stack trace: #0 %s(%d): serialize(Object(Generator)) #1 {main} @@ -37,7 +37,7 @@ Warning: Erroneous data format for unserializing 'Generator' in %sserialize_unse Notice: unserialize(): Error at offset 19 of 20 bytes in %sserialize_unserialize_error.php on line %s bool(false) -exception 'Exception' with message 'Unserialization of 'Generator' is not allowed' in %s:%d +Exception: Unserialization of 'Generator' is not allowed in %s:%d Stack trace: #0 %s(%d): unserialize('C:9:"Generator"...') #1 {main} diff --git a/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt b/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt index d0992d4445..a9f56af041 100644 --- a/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt +++ b/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt @@ -26,7 +26,7 @@ unset($gen); before yield before yield in finally -Fatal error: Uncaught exception 'Error' with message 'Cannot yield from finally in a force-closed generator' in %s:%d +Fatal error: Uncaught EngineException: Cannot yield from finally in a force-closed generator in %s:%d Stack trace: #0 %s(%d): gen() #1 {main} diff --git a/Zend/tests/generators/finally/throw_yield.phpt b/Zend/tests/generators/finally/throw_yield.phpt index 2013c3ee14..6d7d4f5d15 100644 --- a/Zend/tests/generators/finally/throw_yield.phpt +++ b/Zend/tests/generators/finally/throw_yield.phpt @@ -17,7 +17,7 @@ foreach (foo(1, 5) as $x) { --EXPECTF-- 1 -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 %s(%d): foo(1, 5) #1 {main} diff --git a/Zend/tests/generators/finally/yield_throw.phpt b/Zend/tests/generators/finally/yield_throw.phpt index 0ead4501af..e191ea0dc1 100644 --- a/Zend/tests/generators/finally/yield_throw.phpt +++ b/Zend/tests/generators/finally/yield_throw.phpt @@ -17,7 +17,7 @@ foreach (foo(1, 5) as $x) { --EXPECTF-- 1 -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 %s(%d): foo(1, 5) #1 {main} diff --git a/Zend/tests/generators/generator_rewind.phpt b/Zend/tests/generators/generator_rewind.phpt index f5452a7113..651f4d9e24 100644 --- a/Zend/tests/generators/generator_rewind.phpt +++ b/Zend/tests/generators/generator_rewind.phpt @@ -49,12 +49,12 @@ $gen->rewind(); before yield after yield -exception 'Exception' with message 'Cannot rewind a generator that was already run' in %s:%d +Exception: Cannot rewind a generator that was already run in %s:%d Stack trace: #0 %s(%d): Generator->rewind() #1 {main} -exception 'Exception' with message 'Cannot traverse an already closed generator' in %s:%d +Exception: Cannot traverse an already closed generator in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/generators/generator_throwing_in_foreach.phpt b/Zend/tests/generators/generator_throwing_in_foreach.phpt index dbf20c2ca1..44a867404f 100644 --- a/Zend/tests/generators/generator_throwing_in_foreach.phpt +++ b/Zend/tests/generators/generator_throwing_in_foreach.phpt @@ -12,7 +12,7 @@ foreach (gen() as $value) { } ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'foo' in %s:%d +Fatal error: Uncaught Exception: foo in %s:%d Stack trace: #0 %s(%d): gen() #1 {main} diff --git a/Zend/tests/generators/mutli_yield_from_with_exception.phpt b/Zend/tests/generators/mutli_yield_from_with_exception.phpt index 5180caa328..2dc71815f0 100644 --- a/Zend/tests/generators/mutli_yield_from_with_exception.phpt +++ b/Zend/tests/generators/mutli_yield_from_with_exception.phpt @@ -33,7 +33,7 @@ do { Generator 0 int(1) Caught exception! -exception 'Exception' in %s:%d +Exception in %s:%d Stack trace: #0 %s(%d): from() #1 [internal function]: gen(Object(Generator)) @@ -41,7 +41,7 @@ Stack trace: #3 {main} Generator 1 -Fatal error: Uncaught exception 'ClosedGeneratorException' with message 'Generator yielded from aborted, no return value available' in %s:%d +Fatal error: Uncaught ClosedGeneratorException: Generator yielded from aborted, no return value available in %s:%d Stack trace: #0 [internal function]: gen(Object(Generator)) #1 %s(%d): Generator->current() diff --git a/Zend/tests/generators/throw_already_closed.phpt b/Zend/tests/generators/throw_already_closed.phpt index e918e540ab..bf639801e3 100644 --- a/Zend/tests/generators/throw_already_closed.phpt +++ b/Zend/tests/generators/throw_already_closed.phpt @@ -17,7 +17,7 @@ $gen->throw(new Exception('test')); --EXPECTF-- bool(false) -Fatal error: Uncaught exception 'Exception' with message 'test' in %s:%d +Fatal error: Uncaught Exception: test in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/throw_caught.phpt b/Zend/tests/generators/throw_caught.phpt index c5e9d81ebc..9372ba84d5 100644 --- a/Zend/tests/generators/throw_caught.phpt +++ b/Zend/tests/generators/throw_caught.phpt @@ -20,7 +20,7 @@ var_dump($gen->throw(new RuntimeException('Test'))); ?> --EXPECTF-- before yield -exception 'RuntimeException' with message 'Test' in %s:%d +RuntimeException: Test in %s:%d Stack trace: #0 {main} diff --git a/Zend/tests/generators/throw_not_an_exception.phpt b/Zend/tests/generators/throw_not_an_exception.phpt index a212b5ae42..29f25252a8 100644 --- a/Zend/tests/generators/throw_not_an_exception.phpt +++ b/Zend/tests/generators/throw_not_an_exception.phpt @@ -12,7 +12,7 @@ $gen->throw(new stdClass); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Exceptions must be valid objects implementing Throwable' in %s:%d +Fatal error: Uncaught EngineException: Exceptions must be valid objects derived from the Exception base class in %s:%d Stack trace: #0 [internal function]: gen() #1 %s(%d): Generator->throw(Object(stdClass)) diff --git a/Zend/tests/generators/throw_rethrow.phpt b/Zend/tests/generators/throw_rethrow.phpt index 65044ee3f3..f9e3f78f48 100644 --- a/Zend/tests/generators/throw_rethrow.phpt +++ b/Zend/tests/generators/throw_rethrow.phpt @@ -20,12 +20,12 @@ var_dump($gen->throw(new RuntimeException('throw'))); ?> --EXPECTF-- before yield -Caught: exception 'RuntimeException' with message 'throw' in %s:%d +Caught: RuntimeException: throw in %s:%d Stack trace: #0 {main} -Fatal error: Uncaught exception 'LogicException' with message 'new throw' in %s:%d +Fatal error: Uncaught LogicException: new throw in %s:%d Stack trace: #0 [internal function]: gen() #1 %s(%d): Generator->throw(Object(RuntimeException)) diff --git a/Zend/tests/generators/throw_uncaught.phpt b/Zend/tests/generators/throw_uncaught.phpt index f06cff1b8e..73f59094ca 100644 --- a/Zend/tests/generators/throw_uncaught.phpt +++ b/Zend/tests/generators/throw_uncaught.phpt @@ -13,7 +13,7 @@ var_dump($gen->throw(new RuntimeException('test'))); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'test' in %s:%d +Fatal error: Uncaught RuntimeException: test in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/generators/yield_from_already_running.phpt b/Zend/tests/generators/yield_from_already_running.phpt index 38c8e7bb3a..2242542525 100644 --- a/Zend/tests/generators/yield_from_already_running.phpt +++ b/Zend/tests/generators/yield_from_already_running.phpt @@ -11,7 +11,7 @@ function gen() { ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Impossible to yield from the Generator being currently run' in %s:%d +Fatal error: Uncaught EngineException: Impossible to yield from the Generator being currently run in %s:%d Stack trace: #0 [internal function]: gen() #1 %s(%d): Generator->send(Object(Generator)) diff --git a/Zend/tests/generators/yield_from_multi_tree_exception.phpt b/Zend/tests/generators/yield_from_multi_tree_exception.phpt index b250a744df..ec423606c2 100644 --- a/Zend/tests/generators/yield_from_multi_tree_exception.phpt +++ b/Zend/tests/generators/yield_from_multi_tree_exception.phpt @@ -62,7 +62,7 @@ int(11) int(12) int(13) int(14) -exception 'Exception' in %s:%d +Exception in %s:%d Stack trace: #0 %s(%d): from(5) #1 %s(%d): gen(Object(Generator), 1) @@ -70,7 +70,7 @@ Stack trace: #3 [internal function]: gen(Object(Generator), 3) #4 %s(%d): Generator->next() #5 {main} -exception 'ClosedGeneratorException' with message 'Generator yielded from aborted, no return value available' in %s:%d +ClosedGeneratorException: Generator yielded from aborted, no return value available in %s:%d Stack trace: #0 [internal function]: gen(Object(Generator), 1) #1 %s(%d): Generator->current() diff --git a/Zend/tests/indirect_call_array_001.phpt b/Zend/tests/indirect_call_array_001.phpt index 104cb19dbe..f9075496fb 100644 --- a/Zend/tests/indirect_call_array_001.phpt +++ b/Zend/tests/indirect_call_array_001.phpt @@ -8,7 +8,7 @@ $arr(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Class 'a' not found' in %s:%d +Fatal error: Uncaught EngineException: Class 'a' not found in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/indirect_call_array_002.phpt b/Zend/tests/indirect_call_array_002.phpt index 402eb05f5a..2492793139 100644 --- a/Zend/tests/indirect_call_array_002.phpt +++ b/Zend/tests/indirect_call_array_002.phpt @@ -8,7 +8,7 @@ $arr(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method stdClass::b()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method stdClass::b() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/indirect_method_call_002.phpt b/Zend/tests/indirect_method_call_002.phpt index 671a14d050..ec3df8f268 100644 --- a/Zend/tests/indirect_method_call_002.phpt +++ b/Zend/tests/indirect_method_call_002.phpt @@ -29,7 +29,7 @@ string(7) "testing" string(3) "foo" NULL -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method foo::www()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method foo::www() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/list_005.phpt b/Zend/tests/list_005.phpt index b4fb93b1ae..f03cf0a404 100644 --- a/Zend/tests/list_005.phpt +++ b/Zend/tests/list_005.phpt @@ -44,7 +44,7 @@ NULL NULL ---- -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use object of type stdClass as array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/list_007.phpt b/Zend/tests/list_007.phpt index b7ce1d289f..62de5c318c 100644 --- a/Zend/tests/list_007.phpt +++ b/Zend/tests/list_007.phpt @@ -9,7 +9,7 @@ var_dump($x, $y); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type Closure as array' in %slist_007.php:3 +Fatal error: Uncaught EngineException: Cannot use object of type Closure as array in %slist_007.php:3 Stack trace: #0 {main} thrown in %slist_007.php on line 3 diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt index 014027dbf6..892424519f 100644 --- a/Zend/tests/methods-on-non-objects.phpt +++ b/Zend/tests/methods-on-non-objects.phpt @@ -9,7 +9,7 @@ echo "Should not get here!\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to a member function method() on null' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function method() on null in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/mul_001.phpt b/Zend/tests/mul_001.phpt index c9f9ddc7ad..4c00c9cc76 100644 --- a/Zend/tests/mul_001.phpt +++ b/Zend/tests/mul_001.phpt @@ -8,7 +8,7 @@ $b = array(1); try { var_dump($a * $b); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/not_002.phpt b/Zend/tests/not_002.phpt index fb4fe379bc..7e1dafeaab 100644 --- a/Zend/tests/not_002.phpt +++ b/Zend/tests/not_002.phpt @@ -8,7 +8,7 @@ $b = array(1,2); try { var_dump(~$b); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/ns_004.phpt b/Zend/tests/ns_004.phpt index b37938b4a6..542251a6e0 100644 --- a/Zend/tests/ns_004.phpt +++ b/Zend/tests/ns_004.phpt @@ -6,7 +6,7 @@ namespace test\ns1; echo get_class(new Exception()),"\n"; --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Class 'test\ns1\Exception' not found' in %sns_004.php:%d +Fatal error: Uncaught EngineException: Class 'test\ns1\Exception' not found in %sns_004.php:%d Stack trace: #0 {main} thrown in %sns_004.php on line %d
\ No newline at end of file diff --git a/Zend/tests/ns_026.phpt b/Zend/tests/ns_026.phpt index 49ab2d82f5..7e4d14ede6 100644 --- a/Zend/tests/ns_026.phpt +++ b/Zend/tests/ns_026.phpt @@ -32,7 +32,7 @@ Method - Foo\Foo::__construct Method - Foo\Foo::Bar Func - Foo\Bar -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function Foo\Foo\Bar()' in %sns_026.php:%d +Fatal error: Uncaught EngineException: Call to undefined function Foo\Foo\Bar() in %sns_026.php:%d Stack trace: #0 {main} thrown in %sns_026.php on line %d
\ No newline at end of file diff --git a/Zend/tests/ns_038.phpt b/Zend/tests/ns_038.phpt index 172e9bf1d4..f40eb07c8d 100644 --- a/Zend/tests/ns_038.phpt +++ b/Zend/tests/ns_038.phpt @@ -11,7 +11,7 @@ function foo() { --EXPECTF-- ok -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method Exception::bar()' in %sns_038.php:7 +Fatal error: Uncaught EngineException: Call to undefined method Exception::bar() in %sns_038.php:7 Stack trace: #0 {main} thrown in %sns_038.php on line 7 diff --git a/Zend/tests/ns_057.phpt b/Zend/tests/ns_057.phpt index 34892e2286..006b113e2e 100644 --- a/Zend/tests/ns_057.phpt +++ b/Zend/tests/ns_057.phpt @@ -56,7 +56,7 @@ const ok class ok ok -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'Test\ns1\unknown'' in %sns_057.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'Test\ns1\unknown' in %sns_057.php:%d Stack trace: #0 {main} thrown in %sns_057.php on line %d
\ No newline at end of file diff --git a/Zend/tests/ns_058.phpt b/Zend/tests/ns_058.phpt index d0096fb385..77a4c71391 100644 --- a/Zend/tests/ns_058.phpt +++ b/Zend/tests/ns_058.phpt @@ -54,7 +54,7 @@ const ok class ok ok -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_058.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_058.php:%d Stack trace: #0 {main} thrown in %sns_058.php on line %d diff --git a/Zend/tests/ns_071.phpt b/Zend/tests/ns_071.phpt index 9965fde809..08a0b898d6 100644 --- a/Zend/tests/ns_071.phpt +++ b/Zend/tests/ns_071.phpt @@ -18,4 +18,8 @@ new bar(new \stdclass); --EXPECTF-- NULL -Fatal error: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): foo\bar->__construct() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt index 2ae417e957..95f8f95045 100644 --- a/Zend/tests/ns_072.phpt +++ b/Zend/tests/ns_072.phpt @@ -30,4 +30,8 @@ object(foo\test)#%d (0) { } NULL -Fatal error: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): foo\bar->__construct() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/ns_076.phpt b/Zend/tests/ns_076.phpt index 3f7ef4388b..53df5d8077 100644 --- a/Zend/tests/ns_076.phpt +++ b/Zend/tests/ns_076.phpt @@ -22,7 +22,7 @@ array(1) { %s(7) "unknown" } -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_076.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_076.php:%d Stack trace: #0 {main} thrown in %sns_076.php on line %d diff --git a/Zend/tests/ns_077_1.phpt b/Zend/tests/ns_077_1.phpt index f003a04223..fdcf6cf954 100644 --- a/Zend/tests/ns_077_1.phpt +++ b/Zend/tests/ns_077_1.phpt @@ -10,7 +10,7 @@ function foo($a = array(0 => \unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo\foo() #1 {main} diff --git a/Zend/tests/ns_077_2.phpt b/Zend/tests/ns_077_2.phpt index 3f9ffacbe7..f64b80939f 100644 --- a/Zend/tests/ns_077_2.phpt +++ b/Zend/tests/ns_077_2.phpt @@ -10,7 +10,7 @@ function foo($a = array(\unknown => unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo\foo() #1 {main} diff --git a/Zend/tests/ns_077_3.phpt b/Zend/tests/ns_077_3.phpt index 0d42fb5b85..05d1c91c47 100644 --- a/Zend/tests/ns_077_3.phpt +++ b/Zend/tests/ns_077_3.phpt @@ -10,7 +10,7 @@ function foo($a = array(namespace\unknown => unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'foo\unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo\foo() #1 {main} diff --git a/Zend/tests/ns_077_4.phpt b/Zend/tests/ns_077_4.phpt index 34eca93b9c..ce30aeedcc 100644 --- a/Zend/tests/ns_077_4.phpt +++ b/Zend/tests/ns_077_4.phpt @@ -10,7 +10,7 @@ function foo($a = array(0 => namespace\unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'foo\unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo\foo() #1 {main} diff --git a/Zend/tests/ns_077_5.phpt b/Zend/tests/ns_077_5.phpt index 1afcdc3b3d..230d2acc63 100644 --- a/Zend/tests/ns_077_5.phpt +++ b/Zend/tests/ns_077_5.phpt @@ -9,7 +9,7 @@ function foo($a = array(0 => \unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo() #1 {main} diff --git a/Zend/tests/ns_077_6.phpt b/Zend/tests/ns_077_6.phpt index 1afcdc3b3d..230d2acc63 100644 --- a/Zend/tests/ns_077_6.phpt +++ b/Zend/tests/ns_077_6.phpt @@ -9,7 +9,7 @@ function foo($a = array(0 => \unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo() #1 {main} diff --git a/Zend/tests/ns_077_7.phpt b/Zend/tests/ns_077_7.phpt index 99a6699b9b..069d825073 100644 --- a/Zend/tests/ns_077_7.phpt +++ b/Zend/tests/ns_077_7.phpt @@ -9,7 +9,7 @@ function foo($a = array(0 => namespace\unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo() #1 {main} diff --git a/Zend/tests/ns_077_8.phpt b/Zend/tests/ns_077_8.phpt index 2d7c9ac0bc..b271effecf 100644 --- a/Zend/tests/ns_077_8.phpt +++ b/Zend/tests/ns_077_8.phpt @@ -9,7 +9,7 @@ function foo($a = array(namespace\unknown => unknown)) foo(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught EngineException: Undefined constant 'unknown' in %sns_077_%d.php:%d Stack trace: #0 %s(%d): foo() #1 {main} diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt index 41cf269f8e..1d063e65fb 100644 --- a/Zend/tests/ns_092.phpt +++ b/Zend/tests/ns_092.phpt @@ -64,7 +64,7 @@ Foo\Bar\fiz Foo\Bar\biz Foo\Bar\buz -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function Foo\Bar\A()' in %sns_092.php:45 +Fatal error: Uncaught EngineException: Call to undefined function Foo\Bar\A() in %sns_092.php:45 Stack trace: #0 {main} thrown in %sns_092.php on line 45 diff --git a/Zend/tests/objects_017.phpt b/Zend/tests/objects_017.phpt index 5881d2dcb7..0f9f3daa13 100644 --- a/Zend/tests/objects_017.phpt +++ b/Zend/tests/objects_017.phpt @@ -15,7 +15,7 @@ test()->test = 2; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property foo::$test' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property foo::$test in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt index 3c2e0d4a51..e96a6aa163 100644 --- a/Zend/tests/objects_022.phpt +++ b/Zend/tests/objects_022.phpt @@ -36,4 +36,8 @@ object(bar)#%d (0) { object(baz)#%d (0) { } -Fatal error: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): foo->testFoo() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/objects_025.phpt b/Zend/tests/objects_025.phpt index 3afabed9d6..7f58696efb 100644 --- a/Zend/tests/objects_025.phpt +++ b/Zend/tests/objects_025.phpt @@ -43,7 +43,7 @@ static - ok non-static - ok static - ok -Fatal error: Uncaught exception 'Error' with message 'Method name must be a string' in %s:%d +Fatal error: Uncaught EngineException: Method name must be a string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/objects_026.phpt b/Zend/tests/objects_026.phpt index 560247fa36..2ea8785658 100644 --- a/Zend/tests/objects_026.phpt +++ b/Zend/tests/objects_026.phpt @@ -10,7 +10,7 @@ try { ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught EngineException: Using $this when not in object context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/objects_029.phpt b/Zend/tests/objects_029.phpt index cc8ca903c5..b8a01af260 100644 --- a/Zend/tests/objects_029.phpt +++ b/Zend/tests/objects_029.phpt @@ -23,7 +23,7 @@ new foo; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: foo::$f' in %s:%d +Fatal error: Uncaught EngineException: Access to undeclared static property: foo::$f in %s:%d Stack trace: #0 %s(%d): foo->__construct() #1 {main} diff --git a/Zend/tests/objects_030.phpt b/Zend/tests/objects_030.phpt index 5805de5a86..35db8528d0 100644 --- a/Zend/tests/objects_030.phpt +++ b/Zend/tests/objects_030.phpt @@ -23,7 +23,7 @@ new foo; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: bar::$f' in %s:%d +Fatal error: Uncaught EngineException: Access to undeclared static property: bar::$f in %s:%d Stack trace: #0 %s(%d): foo->__construct() #1 {main} diff --git a/Zend/tests/offset_assign.phpt b/Zend/tests/offset_assign.phpt index 0f82b73c76..b1d7fe444f 100644 --- a/Zend/tests/offset_assign.phpt +++ b/Zend/tests/offset_assign.phpt @@ -10,7 +10,7 @@ echo "Done\n"; --EXPECTF-- Warning: Illegal string offset 'x' in %soffset_assign.php on line %d -Fatal error: Uncaught exception 'Error' with message 'Cannot use string offset as an array' in %soffset_assign.php:%d +Fatal error: Uncaught EngineException: Cannot use string offset as an array in %soffset_assign.php:%d Stack trace: #0 {main} thrown in %soffset_assign.php on line %d diff --git a/Zend/tests/offset_object.phpt b/Zend/tests/offset_object.phpt index 54d626a1e6..a4f970c636 100644 --- a/Zend/tests/offset_object.phpt +++ b/Zend/tests/offset_object.phpt @@ -8,7 +8,7 @@ var_dump($object[1]); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught EngineException: Cannot use object of type stdClass as array in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/parent_class_name_without_parent.phpt b/Zend/tests/parent_class_name_without_parent.phpt index f4d6307299..f5ed611756 100644 --- a/Zend/tests/parent_class_name_without_parent.phpt +++ b/Zend/tests/parent_class_name_without_parent.phpt @@ -17,7 +17,7 @@ class C { ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use "parent" when current class scope has no parent' in %s:5 +Fatal error: Uncaught EngineException: Cannot use "parent" when current class scope has no parent in %s:5 Stack trace: #0 %s(%d): C->f() #1 {main} diff --git a/Zend/tests/return_types/001.phpt b/Zend/tests/return_types/001.phpt index c09d627be9..2d2966aed3 100644 --- a/Zend/tests/return_types/001.phpt +++ b/Zend/tests/return_types/001.phpt @@ -9,4 +9,8 @@ function test1() : array { test1(); --EXPECTF-- -Fatal error: Return value of test1() must be of the type array, none returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of test1() must be of the type array, none returned in %s:%d +Stack trace: +#0 %s(%d): test1() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/002.phpt b/Zend/tests/return_types/002.phpt index 553611597d..92553ee89e 100644 --- a/Zend/tests/return_types/002.phpt +++ b/Zend/tests/return_types/002.phpt @@ -10,4 +10,8 @@ function test1() : array { test1(); --EXPECTF-- -Fatal error: Return value of test1() must be of the type array, null returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of test1() must be of the type array, null returned in %s:%d +Stack trace: +#0 %s(%d): test1() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt index 26a827158b..20dd8bff62 100644 --- a/Zend/tests/return_types/003.phpt +++ b/Zend/tests/return_types/003.phpt @@ -9,4 +9,8 @@ function test1() : array { test1(); --EXPECTF-- -Fatal error: Return value of test1() must be of the type array, integer returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of test1() must be of the type array, integer returned in %s:%d +Stack trace: +#0 %s(%d): test1() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/004.phpt b/Zend/tests/return_types/004.phpt index 41f06bf014..f7a4b3dea2 100644 --- a/Zend/tests/return_types/004.phpt +++ b/Zend/tests/return_types/004.phpt @@ -10,4 +10,8 @@ function test1() : array { test1(); --EXPECTF-- -Fatal error: Return value of test1() must be of the type array, string returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of test1() must be of the type array, string returned in %s:%d +Stack trace: +#0 %s(%d): test1() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/005.phpt b/Zend/tests/return_types/005.phpt index d3ae04769a..edf54db07c 100644 --- a/Zend/tests/return_types/005.phpt +++ b/Zend/tests/return_types/005.phpt @@ -15,4 +15,8 @@ $qux = new qux(); $qux->foo(); --EXPECTF-- -Fatal error: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s:%d +Stack trace: +#0 %s(%d): qux->foo() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/010.phpt b/Zend/tests/return_types/010.phpt index 5f53220815..ce297b01b1 100644 --- a/Zend/tests/return_types/010.phpt +++ b/Zend/tests/return_types/010.phpt @@ -11,4 +11,8 @@ $array = [1, 2, 3]; var_dump(foo($array)); --EXPECTF-- -Fatal error: Return value of foo() must be of the type array, null returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of foo() must be of the type array, null returned in %s:%d +Stack trace: +#0 %s(%d): foo(Array) +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt index ee6568522f..b0acb36132 100644 --- a/Zend/tests/return_types/013.phpt +++ b/Zend/tests/return_types/013.phpt @@ -16,4 +16,8 @@ $baz = new foo(); var_dump($func=$baz->bar(), $func()); --EXPECTF-- -Fatal error: Return value of foo::{closure}() must be of the type array, null returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of foo::{closure}() must be of the type array, null returned in %s:%d +Stack trace: +#0 %s(%d): foo->{closure}() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/020.phpt b/Zend/tests/return_types/020.phpt index d43496b441..101de62dd7 100644 --- a/Zend/tests/return_types/020.phpt +++ b/Zend/tests/return_types/020.phpt @@ -10,7 +10,7 @@ function test() : array { test(); --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 %s(%d): test() #1 {main} diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt index df96e7edb8..de308ca26c 100644 --- a/Zend/tests/return_types/rfc001.phpt +++ b/Zend/tests/return_types/rfc001.phpt @@ -11,4 +11,8 @@ function get_config(): array { get_config(); --EXPECTF-- -Fatal error: Return value of get_config() must be of the type array, integer returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of get_config() must be of the type array, integer returned in %s:%d +Stack trace: +#0 %s(%d): get_config() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/return_types/rfc003.phpt b/Zend/tests/return_types/rfc003.phpt index 1fdf19f612..2beb6f3650 100644 --- a/Zend/tests/return_types/rfc003.phpt +++ b/Zend/tests/return_types/rfc003.phpt @@ -10,4 +10,8 @@ function foo(): DateTime { foo(); --EXPECTF-- -Fatal error: Return value of foo() must be an instance of DateTime, null returned in %s on line %d +Fatal error: Uncaught TypeException: Return value of foo() must be an instance of DateTime, null returned in %s:%d +Stack trace: +#0 %s(%d): foo() +#1 {main} + thrown in %s on line %d diff --git a/Zend/tests/str_offset_002.phpt b/Zend/tests/str_offset_002.phpt index 481aaf748a..8e29980d67 100644 --- a/Zend/tests/str_offset_002.phpt +++ b/Zend/tests/str_offset_002.phpt @@ -6,7 +6,7 @@ $a = "aaa"; $x = array(&$a[1]);
?>
--EXPECTF--
-Fatal error: Uncaught exception 'Error' with message 'Cannot create references to/from string offsets' in %sstr_offset_002.php:3
-Stack trace:
-#0 {main}
+Fatal error: Uncaught EngineException: Cannot create references to/from string offsets in %sstr_offset_002.php:3 +Stack trace: +#0 {main} thrown in %sstr_offset_002.php on line 3
diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt index 030e306309..8a0e60f928 100644 --- a/Zend/tests/sub_001.phpt +++ b/Zend/tests/sub_001.phpt @@ -8,7 +8,7 @@ $b = array(1); try { var_dump($a - $b); -} catch (Error $e) { +} catch (EngineException $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/throw_reference.phpt b/Zend/tests/throw_reference.phpt index f02eaa6540..eb85c5ed17 100644 --- a/Zend/tests/throw_reference.phpt +++ b/Zend/tests/throw_reference.phpt @@ -9,7 +9,7 @@ throw $e; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/traits/bug60173.phpt b/Zend/tests/traits/bug60173.phpt index 7daa102934..88381ded5a 100644 --- a/Zend/tests/traits/bug60173.phpt +++ b/Zend/tests/traits/bug60173.phpt @@ -9,7 +9,7 @@ $rc = new ReflectionClass('foo'); $rc->newInstance(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate trait foo' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate trait foo in %s:%d Stack trace: #0 %s(%d): ReflectionClass->newInstance() #1 {main} diff --git a/Zend/tests/traits/bugs/alias01.phpt b/Zend/tests/traits/bugs/alias01.phpt index 12b4ca79c6..7d0dfed187 100644 --- a/Zend/tests/traits/bugs/alias01.phpt +++ b/Zend/tests/traits/bugs/alias01.phpt @@ -23,7 +23,7 @@ T:m1 T:m1 T:m2 -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method C1::a2()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method C1::a2() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/traits/error_007.phpt b/Zend/tests/traits/error_007.phpt index e231547269..85c65e48ae 100644 --- a/Zend/tests/traits/error_007.phpt +++ b/Zend/tests/traits/error_007.phpt @@ -10,7 +10,7 @@ new abc; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate trait abc' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate trait abc in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/traits/error_012.phpt b/Zend/tests/traits/error_012.phpt index c6e5e04134..ba1055e161 100644 --- a/Zend/tests/traits/error_012.phpt +++ b/Zend/tests/traits/error_012.phpt @@ -16,7 +16,7 @@ var_dump($x->test()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to protected method bar::test() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to protected method bar::test() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt index 1dad14b250..34bfd38a58 100644 --- a/Zend/tests/traits/language008a.phpt +++ b/Zend/tests/traits/language008a.phpt @@ -20,7 +20,7 @@ $o->sayHello(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to protected method MyClass::sayHello() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to protected method MyClass::sayHello() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt index 4bcb33f389..e3c099f74e 100644 --- a/Zend/tests/traits/language008b.phpt +++ b/Zend/tests/traits/language008b.phpt @@ -27,7 +27,7 @@ $o->sayHelloWorld(); ?> --EXPECTF-- Hello World!Hello World! -Fatal error: Uncaught exception 'Error' with message 'Call to private method MyClass::sayHelloWorld() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/try_finally_001.phpt b/Zend/tests/try_finally_001.phpt index 0f740872c2..33744d064c 100644 --- a/Zend/tests/try_finally_001.phpt +++ b/Zend/tests/try_finally_001.phpt @@ -15,7 +15,7 @@ foo("finally"); --EXPECTF-- string(7) "finally" -Fatal error: Uncaught exception 'Exception' with message 'ex' %s +Fatal error: Uncaught Exception: ex %s Stack trace: #0 %stry_finally_001.php(%d): foo('finally') #1 {main} diff --git a/Zend/tests/try_finally_003.phpt b/Zend/tests/try_finally_003.phpt index c1294911bd..b0fee7c6d7 100644 --- a/Zend/tests/try_finally_003.phpt +++ b/Zend/tests/try_finally_003.phpt @@ -20,7 +20,7 @@ foo(); ?> --EXPECTF-- 1234 -Fatal error: Uncaught exception 'Exception' with message 'ex' %s +Fatal error: Uncaught Exception: ex %s Stack trace: #0 %stry_finally_003.php(%d): foo() #1 {main} diff --git a/Zend/tests/typehints/explicit_weak_include_strict.phpt b/Zend/tests/typehints/explicit_weak_include_strict.phpt index a5f267cbef..d39c6b6a0a 100644 --- a/Zend/tests/typehints/explicit_weak_include_strict.phpt +++ b/Zend/tests/typehints/explicit_weak_include_strict.phpt @@ -11,4 +11,9 @@ require 'weak_include_strict_2.inc'; // calls within that file should stay strict, despite being included by weak file ?> --EXPECTF-- -Fatal error: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5 +Stack trace: +#0 %s(%d): takes_int() +#1 %s(%d): require('%s') +#2 {main} + thrown in %sweak_include_strict_2.inc on line 5 diff --git a/Zend/tests/typehints/scalar_constant_defaults_error.phpt b/Zend/tests/typehints/scalar_constant_defaults_error.phpt index 53938d724f..4e037bafb3 100644 --- a/Zend/tests/typehints/scalar_constant_defaults_error.phpt +++ b/Zend/tests/typehints/scalar_constant_defaults_error.phpt @@ -13,4 +13,8 @@ var_dump(int_val()); ?> --EXPECTF-- -Fatal error: Argument 1 passed to int_val() must be of the type integer, string given, called in %s on line %d and defined in %s on line %d
\ No newline at end of file +Fatal error: Uncaught TypeException: Argument 1 passed to int_val() must be of the type integer, string given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): int_val() +#1 {main} + thrown in %s on line %d
\ No newline at end of file diff --git a/Zend/tests/typehints/strict_call_weak.phpt b/Zend/tests/typehints/strict_call_weak.phpt index 94d5953f2b..3b92244824 100644 --- a/Zend/tests/typehints/strict_call_weak.phpt +++ b/Zend/tests/typehints/strict_call_weak.phpt @@ -13,5 +13,9 @@ require 'strict_call_weak_2.inc'; function_declared_in_weak_mode(1.0); ?> --EXPECTF-- -Fatal error: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak.php on line 10 and defined in %sstrict_call_weak_2.inc:5 +Stack trace: +#0 %s(%d): function_declared_in_weak_mode() +#1 {main} + thrown in %sstrict_call_weak_2.inc on line 5 diff --git a/Zend/tests/typehints/strict_call_weak_explicit.phpt b/Zend/tests/typehints/strict_call_weak_explicit.phpt index 2d573e85f2..fdb92fcf29 100644 --- a/Zend/tests/typehints/strict_call_weak_explicit.phpt +++ b/Zend/tests/typehints/strict_call_weak_explicit.phpt @@ -13,5 +13,9 @@ require 'strict_call_weak_explicit_2.inc'; function_declared_in_weak_mode(1.0); ?> --EXPECTF-- -Fatal error: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to function_declared_in_weak_mode() must be of the type integer, float given, called in %sstrict_call_weak_explicit.php on line 10 and defined in %sstrict_call_weak_explicit_2.inc:5 +Stack trace: +#0 %s(%d): function_declared_in_weak_mode() +#1 {main} + thrown in %sstrict_call_weak_explicit_2.inc on line 5 diff --git a/Zend/tests/typehints/weak_include_strict.phpt b/Zend/tests/typehints/weak_include_strict.phpt index c3a0820657..4d91e7baa8 100644 --- a/Zend/tests/typehints/weak_include_strict.phpt +++ b/Zend/tests/typehints/weak_include_strict.phpt @@ -11,4 +11,9 @@ require 'weak_include_strict_2.inc'; // calls within that file should stay strict, despite being included by weak file ?> --EXPECTF-- -Fatal error: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to takes_int() must be of the type integer, float given, called in %sweak_include_strict_2.inc on line 9 and defined in %sweak_include_strict_2.inc:5 +Stack trace: +#0 %s(%d): takes_int() +#1 %s(%d): require('%s') +#2 {main} + thrown in %sweak_include_strict_2.inc on line 5 diff --git a/Zend/tests/use_const/no_global_fallback.phpt b/Zend/tests/use_const/no_global_fallback.phpt index c83bea944a..6db4be5d99 100644 --- a/Zend/tests/use_const/no_global_fallback.phpt +++ b/Zend/tests/use_const/no_global_fallback.phpt @@ -10,7 +10,7 @@ var_dump(baz); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Undefined constant 'foo\bar\baz'' in %s:%d +Fatal error: Uncaught EngineException: Undefined constant 'foo\bar\baz' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/use_function/no_global_fallback.phpt b/Zend/tests/use_function/no_global_fallback.phpt index 6756b0ceeb..2b57524a0a 100644 --- a/Zend/tests/use_function/no_global_fallback.phpt +++ b/Zend/tests/use_function/no_global_fallback.phpt @@ -10,7 +10,7 @@ var_dump(baz()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function foo\bar\baz()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function foo\bar\baz() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/use_function/no_global_fallback2.phpt b/Zend/tests/use_function/no_global_fallback2.phpt index c53c984c1a..294e7e8697 100644 --- a/Zend/tests/use_function/no_global_fallback2.phpt +++ b/Zend/tests/use_function/no_global_fallback2.phpt @@ -15,7 +15,7 @@ namespace foo { ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function bar\test()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function bar\test() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/varSyntax/method_call_on_string_literal.phpt b/Zend/tests/varSyntax/method_call_on_string_literal.phpt index e423a15063..34760a24be 100644 --- a/Zend/tests/varSyntax/method_call_on_string_literal.phpt +++ b/Zend/tests/varSyntax/method_call_on_string_literal.phpt @@ -5,7 +5,7 @@ Method call on string literal "string"->length(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to a member function length() on string' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function length() on string in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt index 3ec22ef55c..adf9601300 100644 --- a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt +++ b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt @@ -8,7 +8,7 @@ $fn([0, 1][0]); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use temporary expression in write context' in %s:%d +Fatal error: Uncaught EngineException: Cannot use temporary expression in write context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/varSyntax/tempPropFetchByRefError.phpt b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt index 0222f0d1b9..eaba8ad2c6 100644 --- a/Zend/tests/varSyntax/tempPropFetchByRefError.phpt +++ b/Zend/tests/varSyntax/tempPropFetchByRefError.phpt @@ -8,7 +8,7 @@ $fn([0, 1]->prop); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot use temporary expression in write context' in %s:%d +Fatal error: Uncaught EngineException: Cannot use temporary expression in write context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt index 2661567224..f901147dc5 100644 --- a/Zend/tests/variadic/typehint_error.phpt +++ b/Zend/tests/variadic/typehint_error.phpt @@ -33,4 +33,8 @@ array(3) { } } -Fatal error: Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d +Fatal error: Uncaught TypeException: Argument 3 passed to test() must be of the type array, integer given, called in %s:%d +Stack trace: +#0 %s(%d): test(Array, Array) +#1 {main} + thrown in %s on line %d diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index b44bb95661..9ad221d695 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -30,39 +30,33 @@ #include "zend_dtrace.h" #include "zend_smart_str.h" +static zend_class_entry *base_exception_ce; static zend_class_entry *default_exception_ce; static zend_class_entry *error_exception_ce; -static zend_class_entry *error_ce; -static zend_class_entry *parse_error_ce; -static zend_class_entry *type_error_ce; +static zend_class_entry *engine_exception_ce; +static zend_class_entry *parse_exception_ce; +static zend_class_entry *type_exception_ce; static zend_object_handlers default_exception_handlers; ZEND_API void (*zend_throw_exception_hook)(zval *ex); -static zend_class_entry *zend_get_exception_base(zval *object) -{ - return instanceof_function(Z_OBJCE_P(object), default_exception_ce) ? default_exception_ce : error_ce; -} - void zend_exception_set_previous(zend_object *exception, zend_object *add_previous) { zval tmp, *previous, zv, *pzv, rv; - zend_class_entry *base_ce; if (exception == add_previous || !add_previous || !exception) { return; } ZVAL_OBJ(&tmp, add_previous); - if (!instanceof_function(Z_OBJCE(tmp), zend_ce_throwable)) { + if (!instanceof_function(Z_OBJCE(tmp), base_exception_ce)) { zend_error_noreturn(E_CORE_ERROR, "Cannot set non exception as previous exception"); return; } ZVAL_OBJ(&zv, exception); pzv = &zv; do { - base_ce = zend_get_exception_base(pzv); - previous = zend_read_property(base_ce, pzv, "previous", sizeof("previous")-1, 1, &rv); + previous = zend_read_property(base_exception_ce, pzv, "previous", sizeof("previous")-1, 1, &rv); if (Z_TYPE_P(previous) == IS_NULL) { - zend_update_property(base_ce, pzv, "previous", sizeof("previous")-1, &tmp); + zend_update_property(base_exception_ce, pzv, "previous", sizeof("previous")-1, &tmp); GC_REFCOUNT(add_previous)--; return; } @@ -116,7 +110,7 @@ ZEND_API void zend_throw_exception_internal(zval *exception) /* {{{ */ } } if (!EG(current_execute_data)) { - if (exception && Z_OBJCE_P(exception) == parse_error_ce) { + if (exception && Z_OBJCE_P(exception) == parse_exception_ce) { return; } if(EG(exception)) { @@ -164,7 +158,6 @@ static zend_object *zend_default_exception_new_ex(zend_class_entry *class_type, zval obj; zend_object *object; zval trace; - zend_class_entry *base_ce; Z_OBJ(obj) = object = zend_objects_new(class_type); Z_OBJ_HT(obj) = &default_exception_handlers; @@ -177,17 +170,15 @@ static zend_object *zend_default_exception_new_ex(zend_class_entry *class_type, array_init(&trace); } Z_SET_REFCOUNT(trace, 0); - - base_ce = zend_get_exception_base(&obj); - if (EXPECTED(class_type != parse_error_ce)) { - zend_update_property_string(base_ce, &obj, "file", sizeof("file")-1, zend_get_executed_filename()); - zend_update_property_long(base_ce, &obj, "line", sizeof("line")-1, zend_get_executed_lineno()); + if (EXPECTED(class_type != parse_exception_ce)) { + zend_update_property_string(base_exception_ce, &obj, "file", sizeof("file")-1, zend_get_executed_filename()); + zend_update_property_long(base_exception_ce, &obj, "line", sizeof("line")-1, zend_get_executed_lineno()); } else { - zend_update_property_string(base_ce, &obj, "file", sizeof("file")-1, zend_get_compiled_filename()->val); - zend_update_property_long(base_ce, &obj, "line", sizeof("line")-1, zend_get_compiled_lineno()); + zend_update_property_string(base_exception_ce, &obj, "file", sizeof("file")-1, zend_get_compiled_filename()->val); + zend_update_property_long(base_exception_ce, &obj, "line", sizeof("line")-1, zend_get_compiled_lineno()); } - zend_update_property(base_ce, &obj, "trace", sizeof("trace")-1, &trace); + zend_update_property(base_exception_ce, &obj, "trace", sizeof("trace")-1, &trace); return object; } @@ -205,12 +196,6 @@ static zend_object *zend_error_exception_new(zend_class_entry *class_type) /* {{ } /* }}} */ -static zval *zend_get_exception_property(zval *object, const char *name, size_t name_length, zend_bool silent, zval *rv) /* {{{ */ -{ - return zend_read_property(zend_get_exception_base(object), object, name, name_length, silent, rv); -} -/* }}} */ - /* {{{ proto Exception Exception::__clone() Clone the exception object */ ZEND_METHOD(exception, __clone) @@ -227,27 +212,25 @@ ZEND_METHOD(exception, __construct) zend_string *message = NULL; zend_long code = 0; zval *object, *previous = NULL; - zend_class_entry *base_ce; int argc = ZEND_NUM_ARGS(); - object = getThis(); - base_ce = zend_get_exception_base(object); - - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc, "|SlO!", &message, &code, &previous, base_ce) == FAILURE) { + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc, "|SlO!", &message, &code, &previous, base_exception_ce) == FAILURE) { zend_error(E_EXCEPTION | E_ERROR, "Wrong parameters for Exception([string $exception [, long $code [, Exception $previous = NULL]]])"); return; } + object = getThis(); + if (message) { - zend_update_property_str(base_ce, object, "message", sizeof("message")-1, message); + zend_update_property_str(base_exception_ce, object, "message", sizeof("message")-1, message); } if (code) { - zend_update_property_long(base_ce, object, "code", sizeof("code")-1, code); + zend_update_property_long(base_exception_ce, object, "code", sizeof("code")-1, code); } if (previous) { - zend_update_property(base_ce, object, "previous", sizeof("previous")-1, previous); + zend_update_property(base_exception_ce, object, "previous", sizeof("previous")-1, previous); } } /* }}} */ @@ -261,8 +244,8 @@ ZEND_METHOD(error_exception, __construct) zval *object, *previous = NULL; int argc = ZEND_NUM_ARGS(); size_t message_len, filename_len; - - if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc, "|sllslO!", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno, &previous, default_exception_ce) == FAILURE) { + + if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc, "|sllslO!", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno, &previous, base_exception_ce) == FAILURE) { zend_error(E_EXCEPTION | E_ERROR, "Wrong parameters for ErrorException([string $exception [, long $code, [ long $severity, [ string $filename, [ long $lineno [, Exception $previous = NULL]]]]]])"); return; } @@ -270,25 +253,25 @@ ZEND_METHOD(error_exception, __construct) object = getThis(); if (message) { - zend_update_property_string(default_exception_ce, object, "message", sizeof("message")-1, message); + zend_update_property_string(base_exception_ce, object, "message", sizeof("message")-1, message); } if (code) { - zend_update_property_long(default_exception_ce, object, "code", sizeof("code")-1, code); + zend_update_property_long(base_exception_ce, object, "code", sizeof("code")-1, code); } if (previous) { - zend_update_property(default_exception_ce, object, "previous", sizeof("previous")-1, previous); + zend_update_property(base_exception_ce, object, "previous", sizeof("previous")-1, previous); } - zend_update_property_long(error_exception_ce, object, "severity", sizeof("severity")-1, severity); + zend_update_property_long(base_exception_ce, object, "severity", sizeof("severity")-1, severity); if (argc >= 4) { - zend_update_property_string(default_exception_ce, object, "file", sizeof("file")-1, filename); + zend_update_property_string(base_exception_ce, object, "file", sizeof("file")-1, filename); if (argc < 5) { lineno = 0; /* invalidate lineno */ } - zend_update_property_long(default_exception_ce, object, "line", sizeof("line")-1, lineno); + zend_update_property_long(base_exception_ce, object, "line", sizeof("line")-1, lineno); } } /* }}} */ @@ -299,9 +282,9 @@ ZEND_METHOD(error_exception, __construct) } #define GET_PROPERTY(object, name) \ - zend_get_exception_property((object), name, sizeof(name) - 1, 0, &rv) + zend_read_property(base_exception_ce, (object), name, sizeof(name) - 1, 0, &rv) #define GET_PROPERTY_SILENT(object, name) \ - zend_get_exception_property((object), name, sizeof(name) - 1, 1, &rv) + zend_read_property(base_exception_ce, (object), name, sizeof(name) - 1, 1, &rv) /* {{{ proto string Exception::getFile() Get the file in which the exception occurred */ @@ -568,17 +551,12 @@ ZEND_METHOD(exception, getTraceAsString) { zval *trace, *frame, rv; zend_ulong index; - zval *object; - zend_class_entry *base_ce; smart_str str = {0}; uint32_t num = 0; DEFAULT_0_PARAMS; - - object = getThis(); - base_ce = zend_get_exception_base(object); - trace = zend_read_property(base_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv); + trace = zend_read_property(base_exception_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv); if (Z_TYPE_P(trace) != IS_ARRAY) { RETURN_FALSE; } @@ -640,7 +618,6 @@ zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */ ZEND_METHOD(exception, __toString) { zval trace, *exception; - zend_class_entry *base_ce; zend_string *str; zend_fcall_info fci; zval fname, rv; @@ -675,14 +652,20 @@ ZEND_METHOD(exception, __toString) ZVAL_UNDEF(&trace); } + if (Z_OBJCE_P(exception) == type_exception_ce && strstr(message->val, ", called in ")) { + zend_string *real_message = zend_strpprintf(0, "%s and defined", message->val); + zend_string_release(message); + message = real_message; + } + if (message->len > 0) { - str = zend_strpprintf(0, "exception '%s' with message '%s' in %s:" ZEND_LONG_FMT + str = zend_strpprintf(0, "%s: %s in %s:" ZEND_LONG_FMT "\nStack trace:\n%s%s%s", Z_OBJCE_P(exception)->name->val, message->val, file->val, line, (Z_TYPE(trace) == IS_STRING && Z_STRLEN(trace)) ? Z_STRVAL(trace) : "#0 {main}\n", prev_str->len ? "\n\nNext " : "", prev_str->val); } else { - str = zend_strpprintf(0, "exception '%s' in %s:" ZEND_LONG_FMT + str = zend_strpprintf(0, "%s in %s:" ZEND_LONG_FMT "\nStack trace:\n%s%s%s", Z_OBJCE_P(exception)->name->val, file->val, line, (Z_TYPE(trace) == IS_STRING && Z_STRLEN(trace)) ? Z_STRVAL(trace) : "#0 {main}\n", @@ -698,12 +681,9 @@ ZEND_METHOD(exception, __toString) } zval_dtor(&fname); - exception = getThis(); - base_ce = zend_get_exception_base(exception); - /* We store the result in the private property string so we can access * the result in uncaught exception handlers without memleaks. */ - zend_update_property_str(base_ce, exception, "string", sizeof("string")-1, str); + zend_update_property_str(base_exception_ce, getThis(), "string", sizeof("string")-1, str); RETURN_STR(str); } @@ -760,47 +740,66 @@ void zend_register_default_exception(void) /* {{{ */ zend_class_entry ce; zend_property_info *prop; - INIT_CLASS_ENTRY(ce, "Exception", default_exception_functions); - default_exception_ce = zend_register_internal_class_ex(&ce, NULL); - default_exception_ce->create_object = zend_default_exception_new; - zend_class_implements(default_exception_ce, 1, zend_ce_throwable); - + INIT_CLASS_ENTRY(ce, "BaseException", default_exception_functions); + base_exception_ce = zend_register_internal_class(&ce); + base_exception_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; + base_exception_ce->create_object = NULL; memcpy(&default_exception_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); default_exception_handlers.clone_obj = NULL; - zend_declare_property_string(default_exception_ce, "message", sizeof("message")-1, "", ZEND_ACC_PROTECTED); - zend_declare_property_string(default_exception_ce, "string", sizeof("string")-1, "", ZEND_ACC_PRIVATE); - zend_declare_property_long(default_exception_ce, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED); - zend_declare_property_null(default_exception_ce, "file", sizeof("file")-1, ZEND_ACC_PROTECTED); - zend_declare_property_null(default_exception_ce, "line", sizeof("line")-1, ZEND_ACC_PROTECTED); - zend_declare_property_null(default_exception_ce, "trace", sizeof("trace")-1, ZEND_ACC_PRIVATE); - zend_declare_property_null(default_exception_ce, "previous", sizeof("previous")-1, ZEND_ACC_PRIVATE); + zend_declare_property_string(base_exception_ce, "message", sizeof("message")-1, "", ZEND_ACC_PROTECTED); + zend_declare_property_string(base_exception_ce, "string", sizeof("string")-1, "", ZEND_ACC_PRIVATE); + zend_declare_property_long(base_exception_ce, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED); + zend_declare_property_null(base_exception_ce, "file", sizeof("file")-1, ZEND_ACC_PROTECTED); + zend_declare_property_null(base_exception_ce, "line", sizeof("line")-1, ZEND_ACC_PROTECTED); + zend_declare_property_null(base_exception_ce, "trace", sizeof("trace")-1, ZEND_ACC_PRIVATE); + zend_declare_property_null(base_exception_ce, "previous", sizeof("previous")-1, ZEND_ACC_PRIVATE); + + INIT_CLASS_ENTRY(ce, "Exception", NULL); + default_exception_ce = zend_register_internal_class_ex(&ce, base_exception_ce); + default_exception_ce->create_object = zend_default_exception_new; + + /* A trick, to make visible private properties of BaseException */ + ZEND_HASH_FOREACH_PTR(&default_exception_ce->properties_info, prop) { + if (prop->flags & ZEND_ACC_SHADOW) { + if (prop->name->len == sizeof("\0BaseException\0string")-1) { + prop->flags &= ~ZEND_ACC_SHADOW; + prop->flags |= ZEND_ACC_PRIVATE; + prop->ce = default_exception_ce; + } else if (prop->name->len == sizeof("\0BaseException\0trace")-1) { + prop->flags &= ~ZEND_ACC_SHADOW; + prop->flags |= ZEND_ACC_PRIVATE; + prop->ce = default_exception_ce; + } else if (prop->name->len == sizeof("\0BaseException\0previous")-1) { + prop->flags &= ~ZEND_ACC_SHADOW; + prop->flags |= ZEND_ACC_PRIVATE; + prop->ce = default_exception_ce; + } + } + } ZEND_HASH_FOREACH_END(); INIT_CLASS_ENTRY(ce, "ErrorException", error_exception_functions); error_exception_ce = zend_register_internal_class_ex(&ce, default_exception_ce); error_exception_ce->create_object = zend_error_exception_new; zend_declare_property_long(error_exception_ce, "severity", sizeof("severity")-1, E_ERROR, ZEND_ACC_PROTECTED); - INIT_CLASS_ENTRY(ce, "Error", default_exception_functions); - error_ce = zend_register_internal_class_ex(&ce, NULL); - error_ce->create_object = zend_default_exception_new; - zend_class_implements(error_ce, 1, zend_ce_throwable); + INIT_CLASS_ENTRY(ce, "EngineException", NULL); + engine_exception_ce = zend_register_internal_class_ex(&ce, base_exception_ce); + engine_exception_ce->create_object = zend_default_exception_new; - zend_declare_property_string(error_ce, "message", sizeof("message")-1, "", ZEND_ACC_PROTECTED); - zend_declare_property_string(error_ce, "string", sizeof("string")-1, "", ZEND_ACC_PRIVATE); - zend_declare_property_long(error_ce, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED); - zend_declare_property_null(error_ce, "file", sizeof("file")-1, ZEND_ACC_PROTECTED); - zend_declare_property_null(error_ce, "line", sizeof("line")-1, ZEND_ACC_PROTECTED); - zend_declare_property_null(error_ce, "trace", sizeof("trace")-1, ZEND_ACC_PRIVATE); - zend_declare_property_null(error_ce, "previous", sizeof("previous")-1, ZEND_ACC_PRIVATE); + INIT_CLASS_ENTRY(ce, "ParseException", NULL); + parse_exception_ce = zend_register_internal_class_ex(&ce, base_exception_ce); + parse_exception_ce->create_object = zend_default_exception_new; - INIT_CLASS_ENTRY(ce, "ParseError", NULL); - parse_error_ce = zend_register_internal_class_ex(&ce, error_ce); - parse_error_ce->create_object = zend_default_exception_new; + INIT_CLASS_ENTRY(ce, "TypeException", NULL); + type_exception_ce = zend_register_internal_class_ex(&ce, engine_exception_ce); + type_exception_ce->create_object = zend_default_exception_new; +} +/* }}} */ - INIT_CLASS_ENTRY(ce, "TypeError", NULL); - type_error_ce = zend_register_internal_class_ex(&ce, error_ce); - type_error_ce->create_object = zend_default_exception_new; +ZEND_API zend_class_entry *zend_exception_get_base(void) /* {{{ */ +{ + return base_exception_ce; } /* }}} */ @@ -816,21 +815,21 @@ ZEND_API zend_class_entry *zend_get_error_exception(void) /* {{{ */ } /* }}} */ -ZEND_API zend_class_entry *zend_get_error(void) /* {{{ */ +ZEND_API zend_class_entry *zend_get_engine_exception(void) /* {{{ */ { - return error_ce; + return engine_exception_ce; } /* }}} */ -ZEND_API zend_class_entry *zend_get_parse_error(void) /* {{{ */ +ZEND_API zend_class_entry *zend_get_parse_exception(void) /* {{{ */ { - return parse_error_ce; + return parse_exception_ce; } /* }}} */ -ZEND_API zend_class_entry *zend_get_type_error(void) /* {{{ */ +ZEND_API zend_class_entry *zend_get_type_exception(void) /* {{{ */ { - return type_error_ce; + return type_exception_ce; } /* }}} */ @@ -840,8 +839,8 @@ ZEND_API zend_object *zend_throw_exception(zend_class_entry *exception_ce, const zval ex; if (exception_ce) { - if (!instanceof_function(exception_ce, zend_ce_throwable)) { - zend_error(E_NOTICE, "Exceptions must implement Throwable"); + if (!instanceof_function(exception_ce, base_exception_ce)) { + zend_error(E_NOTICE, "Exceptions must be derived from the Exception base class"); exception_ce = default_exception_ce; } } else { @@ -851,10 +850,10 @@ ZEND_API zend_object *zend_throw_exception(zend_class_entry *exception_ce, const if (message) { - zend_update_property_string(exception_ce, &ex, "message", sizeof("message")-1, message); + zend_update_property_string(base_exception_ce, &ex, "message", sizeof("message")-1, message); } if (code) { - zend_update_property_long(exception_ce, &ex, "code", sizeof("code")-1, code); + zend_update_property_long(base_exception_ce, &ex, "code", sizeof("code")-1, code); } zend_throw_exception_internal(&ex); @@ -882,7 +881,7 @@ ZEND_API zend_object *zend_throw_error_exception(zend_class_entry *exception_ce, zval ex; zend_object *obj = zend_throw_exception(exception_ce, message, code); ZVAL_OBJ(&ex, obj); - zend_update_property_long(error_exception_ce, &ex, "severity", sizeof("severity")-1, severity); + zend_update_property_long(base_exception_ce, &ex, "severity", sizeof("severity")-1, severity); return obj; } /* }}} */ @@ -915,21 +914,17 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ ZVAL_OBJ(&exception, ex); ce_exception = Z_OBJCE(exception); EG(exception) = NULL; - if (ce_exception == parse_error_ce || ce_exception == type_error_ce) { + if (ce_exception == parse_exception_ce) { zend_string *message = zval_get_string(GET_PROPERTY(&exception, "message")); zend_string *file = zval_get_string(GET_PROPERTY_SILENT(&exception, "file")); zend_long line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line")); zend_long code = zval_get_long(GET_PROPERTY_SILENT(&exception, "code")); - if (ce_exception == type_error_ce && strstr(message->val, ", called in ")) { - zend_error_helper(code, file->val, line, "%s and defined", message->val); - } else { - zend_error_helper(code, file->val, line, "%s", message->val); - } + zend_error_helper(code, file->val, line, "%s", message->val); zend_string_release(file); zend_string_release(message); - } else if (instanceof_function(ce_exception, default_exception_ce) || instanceof_function(ce_exception, error_ce)) { + } else if (instanceof_function(ce_exception, base_exception_ce)) { zval tmp, rv; zend_string *str, *file = NULL; zend_long line = 0; @@ -939,7 +934,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ if (Z_TYPE(tmp) != IS_STRING) { zend_error(E_WARNING, "%s::__toString() must return a string", ce_exception->name->val); } else { - zend_update_property_string(zend_get_exception_base(&exception), &exception, "string", sizeof("string")-1, EG(exception) ? ce_exception->name->val : Z_STRVAL(tmp)); + zend_update_property_string(base_exception_ce, &exception, "string", sizeof("string")-1, EG(exception) ? ce_exception->name->val : Z_STRVAL(tmp)); } } zval_ptr_dtor(&tmp); @@ -949,8 +944,10 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ ZVAL_OBJ(&zv, EG(exception)); /* do the best we can to inform about the inner exception */ - file = zval_get_string(GET_PROPERTY_SILENT(&zv, "file")); - line = zval_get_long(GET_PROPERTY_SILENT(&zv, "line")); + if (instanceof_function(ce_exception, base_exception_ce)) { + file = zval_get_string(GET_PROPERTY_SILENT(&zv, "file")); + line = zval_get_long(GET_PROPERTY_SILENT(&zv, "line")); + } zend_error_va(E_WARNING, (file && file->len > 0) ? file->val : NULL, line, "Uncaught %s in exception handling during call to %s::__tostring()", @@ -988,8 +985,8 @@ ZEND_API void zend_throw_exception_object(zval *exception) /* {{{ */ exception_ce = Z_OBJCE_P(exception); - if (!exception_ce || !instanceof_function(exception_ce, zend_ce_throwable)) { - zend_error(E_EXCEPTION | E_ERROR, "Exceptions must be valid objects implementing Throwable"); + if (!exception_ce || !instanceof_function(exception_ce, base_exception_ce)) { + zend_error(E_EXCEPTION | E_ERROR, "Exceptions must be valid objects derived from the Exception base class"); return; } zend_throw_exception_internal(exception); diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt index 43b272ad64..d8eefb355d 100644 --- a/ext/curl/tests/curl_file_serialize.phpt +++ b/ext/curl/tests/curl_file_serialize.phpt @@ -12,7 +12,7 @@ $data = 'a:2:{s:4:"file";O:8:"CURLFile":3:{s:4:"name";s:13:"testdata1.txt";s:4:" var_dump(unserialize($data)); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'Unserialization of CURLFile instances is not allowed' in %s +Fatal error: Uncaught Exception: Unserialization of CURLFile instances is not allowed in %s Stack trace: #0 [internal function]: CURLFile->__wakeup() #1 %s diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt index 3ff2b7d931..02e9907674 100644 --- a/ext/date/tests/014.phpt +++ b/ext/date/tests/014.phpt @@ -37,4 +37,8 @@ Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on li bool(false) int(0) -Fatal error: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s +Fatal error: Uncaught TypeException: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s:%d +Stack trace: +#0 %s(%d): timezone_offset_get(Object(DateTime), Object(DateTimeZone)) +#1 {main} + thrown in %s on line %d diff --git a/ext/date/tests/DatePeriod_wrong_constructor.phpt b/ext/date/tests/DatePeriod_wrong_constructor.phpt index 744ca26c87..8acdc5d386 100644 --- a/ext/date/tests/DatePeriod_wrong_constructor.phpt +++ b/ext/date/tests/DatePeriod_wrong_constructor.phpt @@ -10,7 +10,7 @@ date.timezone=UTC new DatePeriod(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments.' in %s:%d +Fatal error: Uncaught Exception: DatePeriod::__construct(): This constructor accepts either (DateTimeInterface, DateInterval, int) OR (DateTimeInterface, DateInterval, DateTime) OR (string) as arguments. in %s:%d Stack trace: #0 %s(%d): DatePeriod->__construct() #1 {main} diff --git a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt index 117d5de24e..4795f8176c 100644 --- a/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt +++ b/ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt @@ -16,7 +16,7 @@ $root->appendChild($cdata); $cdata->deleteData(5, 1); ?> --EXPECTF-- -Fatal error: Uncaught exception 'DOMException' with message 'Index Size Error' in %s:%d +Fatal error: Uncaught DOMException: Index Size Error in %s:%d Stack trace: #0 %s(%d): DOMCharacterData->deleteData(5, 1) #1 {main} diff --git a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt index c02c920849..7603a01741 100644 --- a/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt +++ b/ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt @@ -12,7 +12,7 @@ $fragment->appendXML('<bait>crankbait</bait>'); $document->appendChild($fragment); ?> --EXPECTF-- -Fatal error: Uncaught exception 'DOMException' with message 'No Modification Allowed Error' in %s:%d +Fatal error: Uncaught DOMException: No Modification Allowed Error in %s:%d Stack trace: #0 %s(%d): DOMDocumentFragment->appendXML('<bait>crankbait...') #1 {main} diff --git a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt index 5feac218cf..c1ec685b2c 100644 --- a/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt +++ b/ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt @@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc'; DOMDocument::saveHTMLFile(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method DOMDocument::saveHTMLFile() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method DOMDocument::saveHTMLFile() cannot be called statically in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt index c7d2c6dda4..41d190c072 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_error2.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_error2.phpt @@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc'; DOMDocument::saveHTML(true); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method DOMDocument::saveHTML() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method DOMDocument::saveHTML() cannot be called statically in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/dom/tests/DOMDocument_validate_error2.phpt b/ext/dom/tests/DOMDocument_validate_error2.phpt index 24f39e3fb4..901d541bf3 100644 --- a/ext/dom/tests/DOMDocument_validate_error2.phpt +++ b/ext/dom/tests/DOMDocument_validate_error2.phpt @@ -12,7 +12,7 @@ require_once dirname(__FILE__) .'/skipif.inc'; DOMDocument::validate(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method DOMDocument::validate() cannot be called statically' in %s:%d +Fatal error: Uncaught EngineException: Non-static method DOMDocument::validate() cannot be called statically in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt index 060a2c184e..4c9d5a979f 100644 --- a/ext/dom/tests/dom003.phpt +++ b/ext/dom/tests/dom003.phpt @@ -62,7 +62,7 @@ object(DOMException)#%d (%d) { } --- Don't catch exception with try/catch -Fatal error: Uncaught exception 'DOMException' with message 'Hierarchy Request Error' in %sdom003.php:%d +Fatal error: Uncaught DOMException: Hierarchy Request Error in %sdom003.php:%d Stack trace: #0 %sdom003.php(%d): DOMNode->appendChild(Object(DOMElement)) #1 {main} diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt index 91a5475ca2..c2f0622438 100644 --- a/ext/dom/tests/regsiter_node_class.phpt +++ b/ext/dom/tests/regsiter_node_class.phpt @@ -37,7 +37,7 @@ myAttribute HELLO Attribute DOMAttr -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method DOMAttr::testit()' in %s:25 +Fatal error: Uncaught EngineException: Call to undefined method DOMAttr::testit() in %s:25 Stack trace: #0 {main} thrown in %s on line 25 diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt index 6569c25a6f..37303e583b 100644 --- a/ext/intl/tests/breakiter___construct.phpt +++ b/ext/intl/tests/breakiter___construct.phpt @@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING); new IntlBreakIterator(); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private IntlBreakIterator::__construct() from invalid context' in %s:%d +Fatal error: Uncaught EngineException: Call to private IntlBreakIterator::__construct() from invalid context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/intl/tests/bug62081.phpt b/ext/intl/tests/bug62081.phpt index 263023ffac..b7adf7f873 100644 --- a/ext/intl/tests/bug62081.phpt +++ b/ext/intl/tests/bug62081.phpt @@ -12,7 +12,7 @@ ini_set('intl.error_level', E_WARNING); $x = new IntlDateFormatter('en', 1, 1); var_dump($x->__construct('en', 1, 1)); --EXPECTF-- -Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: cannot call constructor twice' in %sbug62081.php:4 +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: cannot call constructor twice in %sbug62081.php:4 Stack trace: #0 %sbug62081.php(4): IntlDateFormatter->__construct('en', 1, 1) #1 {main} diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt index 0cc4abcf3f..b9e9cdce63 100644 --- a/ext/intl/tests/calendar_add_error.phpt +++ b/ext/intl/tests/calendar_add_error.phpt @@ -38,4 +38,8 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_add(1, 2, 3) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt index 37f8d5c019..13c6a5b51f 100644 --- a/ext/intl/tests/calendar_clear_error.phpt +++ b/ext/intl/tests/calendar_clear_error.phpt @@ -28,4 +28,8 @@ bool(false) Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_clear(1, 2) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt index 8df95c2680..beb81758be 100644 --- a/ext/intl/tests/calendar_fieldDifference_error.phpt +++ b/ext/intl/tests/calendar_fieldDifference_error.phpt @@ -39,4 +39,8 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_field_difference(1, 0, 1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt index 33457b8e40..8ba0712e68 100644 --- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt +++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt @@ -41,4 +41,8 @@ Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, strin Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_day_of_week_type(1, 1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt index be5bb507ad..23fa9d67c4 100644 --- a/ext/intl/tests/calendar_getErrorCode_error.phpt +++ b/ext/intl/tests/calendar_getErrorCode_error.phpt @@ -23,4 +23,8 @@ Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in % Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_error_code(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt index 16768304a1..69329e6db4 100644 --- a/ext/intl/tests/calendar_getErrorMessage_error.phpt +++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt @@ -23,4 +23,8 @@ Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given i Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_error_message(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt index b6675b5867..13beb5348e 100644 --- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_first_day_of_week(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt index 6923efd025..8c7a886caa 100644 --- a/ext/intl/tests/calendar_getLocale_error.phpt +++ b/ext/intl/tests/calendar_getLocale_error.phpt @@ -39,4 +39,8 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_locale(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt index 02df2d59c4..6ad098773e 100644 --- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2 Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_minimal_days_in_first_week(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt index e64983acc7..403f6f7ebd 100644 --- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt @@ -44,4 +44,8 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2 Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_skipped_wall_time_option(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt index 789623676a..1eb8e00f75 100644 --- a/ext/intl/tests/calendar_getTimeZone_error.phpt +++ b/ext/intl/tests/calendar_getTimeZone_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_time_zone(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt index 216d20e412..ed2687377f 100644 --- a/ext/intl/tests/calendar_getTime_error.phpt +++ b/ext/intl/tests/calendar_getTime_error.phpt @@ -28,4 +28,8 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line % Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_time(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt index 9b65244a25..e5333cb016 100644 --- a/ext/intl/tests/calendar_getType_error.phpt +++ b/ext/intl/tests/calendar_getType_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line % Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_type(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt index e642fa8ca1..210735b2a0 100644 --- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt +++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt @@ -41,4 +41,8 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_get_weekend_transition(1, 1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt index f39f85f625..6d7ebcfeca 100644 --- a/ext/intl/tests/calendar_inDaylightTime_error.phpt +++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_in_daylight_time(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt index ea4aab2a13..7a9d9f109c 100644 --- a/ext/intl/tests/calendar_isLenient_error.phpt +++ b/ext/intl/tests/calendar_isLenient_error.phpt @@ -29,4 +29,8 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_is_lenient(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt index 66060fc081..c9497bea09 100644 --- a/ext/intl/tests/calendar_isSet_error.phpt +++ b/ext/intl/tests/calendar_isSet_error.phpt @@ -39,4 +39,8 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_is_set(1, 2) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt index cac7a0de8b..0538fa95ca 100644 --- a/ext/intl/tests/calendar_isWeekend_error.phpt +++ b/ext/intl/tests/calendar_isWeekend_error.phpt @@ -35,4 +35,8 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in % Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_is_weekend(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt index e8669baabe..a496089026 100644 --- a/ext/intl/tests/calendar_roll_error.phpt +++ b/ext/intl/tests/calendar_roll_error.phpt @@ -34,4 +34,8 @@ bool(false) Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_roll(1, 2, 3) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt index bbbbcf30fb..8d24a61d6b 100644 --- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt +++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt @@ -37,4 +37,8 @@ bool(false) Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set_first_day_of_week(1, 2) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt index 37817c61c2..a1516b9c0e 100644 --- a/ext/intl/tests/calendar_setLenient_error.phpt +++ b/ext/intl/tests/calendar_setLenient_error.phpt @@ -41,4 +41,8 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set_lenient(1, false) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt index 098c46a44a..406eebd356 100644 --- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt +++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt @@ -36,5 +36,9 @@ bool(false) Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set_minimal_days_in_first_week(1, 2) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt index 2621e11d52..fa26ef3491 100644 --- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt +++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt @@ -79,4 +79,8 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1 Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set_repeated_wall_time_option(1, 1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt index f00597b00d..e086d77470 100644 --- a/ext/intl/tests/calendar_setTime_error.phpt +++ b/ext/intl/tests/calendar_setTime_error.phpt @@ -34,4 +34,8 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set_time(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt index a61e631174..ecbc822e55 100644 --- a/ext/intl/tests/calendar_set_error.phpt +++ b/ext/intl/tests/calendar_set_error.phpt @@ -38,4 +38,8 @@ bool(false) Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_set(1, 2, 3) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt index ac31e75ab5..a4b7bc3807 100644 --- a/ext/intl/tests/calendar_toDateTime_error.phpt +++ b/ext/intl/tests/calendar_toDateTime_error.phpt @@ -38,4 +38,8 @@ bool(false) Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)" -Fatal error: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlcal_to_date_time(3) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/dateformat_calendars.phpt b/ext/intl/tests/dateformat_calendars.phpt index 13dde0f370..275dba1c30 100644 --- a/ext/intl/tests/dateformat_calendars.phpt +++ b/ext/intl/tests/dateformat_calendars.phpt @@ -41,7 +41,7 @@ string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12" string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12" string(42) "Sunday, Tevet 6, 5772 5:12:00 AM GMT+05:12" -Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in %sdateformat_calendars.php:%d +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d Stack trace: #0 %sdateformat_calendars.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} diff --git a/ext/intl/tests/dateformat_calendars_variant2.phpt b/ext/intl/tests/dateformat_calendars_variant2.phpt index 11a5026da0..fe4493aa7f 100644 --- a/ext/intl/tests/dateformat_calendars_variant2.phpt +++ b/ext/intl/tests/dateformat_calendars_variant2.phpt @@ -42,7 +42,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(48) "Sunday, Tevet 6, 5772 AM at 5:12:00 AM GMT+05:12" -Fatal error: Uncaught exception 'IntlException' with message 'IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object' in %sdateformat_calendars_variant2.php:27 +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27 Stack trace: #0 %sdateformat_calendars_variant2.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt index 6d7862f941..59d74aca1e 100644 --- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt +++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt @@ -27,4 +27,8 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlgregcal_get_gregorian_change(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt index 5c72929c94..04b047dd20 100644 --- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt +++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt @@ -45,4 +45,8 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlgregcal_is_leap_year(1, 2) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt index 5c426b3486..df74807ca8 100644 --- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt +++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt @@ -39,4 +39,8 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s:%d +Stack trace: +#0 %s(%d): intlgregcal_set_gregorian_change(1, 4) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt index 07d3af1865..b0a45bceaf 100644 --- a/ext/intl/tests/timezone_getCanonicalID_error.phpt +++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt @@ -29,7 +29,7 @@ bool(false) Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: could not convert time zone id to UTF-16 in %s on line %d bool(false) -Fatal error: Uncaught exception 'Error' with message 'Cannot pass parameter 2 by reference' in %s:%d +Fatal error: Uncaught EngineException: Cannot pass parameter 2 by reference in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt index bd78e9f8f4..5d9a1a2fc3 100644 --- a/ext/intl/tests/timezone_getDSTSavings_error.phpt +++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt @@ -20,4 +20,8 @@ Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_dst_savings(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt index 8a527cd925..89e77b5614 100644 --- a/ext/intl/tests/timezone_getDisplayName_error.phpt +++ b/ext/intl/tests/timezone_getDisplayName_error.phpt @@ -42,4 +42,8 @@ Warning: IntlTimeZone::getDisplayName() expects at most 3 parameters, 4 given in Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_display_name(NULL, 1, false, 'pt_PT') +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt index cb28628bf3..5d5f4d74a3 100644 --- a/ext/intl/tests/timezone_getErrorCode_error.phpt +++ b/ext/intl/tests/timezone_getErrorCode_error.phpt @@ -20,4 +20,8 @@ Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in % Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_error_code(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt index 2ef5aa75f1..9a71ea4aac 100644 --- a/ext/intl/tests/timezone_getErrorMessage_error.phpt +++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt @@ -20,4 +20,8 @@ Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given i Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_error_message(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt index ad28532508..36932e1f8d 100644 --- a/ext/intl/tests/timezone_getID_error.phpt +++ b/ext/intl/tests/timezone_getID_error.phpt @@ -20,4 +20,8 @@ Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on li Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_id(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt index 296eb1dd1a..d87c2aab32 100644 --- a/ext/intl/tests/timezone_getOffset_error.phpt +++ b/ext/intl/tests/timezone_getOffset_error.phpt @@ -30,4 +30,8 @@ Warning: IntlTimeZone::getOffset() expects exactly 4 parameters, 5 given in %s o Warning: IntlTimeZone::getOffset(): intltz_get_offset: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_offset(NULL, %d, false, NULL, NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt index 2d23b4ee18..80f8ce01d2 100644 --- a/ext/intl/tests/timezone_getRawOffset_error.phpt +++ b/ext/intl/tests/timezone_getRawOffset_error.phpt @@ -20,4 +20,8 @@ Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in % Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_get_raw_offset(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt index aa33f9196d..d0a9e73117 100644 --- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt +++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt @@ -35,4 +35,8 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s:%d +Stack trace: +#0 %s(%d): intltz_to_date_time_zone(1) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt index 455a9acf11..ab63d7a428 100644 --- a/ext/intl/tests/timezone_useDaylightTime_error.phpt +++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt @@ -19,4 +19,8 @@ Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given i Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d bool(false) -Fatal error: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s:%d +Stack trace: +#0 %s(%d): intltz_use_daylight_time(NULL) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt index 6f6caeffad..bebb3c44c6 100644 --- a/ext/intl/tests/transliterator_create_inverse_error.phpt +++ b/ext/intl/tests/transliterator_create_inverse_error.phpt @@ -18,4 +18,8 @@ Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given i Warning: Transliterator::createInverse(): transliterator_create_inverse: bad arguments in %s on line %d -Fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s:%d +Stack trace: +#0 %s(%d): transliterator_create_inverse('jj') +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt index 3d68d20927..f2a0c7dabc 100644 --- a/ext/intl/tests/transliterator_get_error_code_error.phpt +++ b/ext/intl/tests/transliterator_get_error_code_error.phpt @@ -21,4 +21,8 @@ Warning: Transliterator::getErrorCode() expects exactly 0 parameters, 1 given in Warning: Transliterator::getErrorCode(): transliterator_get_error_code: unable to parse input params in %s on line %d -Fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s:%d +Stack trace: +#0 %s(%d): transliterator_get_error_code(Array) +#1 {main} + thrown in %s on line %d diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt index 5fe89afdb3..8f8f0be9f9 100644 --- a/ext/intl/tests/transliterator_get_error_message_error.phpt +++ b/ext/intl/tests/transliterator_get_error_message_error.phpt @@ -21,4 +21,8 @@ Warning: Transliterator::getErrorMessage() expects exactly 0 parameters, 1 given Warning: Transliterator::getErrorMessage(): transliterator_get_error_message: unable to parse input params in %s on line %d -Fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s:%d +Stack trace: +#0 %s(%d): transliterator_get_error_message(Array) +#1 {main} + thrown in %s on line %d diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index b282d567ec..ff9518f220 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -26,7 +26,7 @@ $DB->query_single('SELECT DATE()'); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to a member function fetch_row() on boolean' in %sbug33491.php:%d +Fatal error: Uncaught EngineException: 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} diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt index cde888920e..7158cec30a 100644 --- a/ext/mysqli/tests/bug38003.phpt +++ b/ext/mysqli/tests/bug38003.phpt @@ -17,7 +17,7 @@ $DB = new DB(); echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private DB::__construct() from invalid context' in %s:%d +Fatal error: Uncaught EngineException: 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 f9ce927abb..316e351dc4 100644 --- a/ext/mysqli/tests/mysqli_driver_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_driver_unclonable.phpt @@ -10,7 +10,7 @@ Trying to clone mysqli_driver object print "done!"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class mysqli_driver' in %s:%d +Fatal error: Uncaught EngineException: 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 1f6e9098fc..52941ad6b1 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -62,7 +62,7 @@ Exception: Class mysqli_fetch_object_test does not have a constructor hence you Fatal error with PHP (but no exception!): -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method mysqli_fetch_object_test::mysqli_fetch_object_test()' in %s:%d +Fatal error: Uncaught EngineException: 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 408dffa64d..d409ba3bbf 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class mysqli_result' in %s:%d +Fatal error: Uncaught EngineException: 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 1c6f961e98..b2d7dead7a 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class mysqli_stmt' in %s:%d +Fatal error: Uncaught EngineException: 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 bf515bc0a0..2ce91584aa 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class mysqli' in %s:%d +Fatal error: Uncaught EngineException: 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 diff --git a/ext/pdo/tests/bug47769.phpt b/ext/pdo/tests/bug47769.phpt index 7e0ef83b95..12a5e00d11 100644 --- a/ext/pdo/tests/bug47769.phpt +++ b/ext/pdo/tests/bug47769.phpt @@ -34,7 +34,7 @@ this is a protected method. this is a private method. foo -Fatal error: Uncaught exception 'Error' with message 'Call to protected method test::isProtected() from context ''' in %s:%d +Fatal error: Uncaught EngineException: 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 a34197d3ca..5083b84708 100644 --- a/ext/pdo/tests/pdo_025.phpt +++ b/ext/pdo/tests/pdo_025.phpt @@ -110,7 +110,7 @@ object(Test)#%d (3) { } ===FAIL=== -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property Fail::$id' in %spdo_025.php:%d +Fatal error: Uncaught EngineException: 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_036.phpt b/ext/pdo/tests/pdo_036.phpt index a9fdc9315d..61f0e49a1c 100644 --- a/ext/pdo/tests/pdo_036.phpt +++ b/ext/pdo/tests/pdo_036.phpt @@ -20,7 +20,7 @@ object(PDOStatement)#%d (1) { NULL } -Fatal error: Uncaught exception 'PDOException' with message 'You may not create a PDORow manually' in %spdo_036.php:8 +Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdo_036.php:8 Stack trace: #0 [internal function]: PDORow->__construct() #1 %spdo_036.php(8): ReflectionClass->newInstance() diff --git a/ext/pdo/tests/pdo_037.phpt b/ext/pdo/tests/pdo_037.phpt index 98effc7d2c..3d9bc59dd0 100644 --- a/ext/pdo/tests/pdo_037.phpt +++ b/ext/pdo/tests/pdo_037.phpt @@ -16,7 +16,7 @@ var_dump($obj->foo()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method MyStatement::foo()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method MyStatement::foo() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/pdo/tests/pdorow.phpt b/ext/pdo/tests/pdorow.phpt index 727f60f2c7..7cd1198838 100644 --- a/ext/pdo/tests/pdorow.phpt +++ b/ext/pdo/tests/pdorow.phpt @@ -9,7 +9,7 @@ new PDORow; ?> --EXPECTF-- -Fatal error: Uncaught exception 'PDOException' with message 'You may not create a PDORow manually' in %spdorow.php:3 +Fatal error: Uncaught PDOException: You may not create a PDORow manually in %spdorow.php:3 Stack trace: #0 %spdorow.php(3): PDORow->__construct() #1 {main} diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt index f2bd290abc..241c3f84e8 100644 --- a/ext/pdo_mysql/tests/bug_37445.phpt +++ b/ext/pdo_mysql/tests/bug_37445.phpt @@ -17,7 +17,7 @@ $stmt = $db->prepare("SELECT 1"); $stmt->bindParam(':a', 'b'); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot pass parameter 2 by reference' in %sbug_37445.php:%d +Fatal error: Uncaught EngineException: Cannot pass parameter 2 by reference in %sbug_37445.php:%d Stack trace: #0 {main} thrown in %sbug_37445.php on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt index 03a3e63d42..b31ad352b4 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt @@ -152,7 +152,7 @@ array(1) { } } -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class mystatement6' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class mystatement6 in %s:%d Stack trace: #0 %s(%d): PDO->query('SELECT id, labe...') #1 {main} diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt index a95a13ad14..2076723344 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt @@ -93,7 +93,7 @@ array(1) { Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function execute() on boolean' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt index 5f1a6c1010..66ee0eedc9 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt @@ -36,7 +36,7 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function execute() on boolean' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt index 0f774d97d1..06a6a418f9 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt @@ -56,7 +56,7 @@ Testing native PS... Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function execute() on boolean' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function execute() on boolean in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt index 4bb83fddab..1caa875a32 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt @@ -99,7 +99,7 @@ Native Prepared Statements... Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function errorInfo() on boolean' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function errorInfo() on boolean in %s:%d Stack trace: #0 %s(%d): mysql_stmt_multiquery_wrong_usage(Object(PDO)) #1 {main} diff --git a/ext/phar/tests/bug46032.phpt b/ext/phar/tests/bug46032.phpt index 7700e9b6f8..a59ddadd43 100644 --- a/ext/phar/tests/bug46032.phpt +++ b/ext/phar/tests/bug46032.phpt @@ -27,7 +27,7 @@ new phardata('0000000000000000000'); %string|unicode%(%d) "%smytest" %string|unicode%(%d) "%smytest" -Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist' in %sbug46032.php:%d +Fatal error: Uncaught UnexpectedValueException: Cannot create phar '0000000000000000000', file extension (or combination) not recognised or the directory does not exist in %sbug46032.php:%d Stack trace: #0 %sbug46032.php(%d): PharData->__construct('000000000000000...') #1 {main} diff --git a/ext/phar/tests/bug69441.phpt b/ext/phar/tests/bug69441.phpt index 03c87e34ca..3e995e03c0 100644 --- a/ext/phar/tests/bug69441.phpt +++ b/ext/phar/tests/bug69441.phpt @@ -14,7 +14,7 @@ $r = new Phar($fname, 0); ==DONE== --EXPECTF-- -exception 'UnexpectedValueException' with message 'phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar"' in %s%ebug69441.php:%d +UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%s%ebug69441.phar" in %s%ebug69441.php:%d Stack trace: #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 4a2a37f00a..12b437639a 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -14,7 +14,7 @@ $r = new Phar($fname, 0); ==DONE== --EXPECTF-- -exception 'UnexpectedValueException' with message 'phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d +UnexpectedValueException: phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "") in %s:%d Stack trace: #0 %s/bug69453.php(%d): Phar->__construct('%s', 0) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt index 25b147e194..f5e4e2269f 100644 --- a/ext/phar/tests/cache_list/frontcontroller11.phpt +++ b/ext/phar/tests/cache_list/frontcontroller11.phpt @@ -15,7 +15,7 @@ files/frontcontroller5.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2 +Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2 Stack trace: #0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt index cfc7d0e43a..6d798f9f8a 100644 --- a/ext/phar/tests/cache_list/frontcontroller12.phpt +++ b/ext/phar/tests/cache_list/frontcontroller12.phpt @@ -14,7 +14,7 @@ files/frontcontroller6.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2 Stack trace: #0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt index e6c9dee4ae..c81d0cfbd9 100644 --- a/ext/phar/tests/cache_list/frontcontroller13.phpt +++ b/ext/phar/tests/cache_list/frontcontroller13.phpt @@ -14,7 +14,7 @@ files/frontcontroller7.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2 Stack trace: #0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller18.phpt b/ext/phar/tests/cache_list/frontcontroller18.phpt index 5e94bf6ff5..77c0303d0c 100644 --- a/ext/phar/tests/cache_list/frontcontroller18.phpt +++ b/ext/phar/tests/cache_list/frontcontroller18.phpt @@ -11,7 +11,7 @@ PATH_INFO=/fronk.gronk --FILE_EXTERNAL-- files/frontcontroller9.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.php:2 +Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.php:2 Stack trace: #0 %sfrontcontroller18.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller19.phpt b/ext/phar/tests/cache_list/frontcontroller19.phpt index bed0b1df31..548c6db479 100644 --- a/ext/phar/tests/cache_list/frontcontroller19.phpt +++ b/ext/phar/tests/cache_list/frontcontroller19.phpt @@ -11,7 +11,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller10.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.php:2 +Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.php:2 Stack trace: #0 %sfrontcontroller19.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller20.phpt b/ext/phar/tests/cache_list/frontcontroller20.phpt index bf333c773c..68591c962a 100644 --- a/ext/phar/tests/cache_list/frontcontroller20.phpt +++ b/ext/phar/tests/cache_list/frontcontroller20.phpt @@ -11,7 +11,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller11.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.php:2 +Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.php:2 Stack trace: #0 %sfrontcontroller20.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt index bd2b33c913..39c27fcdd7 100644 --- a/ext/phar/tests/cache_list/frontcontroller29.phpt +++ b/ext/phar/tests/cache_list/frontcontroller29.phpt @@ -14,7 +14,7 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1 +Fatal error: Uncaught EngineException: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1 Stack trace: #0 [internal function]: unknown() #1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array) diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt index 1e6f1a00ff..aa20e19e97 100644 --- a/ext/phar/tests/frontcontroller11.phpt +++ b/ext/phar/tests/frontcontroller11.phpt @@ -14,7 +14,7 @@ files/frontcontroller5.phar --EXPECTHEADERS-- Content-type: text/html --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.php:2 +Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2 Stack trace: #0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt index 956ea1c050..bad71d0ac5 100644 --- a/ext/phar/tests/frontcontroller12.phpt +++ b/ext/phar/tests/frontcontroller12.phpt @@ -13,7 +13,7 @@ files/frontcontroller6.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.php:2 Stack trace: #0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt index 717e56996f..7d018a141a 100644 --- a/ext/phar/tests/frontcontroller13.phpt +++ b/ext/phar/tests/frontcontroller13.phpt @@ -13,7 +13,7 @@ files/frontcontroller7.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.php:2 Stack trace: #0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt index 19aea45563..d01886e6b0 100644 --- a/ext/phar/tests/frontcontroller18.phpt +++ b/ext/phar/tests/frontcontroller18.phpt @@ -9,7 +9,7 @@ PATH_INFO=/fronk.gronk --FILE_EXTERNAL-- files/frontcontroller9.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.php:2 +Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.php:2 Stack trace: #0 %sfrontcontroller18.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt index 9adafa2b30..e577ecb6a4 100644 --- a/ext/phar/tests/frontcontroller19.phpt +++ b/ext/phar/tests/frontcontroller19.phpt @@ -9,7 +9,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller10.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.php:2 +Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.php:2 Stack trace: #0 %sfrontcontroller19.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt index 45e2bfc25e..e67ec06a5c 100644 --- a/ext/phar/tests/frontcontroller20.phpt +++ b/ext/phar/tests/frontcontroller20.phpt @@ -9,7 +9,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller11.phar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.php:2 +Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.php:2 Stack trace: #0 %sfrontcontroller20.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt index 5978c2c06f..5369a60845 100644 --- a/ext/phar/tests/frontcontroller29.phpt +++ b/ext/phar/tests/frontcontroller29.phpt @@ -13,7 +13,7 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function oopsie_daisy()' in phar://%sfatalerror.phps:1 +Fatal error: Uncaught EngineException: Call to undefined function oopsie_daisy() in phar://%sfatalerror.phps:1 Stack trace: #0 [internal function]: unknown() #1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array) diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt index 2b0d15b603..4b8c29dd1b 100644 --- a/ext/phar/tests/tar/frontcontroller11.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt @@ -14,7 +14,7 @@ files/frontcontroller5.phar.tar --EXPECTHEADERS-- Content-type: text/html --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2 +Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 Stack trace: #0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt index 2086856cf3..53804e476a 100644 --- a/ext/phar/tests/tar/frontcontroller12.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt @@ -13,7 +13,7 @@ files/frontcontroller6.phar.tar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2 Stack trace: #0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt index ce7620a198..7fc0676aea 100644 --- a/ext/phar/tests/tar/frontcontroller13.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt @@ -13,7 +13,7 @@ files/frontcontroller7.phar.tar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2 Stack trace: #0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/tar/frontcontroller18.phar.phpt b/ext/phar/tests/tar/frontcontroller18.phar.phpt index c52ce291c7..1dddcef069 100644 --- a/ext/phar/tests/tar/frontcontroller18.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller18.phar.phpt @@ -9,7 +9,7 @@ PATH_INFO=/fronk.gronk --FILE_EXTERNAL-- files/frontcontroller9.phar.tar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.phar.php:2 +Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.phar.php:2 Stack trace: #0 %sfrontcontroller18.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/tar/frontcontroller19.phar.phpt b/ext/phar/tests/tar/frontcontroller19.phar.phpt index 6b07438787..21a173f9be 100644 --- a/ext/phar/tests/tar/frontcontroller19.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller19.phar.phpt @@ -9,7 +9,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller10.phar.tar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.phar.php:2 +Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.phar.php:2 Stack trace: #0 %sfrontcontroller19.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/tar/frontcontroller20.phar.phpt b/ext/phar/tests/tar/frontcontroller20.phar.phpt index 3cc470d41b..b88903eb53 100644 --- a/ext/phar/tests/tar/frontcontroller20.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller20.phar.phpt @@ -9,7 +9,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller11.phar.tar --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.phar.php:2 +Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.phar.php:2 Stack trace: #0 %sfrontcontroller20.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt index e4900cd3a5..c0c555a1a4 100644 --- a/ext/phar/tests/zip/frontcontroller11.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt @@ -15,7 +15,7 @@ files/frontcontroller5.phar.zip --EXPECTHEADERS-- Content-type: text/html --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Key of MIME type overrides array must be a file extension, was "0"' in %sfrontcontroller11.phar.php:2 +Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 Stack trace: #0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt index 504d037177..a74a0d5d32 100644 --- a/ext/phar/tests/zip/frontcontroller12.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt @@ -14,7 +14,7 @@ files/frontcontroller6.phar.zip --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller12.phar.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller12.phar.php:2 Stack trace: #0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt index 4b9e910a25..4ed1dc8670 100644 --- a/ext/phar/tests/zip/frontcontroller13.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt @@ -14,7 +14,7 @@ files/frontcontroller7.phar.zip --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed' in %sfrontcontroller13.phar.php:2 +Fatal error: Uncaught PharException: Unknown mime type specifier used (not a string or int), only Phar::PHP, Phar::PHPS and a mime type string are allowed in %sfrontcontroller13.phar.php:2 Stack trace: #0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt index dbd09cab15..3d01527122 100644 --- a/ext/phar/tests/zip/frontcontroller18.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt @@ -10,7 +10,7 @@ PATH_INFO=/fronk.gronk --FILE_EXTERNAL-- files/frontcontroller9.phar.zip --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.phar.php:2 +Fatal error: Uncaught PharException: No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller18.phar.php:2 Stack trace: #0 %sfrontcontroller18.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt index 0eb87bfa60..db66ea48b0 100644 --- a/ext/phar/tests/zip/frontcontroller19.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt @@ -10,7 +10,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller10.phar.zip --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.phar.php:2 +Fatal error: Uncaught PharException: Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller19.phar.php:2 Stack trace: #0 %sfrontcontroller19.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt index b1caf52da8..3bab3bfd80 100644 --- a/ext/phar/tests/zip/frontcontroller20.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt @@ -10,7 +10,7 @@ PATH_INFO=/ --FILE_EXTERNAL-- files/frontcontroller11.phar.zip --EXPECTF-- -Fatal error: Uncaught exception 'PharException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.phar.php:2 +Fatal error: Uncaught PharException: Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME in %sfrontcontroller20.phar.php:2 Stack trace: #0 %sfrontcontroller20.phar.php(2): Phar::mungServer(Array) #1 {main} diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt index a19a292e1e..0d1ef20ad7 100644 --- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt @@ -12,7 +12,7 @@ if (!extension_loaded('reflection)) print 'skip'; $rc = new ReflectionClass("stdClass"); $rc2 = clone($rc); --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class ReflectionClass' in %s:%d +Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class ReflectionClass in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_getName_error1.phpt b/ext/reflection/tests/ReflectionClass_getName_error1.phpt index 4a46d6970e..e475688b6d 100644 --- a/ext/reflection/tests/ReflectionClass_getName_error1.phpt +++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt @@ -5,7 +5,7 @@ ReflectionClass::getName - forbid static invocation ReflectionClass::getName(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2 +Fatal error: Uncaught EngineException: Non-static method ReflectionClass::getName() cannot be called statically in %s:2 Stack trace: #0 {main} thrown in %s on line 2 diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt index 8bb62d95f1..02f7595cb4 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt @@ -54,7 +54,7 @@ try { Retrieving static values from A: string(13) "default value" -Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d +Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d Stack trace: #0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...') #1 {main} diff --git a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt index 3d0fcf90d8..e261855088 100644 --- a/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt +++ b/ext/reflection/tests/ReflectionClass_isCloneable_001.phpt @@ -68,7 +68,7 @@ Internal class - XMLWriter bool(false) bool(false) -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class XMLWriter' in %s:%d +Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class XMLWriter in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt index 0bf37b0e46..47dba9b6ec 100644 --- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt +++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt @@ -86,7 +86,7 @@ NULL Test static invocation: -Fatal error: Uncaught exception 'Error' with message 'Non-static method ReflectionClass::isIterateable() cannot be called statically' in %s:43 +Fatal error: Uncaught EngineException: Non-static method ReflectionClass::isIterateable() cannot be called statically in %s:43 Stack trace: #0 {main} thrown in %s on line 43
\ No newline at end of file diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt index 2fabd023e6..bb4f96818a 100644 --- a/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt +++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt @@ -9,7 +9,7 @@ var_dump($rc->isSubclassOf('X')); ?> --EXPECTF-- -Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:5 +Fatal error: Uncaught ReflectionException: Class X does not exist in %s:5 Stack trace: #0 %s(5): ReflectionClass->isSubclassOf('X') #1 {main} diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt index b06818901d..ada3c6db48 100644 --- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt @@ -17,4 +17,8 @@ var_dump($a); ?> --EXPECTF-- -Fatal error: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s on line 8 +Fatal error: Uncaught TypeException: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s:8 +Stack trace: +#0 %s(%d): ReflectionClass->newInstanceArgs('x') +#1 {main} + thrown in %s on line 8 diff --git a/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt b/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt index dfe3e7f8f7..334efc3a50 100644 --- a/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt +++ b/ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt @@ -31,7 +31,7 @@ object(stdClass)#%d (0) { object(DateTime)#%d (0) { } -Fatal error: Uncaught exception 'ReflectionException' with message 'Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor' in %sReflectionClass_newInstanceWithoutConstructor.php:%d +Fatal error: Uncaught ReflectionException: Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor in %sReflectionClass_newInstanceWithoutConstructor.php:%d Stack trace: #0 %sReflectionClass_newInstanceWithoutConstructor.php(%d): ReflectionClass->newInstanceWithoutConstructor() #1 {main} diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt index dc13bf562d..6720d2daa2 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt @@ -54,7 +54,7 @@ try { --EXPECTF-- Set static values in A: -Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d +Fatal error: Uncaught ReflectionException: Class A does not have a property named in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d Stack trace: #0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1') #1 {main} diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt index 70528255e7..f7beea67a6 100644 --- a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt +++ b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt @@ -65,37 +65,37 @@ try { ?> --EXPECTF-- Wrong type of argument (bool): -exception 'ReflectionException' with message 'Invalid method name 1' in %s +ReflectionException: Invalid method name 1 in %s Stack trace: #0 %s ReflectionMethod->__construct('1') #1 {main} Wrong type of argument (int): -exception 'ReflectionException' with message 'Invalid method name 3' in %s +ReflectionException: Invalid method name 3 in %s Stack trace: #0 %s ReflectionMethod->__construct('3') #1 {main} Wrong type of argument (bool, string): -exception 'ReflectionException' with message 'The parameter class is expected to be either a string or an object' in %s +ReflectionException: The parameter class is expected to be either a string or an object in %s Stack trace: #0 %s ReflectionMethod->__construct(true, 'foo') #1 {main} Wrong type of argument (string, bool): -exception 'ReflectionException' with message 'Method TestClass::1() does not exist' in %s +ReflectionException: Method TestClass::1() does not exist in %s Stack trace: #0 %s ReflectionMethod->__construct('TestClass', '1') #1 {main} No method given: -exception 'ReflectionException' with message 'Invalid method name TestClass' in %s +ReflectionException: Invalid method name TestClass in %s Stack trace: #0 %s ReflectionMethod->__construct('TestClass') #1 {main} Class and Method in same string, bad method name: -exception 'ReflectionException' with message 'Method TestClass::foop::dedoop() does not exist' in %s +ReflectionException: Method TestClass::foop::dedoop() does not exist in %s Stack trace: #0 %s ReflectionMethod->__construct('TestClass::foop...') #1 {main} Class and Method in same string, bad class name: -exception 'ReflectionException' with message 'Class TestCla does not exist' in %s +ReflectionException: Class TestCla does not exist in %s Stack trace: #0 %s ReflectionMethod->__construct('TestCla::foo') #1 {main} diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt index a8b30ba5d7..32132f52e8 100644 --- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt +++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt @@ -5,7 +5,7 @@ ReflectionObject::getName - forbid static invocation ReflectionObject::getName(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Non-static method ReflectionClass::getName() cannot be called statically' in %s:2 +Fatal error: Uncaught EngineException: Non-static method ReflectionClass::getName() cannot be called statically in %s:2 Stack trace: #0 {main} thrown in %s on line 2 diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt index 9387b7dcb3..11994ed705 100644 --- a/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt +++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt @@ -17,7 +17,7 @@ NULL Warning: ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given in %s on line 6 NULL -Fatal error: Uncaught exception 'ReflectionException' with message 'Class X does not exist' in %s:7 +Fatal error: Uncaught ReflectionException: Class X does not exist in %s:7 Stack trace: #0 %s(7): ReflectionClass->isSubclassOf('X') #1 {main} diff --git a/ext/reflection/tests/ReflectionParameter_export_error3.phpt b/ext/reflection/tests/ReflectionParameter_export_error3.phpt index 2937853288..4e71f55d45 100644 --- a/ext/reflection/tests/ReflectionParameter_export_error3.phpt +++ b/ext/reflection/tests/ReflectionParameter_export_error3.phpt @@ -14,7 +14,7 @@ foreach($params as $key => $value) { } --EXPECTF-- -Fatal error: Uncaught exception 'ReflectionException' with message 'The parameter specified by its name could not be found' in %s.php:%d +Fatal error: Uncaught ReflectionException: The parameter specified by its name could not be found in %s.php:%d Stack trace: #0 [internal function]: ReflectionParameter->__construct('ReflectionParam...', 'incorrect_param...') #1 %s.php(%d): ReflectionParameter::export('ReflectionParam...', 'incorrect_param...') diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt index cf8ec1dfcc..91b7fa6885 100644 --- a/ext/reflection/tests/bug64007.phpt +++ b/ext/reflection/tests/bug64007.phpt @@ -16,7 +16,7 @@ var_dump($generator); --EXPECTF-- string(%d) "Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor" -Fatal error: Uncaught exception 'Error' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %sbug64007.php:%d +Fatal error: Uncaught EngineException: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php:%d Stack trace: #0 %s(%d): ReflectionClass->newInstance() #1 {main} diff --git a/ext/session/tests/bug60634_error_1.phpt b/ext/session/tests/bug60634_error_1.phpt index ec7f190b41..90983c6f85 100644 --- a/ext/session/tests/bug60634_error_1.phpt +++ b/ext/session/tests/bug60634_error_1.phpt @@ -45,7 +45,7 @@ echo "um, hi\n"; --EXPECTF-- write: goodbye cruel world -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function undefined_function()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d Stack trace: #0 [internal function]: write(%s, '') #1 %s(%d): session_write_close() diff --git a/ext/session/tests/bug60634_error_2.phpt b/ext/session/tests/bug60634_error_2.phpt index 96c8eb61e5..045b3f5385 100644 --- a/ext/session/tests/bug60634_error_2.phpt +++ b/ext/session/tests/bug60634_error_2.phpt @@ -45,7 +45,7 @@ echo "um, hi\n"; --EXPECTF-- write: goodbye cruel world -Fatal error: Uncaught exception 'Exception' in %s +Fatal error: Uncaught Exception in %s Stack trace: #0 [internal function]: write('%s', '') #1 %s(%d): session_write_close() diff --git a/ext/session/tests/bug60634_error_3.phpt b/ext/session/tests/bug60634_error_3.phpt index 9a32de7a19..d756644f76 100644 --- a/ext/session/tests/bug60634_error_3.phpt +++ b/ext/session/tests/bug60634_error_3.phpt @@ -43,7 +43,7 @@ session_start(); --EXPECTF-- write: goodbye cruel world -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function undefined_function()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d Stack trace: #0 [internal function]: write(%s, '') #1 {main} diff --git a/ext/session/tests/bug60634_error_4.phpt b/ext/session/tests/bug60634_error_4.phpt index d0b5786af9..7970b35c7a 100644 --- a/ext/session/tests/bug60634_error_4.phpt +++ b/ext/session/tests/bug60634_error_4.phpt @@ -43,7 +43,7 @@ session_start(); --EXPECTF-- write: goodbye cruel world -Fatal error: Uncaught exception 'Exception' in %s +Fatal error: Uncaught Exception in %s Stack trace: #0 [internal function]: write('%s', '') #1 {main} diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt index 995917d0b4..018cf17538 100644 --- a/ext/session/tests/bug60634_error_5.phpt +++ b/ext/session/tests/bug60634_error_5.phpt @@ -44,7 +44,7 @@ echo "um, hi\n"; --EXPECTF-- close: goodbye cruel world -Fatal error: Uncaught exception 'Error' with message 'Call to undefined function undefined_function()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined function undefined_function() in %s:%d Stack trace: #0 [internal function]: close() #1 %s(%d): session_write_close() diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt index b282b4025d..de49195fe8 100644 --- a/ext/session/tests/session_module_name_variation3.phpt +++ b/ext/session/tests/session_module_name_variation3.phpt @@ -41,7 +41,7 @@ ob_end_flush(); string(%d) "%s" string(4) "user" -Warning: Uncaught exception 'Exception' with message 'Stop...!' in %s:%d +Warning: Uncaught Exception: Stop...! in %s:%d Stack trace: #0 [internal function]: open('', 'PHPSESSID') #1 %s(%d): session_start() diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt index 859ba11ad5..fdf306a4a5 100644 --- a/ext/session/tests/session_set_save_handler_error3.phpt +++ b/ext/session/tests/session_set_save_handler_error3.phpt @@ -34,7 +34,7 @@ ob_end_flush(); --EXPECTF-- *** Testing session_set_save_handler() : error functionality *** -Warning: Uncaught exception 'Exception' with message 'Do something bad..!' in %s:%d +Warning: Uncaught Exception: Do something bad..! in %s:%d Stack trace: #0 [internal function]: open('', 'PHPSESSID') #1 %s(%d): session_start() diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt index d32be19208..7926ceb6e1 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt @@ -11,7 +11,7 @@ Notice: Undefined variable: x in %s on line %d Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function xpath() on null' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function xpath() on null in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt index da5276ccdc..d0753fc33e 100644 --- a/ext/spl/tests/DirectoryIterator_empty_constructor.phpt +++ b/ext/spl/tests/DirectoryIterator_empty_constructor.phpt @@ -8,7 +8,7 @@ Havard Eide <nucleuz@gmail.com> $it = new DirectoryIterator(""); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'Directory name must not be empty.' in %s:%d +Fatal error: Uncaught RuntimeException: Directory name must not be empty. in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('') #1 {main} diff --git a/ext/spl/tests/DirectoryIterator_getInode_error.phpt b/ext/spl/tests/DirectoryIterator_getInode_error.phpt index c3641f9d89..ba9014c690 100644 --- a/ext/spl/tests/DirectoryIterator_getInode_error.phpt +++ b/ext/spl/tests/DirectoryIterator_getInode_error.phpt @@ -21,7 +21,7 @@ var_dump($fileInfo->getInode()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getInode(): stat failed for %s' in %s +Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for %s in %s Stack trace: #0 %s: SplFileInfo->getInode() #1 {main} diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt index 5df4ab59a5..b2bc444550 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt @@ -11,7 +11,7 @@ $get = $array->offsetGet( array( 'fail' ) ); ?> --EXPECTF-- -Fatal error: Uncaught exception 'OutOfRangeException' with message 'Offset invalid or out of range' in %s +Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s Stack trace: #0 %s #1 {main} diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt index fcff762e6b..a387439d16 100644 --- a/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt @@ -11,7 +11,7 @@ $get = $array->offsetGet( 'fail' ); ?> --EXPECTF-- -Fatal error: Uncaught exception 'OutOfRangeException' with message 'Offset invalid or out of range' in %s +Fatal error: Uncaught OutOfRangeException: Offset invalid or out of range in %s Stack trace: #0 %s #1 {main} diff --git a/ext/spl/tests/SplFileInfo_getGroup_error.phpt b/ext/spl/tests/SplFileInfo_getGroup_error.phpt index f0db00d9ed..acfa6b99c5 100644 --- a/ext/spl/tests/SplFileInfo_getGroup_error.phpt +++ b/ext/spl/tests/SplFileInfo_getGroup_error.phpt @@ -21,7 +21,7 @@ var_dump($fileInfo->getGroup()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getGroup(): stat failed for not_existing' in %s +Fatal error: Uncaught RuntimeException: SplFileInfo::getGroup(): stat failed for not_existing in %s Stack trace: #0 %s: SplFileInfo->getGroup() #1 {main} diff --git a/ext/spl/tests/SplFileInfo_getInode_error.phpt b/ext/spl/tests/SplFileInfo_getInode_error.phpt index bf8efae4c9..31b5382336 100644 --- a/ext/spl/tests/SplFileInfo_getInode_error.phpt +++ b/ext/spl/tests/SplFileInfo_getInode_error.phpt @@ -21,7 +21,7 @@ var_dump($fileInfo->getInode()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getInode(): stat failed for not_existing' in %s +Fatal error: Uncaught RuntimeException: SplFileInfo::getInode(): stat failed for not_existing in %s Stack trace: #0 %s: SplFileInfo->getInode() #1 {main} diff --git a/ext/spl/tests/SplFileInfo_getOwner_error.phpt b/ext/spl/tests/SplFileInfo_getOwner_error.phpt index d5d46781cc..f6b4b29195 100644 --- a/ext/spl/tests/SplFileInfo_getOwner_error.phpt +++ b/ext/spl/tests/SplFileInfo_getOwner_error.phpt @@ -21,7 +21,7 @@ var_dump($fileInfo->getOwner()); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getOwner(): stat failed for not_existing' in %s +Fatal error: Uncaught RuntimeException: SplFileInfo::getOwner(): stat failed for not_existing in %s Stack trace: #0 %s: SplFileInfo->getOwner() #1 {main} diff --git a/ext/spl/tests/SplFileInfo_getPerms_error.phpt b/ext/spl/tests/SplFileInfo_getPerms_error.phpt index 8e05cdf8df..23b48de976 100644 --- a/ext/spl/tests/SplFileInfo_getPerms_error.phpt +++ b/ext/spl/tests/SplFileInfo_getPerms_error.phpt @@ -21,7 +21,7 @@ var_dump($fileInfo->getPerms() == 0100557); ?> --EXPECTF-- -Fatal error: Uncaught exception 'RuntimeException' with message 'SplFileInfo::getPerms(): stat failed for %s' in %s +Fatal error: Uncaught RuntimeException: SplFileInfo::getPerms(): stat failed for %s in %s Stack trace: #0 %s: SplFileInfo->getPerms() #1 {main} diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt index 89dfc7448d..e1d816e158 100644 --- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt +++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt @@ -26,7 +26,7 @@ string(6) "secret" string(6) "public" string(6) "secret" -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property C::$x' in %s:19 +Fatal error: Uncaught EngineException: Cannot access private property C::$x in %s:19 Stack trace: #0 {main} thrown in %s on line 19 diff --git a/ext/spl/tests/bug48023.phpt b/ext/spl/tests/bug48023.phpt index 3bb29ca7e5..1af4190d0a 100644 --- a/ext/spl/tests/bug48023.phpt +++ b/ext/spl/tests/bug48023.phpt @@ -9,7 +9,7 @@ new Foo; ?> ===DONE=== --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Class 'Foo' not found' in %s:%d +Fatal error: Uncaught EngineException: Class 'Foo' not found in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/spl/tests/bug49972.phpt b/ext/spl/tests/bug49972.phpt index 9c7807d9e1..cc0aff3bed 100644 --- a/ext/spl/tests/bug49972.phpt +++ b/ext/spl/tests/bug49972.phpt @@ -8,7 +8,7 @@ $iterator->undefined(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to undefined method AppendIterator::undefined()' in %s:%d +Fatal error: Uncaught EngineException: Call to undefined method AppendIterator::undefined() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/spl/tests/bug52238.phpt b/ext/spl/tests/bug52238.phpt index 10da0b5fd9..667c0a497a 100644 --- a/ext/spl/tests/bug52238.phpt +++ b/ext/spl/tests/bug52238.phpt @@ -15,7 +15,7 @@ class Foo implements IteratorAggregate var_dump(iterator_to_array(new Foo)); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s +Fatal error: Uncaught Exception in %s Stack trace: #0 %s: Foo->bar() #1 [internal function]: Foo->getIterator() diff --git a/ext/spl/tests/bug54281.phpt b/ext/spl/tests/bug54281.phpt index 9a19a59ad8..1d83699e14 100644 --- a/ext/spl/tests/bug54281.phpt +++ b/ext/spl/tests/bug54281.phpt @@ -12,7 +12,7 @@ foreach($it as $k=>$v) { } ?> --EXPECTF-- -Fatal error: Uncaught exception 'LogicException' with message 'The object is in an invalid state as the parent constructor was not called' in %s:%d +Fatal error: Uncaught LogicException: The object is in an invalid state as the parent constructor was not called in %s:%d Stack trace: #0 %s%ebug54281.php(8): RecursiveIteratorIterator->rewind() #1 {main} diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt index 9314b6b9ff..c0119c4360 100644 --- a/ext/spl/tests/bug54291.phpt +++ b/ext/spl/tests/bug54291.phpt @@ -5,7 +5,7 @@ Bug #54291 (Crash iterating DirectoryIterator for dir name starting with \0) $dir = new DirectoryIterator("\x00/abc"); $dir->isFile(); --EXPECTF-- -Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Failed to open directory ""' in %s:%d +Fatal error: Uncaught UnexpectedValueException: Failed to open directory "" in %s:%d Stack trace: #0 %s(%d): DirectoryIterator->__construct('\x00/abc') #1 {main} diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt index 8d5777f6ae..bedb7684d5 100644 --- a/ext/spl/tests/iterator_035.phpt +++ b/ext/spl/tests/iterator_035.phpt @@ -14,7 +14,7 @@ echo "Done\n"; --EXPECTF-- Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Cannot assign by reference to overloaded object' in %s:%d +Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/spl/tests/iterator_count.phpt b/ext/spl/tests/iterator_count.phpt index a93bf840ba..b70afc18c3 100644 --- a/ext/spl/tests/iterator_count.phpt +++ b/ext/spl/tests/iterator_count.phpt @@ -23,4 +23,8 @@ Warning: iterator_count() expects exactly 1 parameter, 0 given in %s Warning: iterator_count() expects exactly 1 parameter, 2 given in %s -Fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s +Fatal error: Uncaught TypeException: Argument 1 passed to iterator_count() must implement interface Traversable, string given in %s:%d +Stack trace: +#0 %s(%d): iterator_count('1') +#1 {main} + thrown in %s on line %d diff --git a/ext/spl/tests/iterator_to_array.phpt b/ext/spl/tests/iterator_to_array.phpt index 6ea19cee7f..925ee372d4 100644 --- a/ext/spl/tests/iterator_to_array.phpt +++ b/ext/spl/tests/iterator_to_array.phpt @@ -22,4 +22,8 @@ Warning: iterator_to_array() expects at least 1 parameter, 0 given in %s Warning: iterator_to_array() expects at most 2 parameters, 3 given in %s -Fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s +Fatal error: Uncaught TypeException: Argument 1 passed to iterator_to_array() must implement interface Traversable, string given in %s:%d +Stack trace: +#0 %s(%d): iterator_to_array('test', 'test') +#1 {main} + thrown in %s on line %d diff --git a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt index f5430725d4..c9e21b260e 100644 --- a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt @@ -28,7 +28,7 @@ var_dump($recItIt2->next()); --EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->beginchildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt index 88f03fbd81..cbf8136ab6 100644 --- a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt @@ -28,7 +28,7 @@ var_dump($recItIt2->next()); --EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->callHasChildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt index e25d3edc80..82d55cf0ce 100644 --- a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt @@ -34,7 +34,7 @@ foreach ($recItIt2 as $val) echo "$val\n"; 1
2
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->endchildren()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt index 3a91ed5b27..bb020fdff0 100644 --- a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt +++ b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt @@ -28,7 +28,7 @@ var_dump($recItIt->next()); --EXPECTF--
NULL
-Fatal error: Uncaught exception 'Exception' in %s
+Fatal error: Uncaught Exception in %s
Stack trace:
#0 [internal function]: MyRecursiveIteratorIterator->nextelement()
#1 %s: RecursiveIteratorIterator->next()
diff --git a/ext/spl/tests/spl_autoload_012.phpt b/ext/spl/tests/spl_autoload_012.phpt index e07f0e4fe5..16389fa4fa 100644 --- a/ext/spl/tests/spl_autoload_012.phpt +++ b/ext/spl/tests/spl_autoload_012.phpt @@ -49,14 +49,14 @@ first autoload_first autoload_second -Fatal error: Uncaught exception 'Exception' with message 'first' in %sspl_autoload_012.php:%d +Fatal error: Uncaught Exception: first in %sspl_autoload_012.php:%d Stack trace: #0 [internal function]: autoload_first('ThisClassDoesNo...') #1 [internal function]: spl_autoload_call('ThisClassDoesNo...') #2 %sspl_autoload_012.php(%d): class_exists('ThisClassDoesNo...') #3 {main} -Next exception 'Exception' with message 'second' in %sspl_autoload_012.php:%d +Next Exception: second in %sspl_autoload_012.php:%d Stack trace: #0 [internal function]: autoload_second('ThisClassDoesNo...') #1 [internal function]: spl_autoload_call('ThisClassDoesNo...') diff --git a/ext/spl/tests/spl_heap_count_basic.phpt b/ext/spl/tests/spl_heap_count_basic.phpt index 6e6baf6c9b..a14133e873 100644 --- a/ext/spl/tests/spl_heap_count_basic.phpt +++ b/ext/spl/tests/spl_heap_count_basic.phpt @@ -27,7 +27,7 @@ count($heap);// refers to MyHeap->count() method ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' with message 'Cause count to fail' in %s +Fatal error: Uncaught Exception: Cause count to fail in %s Stack trace: #0 [internal function]: MyHeap->count() #1 %s count(Object(MyHeap)) diff --git a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt index 9e57cd8a11..6fbcec9dff 100644 --- a/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt +++ b/ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt @@ -13,7 +13,7 @@ function p ($i) { } ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'An iterator cannot be used with foreach by reference' in %s:%d +Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:%d Stack trace: #0 %s(%d): p(Object(IteratorIterator)) #1 {main} diff --git a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt index 6289fac849..d9c7e2fa41 100644 --- a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt +++ b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt @@ -30,7 +30,7 @@ exec($cmd); unlink($unreadable); ?> --EXPECTF-- -exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error-win.php:%d +Exception: Unable to open database: %s in %ssqlite3_15_open_error-win.php:%d Stack trace: #0 %ssqlite3_15_open_error-win.php(%d): SQLite3->__construct('%s') #1 {main} diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt index fc05b87802..74bcc920d0 100644 --- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt +++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt @@ -24,7 +24,7 @@ echo "Done\n"; unlink($unreadable); ?> --EXPECTF-- -exception 'Exception' with message 'Unable to open database: %s' in %ssqlite3_15_open_error.php:%d +Exception: Unable to open database: %s in %ssqlite3_15_open_error.php:%d Stack trace: #0 %ssqlite3_15_open_error.php(%d): SQLite3->__construct('%s') #1 {main} diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt index 7e83bb23e1..f28c7369dd 100644 --- a/ext/sqlite3/tests/sqlite3_21_security.phpt +++ b/ext/sqlite3/tests/sqlite3_21_security.phpt @@ -32,7 +32,7 @@ bool(true) Above test directory Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %ssqlite3_21_security.php on line %d -exception 'Exception' with message 'open_basedir prohibits opening %s' in %ssqlite3_21_security.php:%d +Exception: open_basedir prohibits opening %s in %ssqlite3_21_security.php:%d Stack trace: #0 %ssqlite3_21_security.php(%d): SQLite3->__construct('%s') #1 {main} diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt index 3b72c64746..75be19b52e 100644 --- a/ext/standard/tests/array/arsort_object1.phpt +++ b/ext/standard/tests/array/arsort_object1.phpt @@ -87,7 +87,7 @@ echo "Done\n"; --EXPECTF-- *** Testing arsort() : object functionality *** -Fatal error: Uncaught exception 'Error' with message 'Class 'for_integer_asort' not found' in %sarsort_object1.php:%d +Fatal error: Uncaught EngineException: Class 'for_integer_asort' not found in %sarsort_object1.php:%d Stack trace: #0 {main} thrown in %sarsort_object1.php on line %d
\ No newline at end of file diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index c906a36053..077e2ced16 100644 --- a/ext/standard/tests/array/arsort_object2.phpt +++ b/ext/standard/tests/array/arsort_object2.phpt @@ -91,7 +91,7 @@ echo "Done\n"; --EXPECTF-- *** Testing arsort() : object functionality *** -Fatal error: Uncaught exception 'Error' with message 'Class 'for_integer_asort' not found' in %sarsort_object2.php:%d +Fatal error: Uncaught EngineException: Class 'for_integer_asort' not found in %sarsort_object2.php:%d Stack trace: #0 {main} thrown in %sarsort_object2.php on line %d
\ No newline at end of file diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt index 3411c340ad..d7abc7773b 100644 --- a/ext/standard/tests/array/bug35821.phpt +++ b/ext/standard/tests/array/bug35821.phpt @@ -23,7 +23,7 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 %s(%d): Element->ThrowException() #1 [internal function]: Element::CallBack(Object(Element)) diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 625fd7c5cc..7934bb40f5 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -106,7 +106,7 @@ Warning: Missing argument 1 for VariableStream::__construct() in %s on line %d Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d -Fatal error: Uncaught exception 'Exception' with message 'constructor' in %s:%d +Fatal error: Uncaught Exception: constructor in %s:%d Stack trace: #0 [internal function]: VariableStream->__construct() #1 %s(%d): fopen('var://myvar', 'r+') diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index a452142384..0193d44d9f 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -104,4 +104,9 @@ echo "Done\n"; --EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d -Fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s:%d +Stack trace: +#0 [internal function]: VariableStream->__construct() +#1 %s(%d): fopen('var://myvar', 'r+') +#2 {main} + thrown in %s on line %d diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt index 54de8ba313..a2b0dac5e4 100644 --- a/ext/standard/tests/general_functions/bug47857.phpt +++ b/ext/standard/tests/general_functions/bug47857.phpt @@ -19,7 +19,7 @@ Deprecated: Non-static method foo::bar() should not be called statically in %sbu ok bool(false) -Fatal error: Uncaught exception 'Error' with message 'Non-static method Exception::getMessage() cannot be called statically' in %sbug47857.php:%d +Fatal error: Uncaught EngineException: Non-static method BaseException::getMessage() cannot be called statically in %sbug47857.php:%d Stack trace: #0 {main} thrown in %sbug47857.php on line %d diff --git a/ext/standard/tests/serialize/bug69152.phpt b/ext/standard/tests/serialize/bug69152.phpt index a91811a8a1..83d7ebfb52 100644 --- a/ext/standard/tests/serialize/bug69152.phpt +++ b/ext/standard/tests/serialize/bug69152.phpt @@ -2,10 +2,15 @@ Bug #69152: Type Confusion Infoleak Vulnerability in unserialize() --FILE-- <?php +$x = unserialize('O:9:"exception":1:{s:20:"'."\0".'BaseException'."\0".'trace";s:4:"ryat";}'); +echo $x; $x = unserialize('O:4:"test":1:{s:27:"__PHP_Incomplete_Class_Name";R:1;}'); $x->test(); ?> --EXPECTF-- +Exception in %s:%d +Stack trace: +#0 {main} Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line %d diff --git a/ext/tidy/tests/035.phpt b/ext/tidy/tests/035.phpt index d63e4a085c..8292755811 100644 --- a/ext/tidy/tests/035.phpt +++ b/ext/tidy/tests/035.phpt @@ -9,7 +9,7 @@ tidyNode::__construct() new tidyNode; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private tidyNode::__construct() from invalid context' in %s:%d +Fatal error: Uncaught EngineException: Call to private tidyNode::__construct() from invalid context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt index d3ce8c1f64..8748c1ff32 100644 --- a/ext/xmlreader/tests/bug51936.phpt +++ b/ext/xmlreader/tests/bug51936.phpt @@ -19,7 +19,7 @@ Done --EXPECTF-- Test -Fatal error: Uncaught exception 'Error' with message 'Trying to clone an uncloneable object of class XMLReader' in %s:%d +Fatal error: Uncaught EngineException: Trying to clone an uncloneable object of class XMLReader in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/ext/xsl/tests/bug49634.phpt b/ext/xsl/tests/bug49634.phpt index b009fd5fb8..61c39b488d 100644 --- a/ext/xsl/tests/bug49634.phpt +++ b/ext/xsl/tests/bug49634.phpt @@ -52,52 +52,52 @@ for ($i = 0; $i < 10; $i++) ?> ===DONE=== --EXPECTF-- -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) #2 {main} -exception 'Exception' with message 'Test exception.' in %s:%d +Exception: Test exception. in %s:%d Stack trace: #0 [internal function]: testFunction(Array) #1 %s(%d): XSLTProcessor->transformToDoc(Object(DOMDocument)) diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt index 854d27873b..1d4e719529 100644 --- a/sapi/cgi/tests/004.phpt +++ b/sapi/cgi/tests/004.phpt @@ -36,7 +36,7 @@ echo "Done\n"; --EXPECTF-- string(%d) " <br /> -<b>Fatal error</b>: Uncaught exception 'Error' with message 'Cannot access private property test::$pri' in %s004.test.php:8 +<b>Fatal error</b>: Uncaught EngineException: Cannot access private property test::$pri in %s004.test.php:8 Stack trace: #0 {main} thrown in <b>%s004.test.php</b> on line <b>8</b><br /> diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index e70f57bfc9..5037e1cfd4 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -36,7 +36,7 @@ echo "Done\n"; --EXPECTF-- string(%d) " -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property test::$pri' in %s:%d +Fatal error: Uncaught EngineException: Cannot access private property test::$pri in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt index e50e5c1b5c..0b13a195d5 100644 --- a/sapi/cli/tests/php_cli_server_015.phpt +++ b/sapi/cli/tests/php_cli_server_015.phpt @@ -46,7 +46,7 @@ X-Powered-By: PHP/%s Content-type: text/html; charset=UTF-8 <br /> -<b>Fatal error</b>: Uncaught exception 'Error' with message 'Call to undefined function non_exists_function()' in %ssyntax_error.php:%d +<b>Fatal error</b>: Uncaught EngineException: Call to undefined function non_exists_function() in %ssyntax_error.php:%d Stack trace: #0 %sindex.php(%d): require() #1 {main} diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt index 607db5e94a..d3d843ca86 100644 --- a/tests/basic/timeout_variation_6.phpt +++ b/tests/basic/timeout_variation_6.phpt @@ -22,7 +22,7 @@ f($t); never reached here --EXPECTF-- call -Fatal error: Uncaught exception 'Exception' with message 'exception before timeout' in %s:%d +Fatal error: Uncaught Exception: exception before timeout in %s:%d Stack trace: #0 %s(%d): f(%d) #1 {main} diff --git a/tests/classes/abstract.phpt b/tests/classes/abstract.phpt index 9dd800e80b..811aa45a13 100644 --- a/tests/classes/abstract.phpt +++ b/tests/classes/abstract.phpt @@ -27,7 +27,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call to function show() -Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method fail::show()' in %s:%d +Fatal error: Uncaught EngineException: Cannot call abstract method fail::show() in %s:%d Stack trace: #0 %s(%d): pass->error() #1 {main} diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt index aa84b3c562..1725d45762 100644 --- a/tests/classes/abstract_class.phpt +++ b/tests/classes/abstract_class.phpt @@ -26,7 +26,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call to function show() -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class fail' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt index 0b54bcf133..1657599787 100644 --- a/tests/classes/abstract_inherit.phpt +++ b/tests/classes/abstract_inherit.phpt @@ -19,7 +19,7 @@ echo "Done\n"; // Shouldn't be displayed ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class fail' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt index d04595335a..5118efda99 100644 --- a/tests/classes/abstract_user_call.phpt +++ b/tests/classes/abstract_user_call.phpt @@ -27,7 +27,7 @@ call_user_func(array($o, 'test_base::func')); --EXPECTF-- test::func() -Fatal error: Uncaught exception 'Error' with message 'Cannot call abstract method test_base::func()' in %s:%d +Fatal error: Uncaught EngineException: Cannot call abstract method test_base::func() in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt index 0405495721..ef8553493f 100644 --- a/tests/classes/array_access_012.phpt +++ b/tests/classes/array_access_012.phpt @@ -33,7 +33,7 @@ $data['element'] = &$test; Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24 -Fatal error: Uncaught exception 'Error' with message 'Cannot assign by reference to overloaded object' in %sarray_access_012.php:24 +Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %sarray_access_012.php:24 Stack trace: #0 {main} thrown in %sarray_access_012.php on line 24 diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index 7b7e88dd26..2af2d9adc4 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -14,7 +14,8 @@ Ensure type hints for unknown types do not trigger autoload. f(new stdClass); ?> --EXPECTF-- - -Fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s - - +Fatal error: Uncaught TypeException: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): f() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt index 844dbd1316..c3945ed4b3 100644 --- a/tests/classes/autoload_021.phpt +++ b/tests/classes/autoload_021.phpt @@ -10,7 +10,7 @@ $x = new $a; echo "BUG\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Class '../BUG' not found' in %sautoload_021.php:6 +Fatal error: Uncaught EngineException: Class '../BUG' not found in %sautoload_021.php:6 Stack trace: #0 {main} thrown in %sautoload_021.php on line 6 diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt index a32b65d9c5..1555f5343c 100644 --- a/tests/classes/bug27504.phpt +++ b/tests/classes/bug27504.phpt @@ -22,7 +22,7 @@ Called function foo:bar(1) Warning: call_user_func_array() expects parameter 1 to be a valid callback, cannot access private method foo::bar() in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index ca1a1dd5ce..04b21b5259 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -25,7 +25,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- base -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate abstract class base' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class base in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index ae2310ed7c..457584df32 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -86,7 +86,7 @@ string(6) "hello2" Expecting fatal error: -Fatal error: Uncaught exception 'Error' with message 'Undefined class constant 'c19'' in %s:53 +Fatal error: Uncaught EngineException: Undefined class constant 'c19' in %s:53 Stack trace: #0 {main} thrown in %s on line 53 diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt index dd218d1c5a..69383675a1 100644 --- a/tests/classes/ctor_visibility.phpt +++ b/tests/classes/ctor_visibility.phpt @@ -66,7 +66,7 @@ Test::__construct() TestPriv::__construct() DerivedPriv::__construct() -Fatal error: Uncaught exception 'Error' with message 'Cannot call private TestPriv::__construct()' in %sctor_visibility.php:%d +Fatal error: Uncaught EngineException: Cannot call private TestPriv::__construct() in %sctor_visibility.php:%d Stack trace: #0 %s(%d): DerivedPriv->__construct() #1 %s(%d): DerivedPriv::f() diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt index 4bcb4000c6..40a62f2ec4 100644 --- a/tests/classes/destructor_visibility_001.phpt +++ b/tests/classes/destructor_visibility_001.phpt @@ -21,7 +21,7 @@ unset($obj); ?> ===DONE=== --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private Derived::__destruct() from context ''' in %sdestructor_visibility_001.php:%d +Fatal error: Uncaught EngineException: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php:%d Stack trace: #0 {main} thrown in %sdestructor_visibility_001.php on line %d diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt index 1ad37994dd..272773c439 100644 --- a/tests/classes/factory_and_singleton_003.phpt +++ b/tests/classes/factory_and_singleton_003.phpt @@ -15,7 +15,7 @@ $obj = new test; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__construct() from invalid context' in %s:%d +Fatal error: Uncaught EngineException: Call to protected test::__construct() from invalid context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt index 9f473baf5b..89c4f161ea 100644 --- a/tests/classes/factory_and_singleton_004.phpt +++ b/tests/classes/factory_and_singleton_004.phpt @@ -15,7 +15,7 @@ $obj = new test; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private test::__construct() from invalid context' in %s:%d +Fatal error: Uncaught EngineException: Call to private test::__construct() from invalid context in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt index b8b1b69d76..e4911f086f 100644 --- a/tests/classes/factory_and_singleton_005.phpt +++ b/tests/classes/factory_and_singleton_005.phpt @@ -16,7 +16,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__destruct() from context ''' in %sfactory_and_singleton_005.php:%d +Fatal error: Uncaught EngineException: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php:%d Stack trace: #0 {main} thrown in %sfactory_and_singleton_005.php on line %d diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt index 1176917155..38b8ceb155 100644 --- a/tests/classes/factory_and_singleton_006.phpt +++ b/tests/classes/factory_and_singleton_006.phpt @@ -16,7 +16,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private test::__destruct() from context ''' in %sfactory_and_singleton_006.php:%d +Fatal error: Uncaught EngineException: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php:%d Stack trace: #0 {main} thrown in %sfactory_and_singleton_006.php on line %d diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt index 04b402a487..c86243bcfd 100644 --- a/tests/classes/factory_and_singleton_007.phpt +++ b/tests/classes/factory_and_singleton_007.phpt @@ -17,7 +17,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to protected test::__clone() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to protected test::__clone() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt index 624d6fbaa9..d6041b0105 100644 --- a/tests/classes/factory_and_singleton_008.phpt +++ b/tests/classes/factory_and_singleton_008.phpt @@ -17,7 +17,7 @@ $obj = NULL; echo "Done\n"; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Call to private test::__clone() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private test::__clone() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt index bc3a0236f2..310dc8800d 100644 --- a/tests/classes/interface_instantiate.phpt +++ b/tests/classes/interface_instantiate.phpt @@ -13,7 +13,7 @@ $t = new if_a(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Cannot instantiate interface if_a' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate interface if_a in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt index f95cbc1ef3..0ce8f9e320 100644 --- a/tests/classes/interfaces_003.phpt +++ b/tests/classes/interfaces_003.phpt @@ -23,4 +23,8 @@ $obj = new MyTestClass; ===DONE=== --EXPECTF-- -Fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php:%d +Stack trace: +#0 %s(%d): MyTestClass->__construct() +#1 {main} + thrown in %sinterfaces_003.php on line %d diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt index 2bedd6aced..11574ccde3 100644 --- a/tests/classes/private_001.phpt +++ b/tests/classes/private_001.phpt @@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt index 333c406cc1..664c95837f 100644 --- a/tests/classes/private_002.phpt +++ b/tests/classes/private_002.phpt @@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed Call pass::show() Call fail::show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail::show() #1 {main} diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt index d7d42ce1d3..ce18af196e 100644 --- a/tests/classes/private_003.phpt +++ b/tests/classes/private_003.phpt @@ -33,7 +33,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail::not_ok() #1 {main} diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt index 2b77d84c46..27f398d839 100644 --- a/tests/classes/private_003b.phpt +++ b/tests/classes/private_003b.phpt @@ -34,7 +34,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail->not_ok() #1 {main} diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt index 326c23da4f..7ebd72da3b 100644 --- a/tests/classes/private_004.phpt +++ b/tests/classes/private_004.phpt @@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail::do_show() #1 {main} diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt index 85ac9433e4..5bb9f05b15 100644 --- a/tests/classes/private_004b.phpt +++ b/tests/classes/private_004b.phpt @@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail->do_show() #1 {main} diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt index 41314d25af..acd9f825b5 100644 --- a/tests/classes/private_005.phpt +++ b/tests/classes/private_005.phpt @@ -29,7 +29,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail::do_show() #1 {main} diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt index 85ac9433e4..5bb9f05b15 100644 --- a/tests/classes/private_005b.phpt +++ b/tests/classes/private_005b.phpt @@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Uncaught exception 'Error' with message 'Call to private method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail->do_show() #1 {main} diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt index 75200b19e4..a1b3e459d7 100644 --- a/tests/classes/private_redeclare.phpt +++ b/tests/classes/private_redeclare.phpt @@ -35,7 +35,7 @@ test derived base -Fatal error: Uncaught exception 'Error' with message 'Call to private method base::show() from context 'derived'' in %s:%d +Fatal error: Uncaught EngineException: Call to private method base::show() from context 'derived' in %s:%d Stack trace: #0 %s(%d): derived->test() #1 {main} diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt index 019e406d0b..c392d077b5 100644 --- a/tests/classes/property_recreate_private.phpt +++ b/tests/classes/property_recreate_private.phpt @@ -78,7 +78,7 @@ object(C)#%d (1) { Unset a private property, and attempt to recreate at global scope (expecting failure): -Fatal error: Uncaught exception 'Error' with message 'Cannot access private property C::$p' in %s:46 +Fatal error: Uncaught EngineException: Cannot access private property C::$p in %s:46 Stack trace: #0 {main} thrown in %s on line 46 diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt index b3efedee79..d5f4b45791 100644 --- a/tests/classes/property_recreate_protected.phpt +++ b/tests/classes/property_recreate_protected.phpt @@ -50,7 +50,7 @@ object(D)#%d (1) { Unset a protected property, and attempt to recreate it outside of scope (expected failure): -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property %s::$p' in %s:32 +Fatal error: Uncaught EngineException: Cannot access protected property %s::$p in %s:32 Stack trace: #0 {main} thrown in %s on line 32 diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt index 8104e28a84..fe48ebe67b 100644 --- a/tests/classes/protected_001.phpt +++ b/tests/classes/protected_001.phpt @@ -23,7 +23,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call fail() -Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::fail() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt index 62ce61fef5..a1c69b9729 100644 --- a/tests/classes/protected_001b.phpt +++ b/tests/classes/protected_001b.phpt @@ -24,7 +24,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call fail() -Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::fail() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to protected method pass::fail() from context '' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt index c71d3bc214..e67c6b2f3d 100644 --- a/tests/classes/protected_002.phpt +++ b/tests/classes/protected_002.phpt @@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed Call pass::show() Call fail::show() -Fatal error: Uncaught exception 'Error' with message 'Call to protected method pass::show() from context 'fail'' in %s:%d +Fatal error: Uncaught EngineException: Call to protected method pass::show() from context 'fail' in %s:%d Stack trace: #0 %s(%d): fail::show() #1 {main} diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt index 4db201a52a..4b8efe2bf4 100644 --- a/tests/classes/static_properties_003_error1.phpt +++ b/tests/classes/static_properties_003_error1.phpt @@ -15,7 +15,7 @@ unset($c->y); --> Access non-visible static prop like instance prop: -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 Stack trace: #0 {main} thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt index abc57073e7..c43666fbb1 100644 --- a/tests/classes/static_properties_003_error2.phpt +++ b/tests/classes/static_properties_003_error2.phpt @@ -15,7 +15,7 @@ echo $c->y; --> Access non-visible static prop like instance prop: -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 Stack trace: #0 {main} thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt index 8fad30ff29..8cee25a5e6 100644 --- a/tests/classes/static_properties_003_error3.phpt +++ b/tests/classes/static_properties_003_error3.phpt @@ -15,7 +15,7 @@ $c->y = 1; --> Access non-visible static prop like instance prop: -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 Stack trace: #0 {main} thrown in %s on line 8 diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt index 22bf444c36..3b01351c7a 100644 --- a/tests/classes/static_properties_003_error4.phpt +++ b/tests/classes/static_properties_003_error4.phpt @@ -15,11 +15,11 @@ $c->y =& $ref; --> Access non-visible static prop like instance prop: -Fatal error: Uncaught exception 'Error' with message 'Cannot access protected property C::$y' in %s:8 +Fatal error: Uncaught EngineException: Cannot access protected property C::$y in %s:8 Stack trace: #0 {main} -Next exception 'Error' with message 'Cannot access protected property C::$y' in %s:8 +Next EngineException: Cannot access protected property C::$y in %s:8 Stack trace: #0 {main} thrown in %s on line 8 diff --git a/tests/classes/static_properties_undeclared_assign.phpt b/tests/classes/static_properties_undeclared_assign.phpt index 2c515f1b78..71859abce3 100644 --- a/tests/classes/static_properties_undeclared_assign.phpt +++ b/tests/classes/static_properties_undeclared_assign.phpt @@ -6,7 +6,7 @@ Class C {} C::$p = 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_assignInc.phpt b/tests/classes/static_properties_undeclared_assignInc.phpt index a53b9c52d2..3f73220de4 100644 --- a/tests/classes/static_properties_undeclared_assignInc.phpt +++ b/tests/classes/static_properties_undeclared_assignInc.phpt @@ -6,7 +6,7 @@ Class C {} C::$p += 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_assignRef.phpt b/tests/classes/static_properties_undeclared_assignRef.phpt index 20eda3d934..8d6b74e9f8 100644 --- a/tests/classes/static_properties_undeclared_assignRef.phpt +++ b/tests/classes/static_properties_undeclared_assignRef.phpt @@ -7,7 +7,7 @@ $a = 'foo'; C::$p =& $a; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:4 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:4 Stack trace: #0 {main} thrown in %s on line 4 diff --git a/tests/classes/static_properties_undeclared_inc.phpt b/tests/classes/static_properties_undeclared_inc.phpt index 273674a307..56f8606f36 100644 --- a/tests/classes/static_properties_undeclared_inc.phpt +++ b/tests/classes/static_properties_undeclared_inc.phpt @@ -6,7 +6,7 @@ Class C {} C::$p++; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/tests/classes/static_properties_undeclared_read.phpt b/tests/classes/static_properties_undeclared_read.phpt index e6ac05a90d..658bc049ab 100644 --- a/tests/classes/static_properties_undeclared_read.phpt +++ b/tests/classes/static_properties_undeclared_read.phpt @@ -6,7 +6,7 @@ Class C {} echo C::$p; ?> --EXPECTF-- -Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: C::$p' in %s:3 +Fatal error: Uncaught EngineException: Access to undeclared static property: C::$p in %s:3 Stack trace: #0 {main} thrown in %s on line 3 diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt index 5479a4c193..393f157167 100644 --- a/tests/classes/type_hinting_001.phpt +++ b/tests/classes/type_hinting_001.phpt @@ -35,4 +35,8 @@ $a->b($b); ?> --EXPECTF-- -Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12 +Fatal error: Uncaught TypeException: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s:12 +Stack trace: +#0 %s(%d): FooBar->a() +#1 {main} + thrown in %s on line 12 diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt index 7c0581624b..1ebceb4549 100644 --- a/tests/classes/type_hinting_002.phpt +++ b/tests/classes/type_hinting_002.phpt @@ -13,4 +13,8 @@ $o = new Foo; $o->a($o); ?> --EXPECTF-- -Fatal error: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): Foo->a() +#1 {main} + thrown in %s on line %d diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt index fbfe0cefeb..d8734b1136 100644 --- a/tests/classes/type_hinting_003.phpt +++ b/tests/classes/type_hinting_003.phpt @@ -57,4 +57,8 @@ array(1) { int(25) } -Fatal error: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d +Stack trace: +#0 %s(%d): Test::f1() +#1 {main} + thrown in %s on line %d diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt index eef75bdb3f..5e88569a32 100644 --- a/tests/lang/041.phpt +++ b/tests/lang/041.phpt @@ -17,7 +17,7 @@ echo $wrongClassname::$b."\n"; --EXPECTF-- foo -Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s041.php:%d +Fatal error: Uncaught EngineException: Class 'B' not found in %s041.php:%d Stack trace: #0 {main} thrown in %s041.php on line %d diff --git a/tests/lang/042.phpt b/tests/lang/042.phpt index 6e6ae419b2..bdf7c018fd 100644 --- a/tests/lang/042.phpt +++ b/tests/lang/042.phpt @@ -16,7 +16,7 @@ echo $wrongClassname::B."\n"; --EXPECTF-- foo -Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s042.php:%d +Fatal error: Uncaught EngineException: Class 'B' not found in %s042.php:%d Stack trace: #0 {main} thrown in %s042.php on line %d diff --git a/tests/lang/043.phpt b/tests/lang/043.phpt index 444cc23be6..58457bbce3 100644 --- a/tests/lang/043.phpt +++ b/tests/lang/043.phpt @@ -16,7 +16,7 @@ echo $wrongClassname::foo()."\n"; --EXPECTF-- foo -Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s043.php:%d +Fatal error: Uncaught EngineException: Class 'B' not found in %s043.php:%d Stack trace: #0 {main} thrown in %s043.php on line %d diff --git a/tests/lang/044.phpt b/tests/lang/044.phpt index 87255061ba..2e0479baee 100644 --- a/tests/lang/044.phpt +++ b/tests/lang/044.phpt @@ -18,7 +18,7 @@ echo $wrongClassname::$methodname()."\n"; --EXPECTF-- foo -Fatal error: Uncaught exception 'Error' with message 'Class 'B' not found' in %s044.php:%d +Fatal error: Uncaught EngineException: Class 'B' not found in %s044.php:%d Stack trace: #0 {main} thrown in %s044.php on line %d diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt index 635eb8cd0c..236d8ed394 100644 --- a/tests/lang/bug24658.phpt +++ b/tests/lang/bug24658.phpt @@ -53,4 +53,9 @@ int(2) object(foo)#%d (0) { } -Fatal error: Argument 1 passed to typehint() must be an instance of foo, integer given in %s on line %d +Fatal error: Uncaught TypeException: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d +Stack trace: +#0 [internal function]: typehint(1) +#1 %s(%d): array_walk(Array, 'typehint') +#2 {main} + thrown in %s on line %d diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt index ad59646f50..4abf21604f 100644 --- a/tests/lang/bug32828.phpt +++ b/tests/lang/bug32828.phpt @@ -13,7 +13,7 @@ ob_start('output_handler'); ob_end_clean(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'Exception' in %s:%d +Fatal error: Uncaught Exception in %s:%d Stack trace: #0 [internal function]: output_handler('', %d) #1 %s(%d): ob_end_clean() diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt index e3e3692440..f58b26e847 100644 --- a/tests/lang/catchable_error_001.phpt +++ b/tests/lang/catchable_error_001.phpt @@ -19,4 +19,8 @@ Catchable fatal error [1] echo "ALIVE!\n"; ?> --EXPECTF-- -Fatal error: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5 +Fatal error: Uncaught TypeException: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php:5 +Stack trace: +#0 %s(%d): blah() +#1 {main} + thrown in %scatchable_error_001.php on line 5 diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt index 113d7c1ac2..38b8fd66d7 100644 --- a/tests/lang/foreachLoopIterator.002.phpt +++ b/tests/lang/foreachLoopIterator.002.phpt @@ -21,7 +21,7 @@ foreach ($f as $k=>&$v) { --EXPECTF-- -----( Try to iterate with &$value: )----- -Fatal error: Uncaught exception 'Error' with message 'An iterator cannot be used with foreach by reference' in %s:13 +Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:13 Stack trace: #0 {main} thrown in %s on line 13 diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt index 48004ba97f..71ef9f30c3 100644 --- a/tests/lang/type_hints_001.phpt +++ b/tests/lang/type_hints_001.phpt @@ -23,4 +23,8 @@ type_hint_foo($bar); ?> --EXPECTF-- -Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s on line 9 +Fatal error: Uncaught TypeException: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s:9 +Stack trace: +#0 %s(%d): type_hint_foo() +#1 {main} + thrown in %s on line 9 |