diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2015-05-16 16:49:14 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2015-05-16 16:49:14 -0500 |
| commit | 64b167d201e567ec213b5aa37c66536621835331 (patch) | |
| tree | 272d6f3951625ef7bc82eba08bad64aef9b883d2 /Zend/tests | |
| parent | d042d0880796cfe99262bb6fa44225e984c63ace (diff) | |
| download | php-git-64b167d201e567ec213b5aa37c66536621835331.tar.gz | |
Updated tests to reflect exception class changes.
Diffstat (limited to 'Zend/tests')
173 files changed, 230 insertions, 230 deletions
diff --git a/Zend/tests/028.phpt b/Zend/tests/028.phpt index 810c091a87..701561f9c8 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 'EngineException' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Function name must be a string' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt index cff21d4935..8afcb66bd8 100644 --- a/Zend/tests/030.phpt +++ b/Zend/tests/030.phpt @@ -34,7 +34,7 @@ $test->bar(); object(Exception)#%d (7) { ["message":protected]=> string(3) "foo" - ["string":"BaseException":private]=> + ["string":"Exception":private]=> string(0) "" ["code":protected]=> int(0) @@ -42,7 +42,7 @@ object(Exception)#%d (7) { string(%d) "%s030.php" ["line":protected]=> int(%d) - ["trace":"BaseException":private]=> + ["trace":"Exception":private]=> array(1) { [0]=> array(6) { @@ -61,7 +61,7 @@ object(Exception)#%d (7) { } } } - ["previous":"BaseException":private]=> + ["previous":"Exception":private]=> NULL } 'test' => '0' diff --git a/Zend/tests/037.phpt b/Zend/tests/037.phpt index bda491d7e6..ca96f867c0 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 'EngineException' with message 'Access to undeclared static property: Closure::$x' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 5fd65e5bef..07a1b594de 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 'EngineException' with message 'Call to private method d::test2() from context 'a'' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 a242f7543e..5d35f55723 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 (EngineException $e) { +} catch (Error $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 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 4023e24c2a..6921d72651 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 (EngineException $e) { +} catch (Error $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 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 b0a10f82f3..c0c390faef 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -19,7 +19,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 455f664dfa..562dd3e642 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -21,7 +21,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/arg_unpack/string_keys.phpt b/Zend/tests/arg_unpack/string_keys.phpt index 51db52e146..e448a417f6 100644 --- a/Zend/tests/arg_unpack/string_keys.phpt +++ b/Zend/tests/arg_unpack/string_keys.phpt @@ -9,12 +9,12 @@ set_error_handler(function($errno, $errstr) { try { var_dump(...[1, 2, "foo" => 3, 4]); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); } try { var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4])); -} catch (EngineException $ex) { +} catch (Error $ex) { var_dump($ex->getMessage()); } diff --git a/Zend/tests/bug24773.phpt b/Zend/tests/bug24773.phpt index ea08f84c26..a87ab2ebce 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 'EngineException' with message 'Cannot use string offset as an array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/bug26166.phpt b/Zend/tests/bug26166.phpt index 60624ed98e..9e31efa442 100644 --- a/Zend/tests/bug26166.phpt +++ b/Zend/tests/bug26166.phpt @@ -37,25 +37,25 @@ function my_error_handler($errno, $errstr, $errfile, $errline) { set_error_handler('my_error_handler'); -class None +class NoneTest { function __toString() { } } -$o = new None; +$o = new NoneTest; echo $o; echo "===THROW===\n"; -class Error +class ErrorTest { function __toString() { throw new Exception("This is an error!"); } } -$o = new Error; +$o = new ErrorTest; try { echo $o; } @@ -68,7 +68,7 @@ catch (Exception $e) { --EXPECTF-- Hello World! ===NONE=== -string(52) "Method None::__toString() must return a string value" +string(56) "Method NoneTest::__toString() must return a string value" ===THROW=== -Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d +Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d diff --git a/Zend/tests/bug29015.phpt b/Zend/tests/bug29015.phpt index f5a4e0ac41..19c9206fe2 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 'EngineException' with message 'Cannot access empty property' in %sbug29015.php:4 +Fatal error: Uncaught exception 'Error' with message '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 f94c2290b4..ed0cee6eb9 100644 --- a/Zend/tests/bug29674.phpt +++ b/Zend/tests/bug29674.phpt @@ -38,7 +38,7 @@ NULL ===CHILD=== string(4) "Base" -Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property ChildClass::$private_child' in %sbug29674.php:%d +Fatal error: Uncaught exception 'Error' with message '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 0dbfd5a34f..aaff58d07e 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 'EngineException' with message 'Class 'Test3' not found' in %sbug31102.php(%d) : eval()'d code:1 +Fatal error: Uncaught exception 'Error' with message '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 d99e2f8e14..d3c1bf841c 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 'EngineException' with message 'Cannot assign by reference to overloaded object' in %sbug32660.php:23 +Fatal error: Uncaught exception 'Error' with message '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 4abb90866f..96c60d65d7 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 'EngineException' with message 'Can only throw objects' in %sbug33318.php:2 +Fatal error: Uncaught exception 'Error' with message '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/bug34064.phpt b/Zend/tests/bug34064.phpt index 91ee3e6f81..bc4ba20e8d 100644 --- a/Zend/tests/bug34064.phpt +++ b/Zend/tests/bug34064.phpt @@ -31,7 +31,7 @@ array(1) { string(2) "ok" } -Fatal error: Uncaught exception 'EngineException' with message 'Cannot use [] for reading' in %sbug34064.php:18 +Fatal error: Uncaught exception 'Error' with message '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 918cea83b2..7826e58423 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 'EngineException' with message '__clone method called on non-object' in %sbug36071.php:2 +Fatal error: Uncaught exception 'Error' with message '__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 ad652ce015..0bb3910ce8 100644 --- a/Zend/tests/bug36268.phpt +++ b/Zend/tests/bug36268.phpt @@ -11,7 +11,7 @@ $x = new Foo(); bar(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined function bar()' in %sbug36268.php:8 +Fatal error: Uncaught exception 'Error' with message '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/bug37251.phpt b/Zend/tests/bug37251.phpt index 2b545a530f..12d1e3d974 100644 --- a/Zend/tests/bug37251.phpt +++ b/Zend/tests/bug37251.phpt @@ -10,7 +10,7 @@ class Foo { try { $foo = new Foo(); $foo->bar(); -} catch (EngineException $e) { +} catch (Error $e) { echo 'OK'; } --EXPECT-- diff --git a/Zend/tests/bug37632.phpt b/Zend/tests/bug37632.phpt index 974471ffd3..1c6b43567c 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 'EngineException' with message 'Call to protected C4::__construct() from context 'B4'' in %sbug37632.php:%d +Fatal error: Uncaught exception 'Error' with message '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/bug40621.phpt b/Zend/tests/bug40621.phpt index 3180c8c921..04b76c5f69 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 'EngineException' with message 'Non-static method Foo::__construct() cannot be called statically' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/bug41633_2.phpt b/Zend/tests/bug41633_2.phpt index d64092c691..ea122d7c48 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 'EngineException' with message 'Undefined class constant 'self::B'' in %sbug41633_2.php:5 +Fatal error: Uncaught exception 'Error' with message '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 bf0e95db81..3750926742 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 'EngineException' with message 'Cannot declare self-referencing constant 'Foo::B'' in %sbug41633_3.php:%d +Fatal error: Uncaught exception 'Error' with message '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 5c52051692..27d616399d 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 'EngineException' with message 'Cannot use string offset as an array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 4b872b4867..6ac89ffd4d 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 'EngineException' with message 'Cannot use string offset as an object' in %sbug41919.php:%d +Fatal error: Uncaught exception 'Error' with message '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/bug42817.phpt b/Zend/tests/bug42817.phpt index 46d01170a7..ea20999c21 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 'EngineException' with message '__clone method called on non-object' in %sbug42817.php:2 +Fatal error: Uncaught exception 'Error' with message '__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 ea83ced5fc..0795abbad7 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 'EngineException' with message '__clone method called on non-object' in %sbug42818.php:2 +Fatal error: Uncaught exception 'Error' with message '__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 e6bdba715b..20a182e100 100644 --- a/Zend/tests/bug42819.phpt +++ b/Zend/tests/bug42819.phpt @@ -299,7 +299,7 @@ Array [1] => 1 ) -Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'foo\foo\unknown'' in %sbug42819.php:%d +Fatal error: Uncaught exception 'Error' with message '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 53e6fe7f49..6de7aef137 100644 --- a/Zend/tests/bug42937.phpt +++ b/Zend/tests/bug42937.phpt @@ -39,7 +39,7 @@ test3 test4 test5 -Fatal error: Uncaught exception 'EngineException' with message 'Call to undefined method C::test6()' in %sbug42937.php:21 +Fatal error: Uncaught exception 'Error' with message 'Call to undefined method C::test6()' in %sbug42937.php:21 Stack trace: #0 %s(%d): B->test() #1 {main} diff --git a/Zend/tests/bug43344_10.phpt b/Zend/tests/bug43344_10.phpt index 67508d0d69..439199fd72 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 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_10.php:%d +Fatal error: Uncaught exception 'Error' with message '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 d7c51e6361..cfbaa62cd3 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 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_11.php:%d +Fatal error: Uncaught exception 'Error' with message '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 1d14d4b40b..7cf1c915bb 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 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_12.php:%d +Fatal error: Uncaught exception 'Error' with message '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 83d79864d1..4a7b57de60 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 'EngineException' with message 'Undefined constant 'bar'' in %sbug43344_13.php:%d +Fatal error: Uncaught exception 'Error' with message '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 094672f3d1..05a379956d 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 'EngineException' with message 'Class 'Foo\Foo' not found' in %sbug43344_2.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ef9eb58867..b14edbadb6 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 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_6.php:%d +Fatal error: Uncaught exception 'Error' with message '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 661e93aea8..6b5b914e34 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 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_7.php:%d +Fatal error: Uncaught exception 'Error' with message '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 14aeb7d8af..2d8b8b0421 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 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_8.php:%d +Fatal error: Uncaught exception 'Error' with message '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 0642dc545a..533db85b53 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 'EngineException' with message 'Undefined constant 'Foo\bar'' in %sbug43344_9.php:%d +Fatal error: Uncaught exception 'Error' with message '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 aa0ae7ed4b..d3fe17b35d 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 'EngineException' with message 'Call to private X::__construct() from context 'Y'' in %sbug44141.php:15 +Fatal error: Uncaught exception 'Error' with message '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/bug46304.phpt b/Zend/tests/bug46304.phpt index 43f28775e5..e14ec7af4d 100644 --- a/Zend/tests/bug46304.phpt +++ b/Zend/tests/bug46304.phpt @@ -62,7 +62,7 @@ value6 value6 value6 -Fatal error: Uncaught exception 'EngineException' with message 'Undefined constant 'NS1\ns2\coNSt1'' in %sbug46304.php:%d +Fatal error: Uncaught exception 'Error' with message '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 c6484a00f5..f617ebca61 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 'EngineException' with message 'Non-static method ArrayIterator::current() cannot be called statically' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 378cae9ba5..fdbff823a2 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 'EngineException' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 6e96c5bb31..3291e58735 100644 --- a/Zend/tests/bug47699.phpt +++ b/Zend/tests/bug47699.phpt @@ -15,7 +15,7 @@ new X(); ?> --EXPECTF-- BB -Fatal error: Uncaught exception 'EngineException' with message 'Class 'X' not found' in %sbug47699.php:%d +Fatal error: Uncaught exception 'Error' with message '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 db51d9eb20..e2e6ceb959 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 'EngineException' with message 'Cannot use string offset as an object' in %sbug47704.php:%d +Fatal error: Uncaught exception 'Error' with message '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 aac5bfd5e2..7db4b9c492 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 'EngineException' with message 'Call to undefined method b::b()' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Call to undefined method b::b()' in %s:%d Stack trace: #0 %s(%d): c->__construct() #1 {main} diff --git a/Zend/tests/bug48693.phpt b/Zend/tests/bug48693.phpt index d2baf2a695..cb6beb3a3d 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 (ParseException $e) { +} catch (ParseError $e) { echo "$e\n\n"; } try { $y = create_function('', 'function a() { }; return 2;'); -} catch (ParseException $e) { +} catch (ParseError $e) { echo "$e\n\n"; } try { $z = create_function('', '{'); -} catch (ParseException $e) { +} catch (ParseError $e) { echo "$e\n\n"; } try { $w = create_function('', 'return 3;'); -} catch (ParseException $e) { +} catch (ParseError $e) { echo "$e\n\n"; } @@ -31,12 +31,12 @@ var_dump( ?> --EXPECTF-- -exception 'ParseException' with message 'syntax error, unexpected '}', expecting end of file' in %sbug48693.php(4) : runtime-created function:1 +exception 'ParseError' with message '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 'ParseException' with message 'syntax error, unexpected end of file' in %sbug48693.php(14) : runtime-created function:1 +exception 'ParseError' with message '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 047a162953..28198e0e60 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 'EngineException' with message 'Cannot create references to/from string offsets nor overloaded objects' in %sbug49866.php:3 +Fatal error: Uncaught exception 'Error' with message '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/bug50146.phpt b/Zend/tests/bug50146.phpt index f6cdb796dd..f5871f726d 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 'EngineException' with message 'Closure object cannot have properties' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Closure object cannot have properties' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/bug52484.phpt index bf9d494aaa..6f053775c7 100644 --- a/Zend/tests/bug52484.phpt +++ b/Zend/tests/bug52484.phpt @@ -16,7 +16,7 @@ unset($a->$prop); ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 3ffb2af3e9..fa0e3fa0b2 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 'EngineException' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 877b45d9e3..d5518f9508 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 'EngineException' with message 'Cannot access empty property' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Cannot access empty property' in %s:%d Stack trace: #0 %s(%d): A->__get('') #1 {main} diff --git a/Zend/tests/bug61025.phpt b/Zend/tests/bug61025.phpt index 69f64d61e8..eb541bd7c4 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 'EngineException' with message 'Call to private method Bar::__invoke() from context ''' in %sbug61025.php:%d +Fatal error: Uncaught exception 'Error' with message '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/bug63111.phpt b/Zend/tests/bug63111.phpt index 92b3a5e93a..01550cf158 100644 --- a/Zend/tests/bug63111.phpt +++ b/Zend/tests/bug63111.phpt @@ -31,7 +31,7 @@ bool(true) bool(true) ok -Fatal error: Uncaught exception 'EngineException' with message 'Cannot call abstract method Foo::bar()' in %sbug63111.php:20 +Fatal error: Uncaught exception 'Error' with message '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 34d3d6e7d7..99fb04199d 100644 --- a/Zend/tests/bug63173.phpt +++ b/Zend/tests/bug63173.phpt @@ -9,7 +9,7 @@ $callback(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Array callback has to contain indices 0 and 1' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/bug64135.phpt b/Zend/tests/bug64135.phpt index 53bcba1d0d..e4be3e0c64 100644 --- a/Zend/tests/bug64135.phpt +++ b/Zend/tests/bug64135.phpt @@ -10,7 +10,7 @@ function exception_error_handler() { set_error_handler("exception_error_handler"); try { $undefined->undefined(); -} catch(BaseException $e) { +} catch(Throwable $e) { echo "Exception is thrown"; } --EXPECT-- diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt index fd71d6bdd6..894c93c55c 100644 --- a/Zend/tests/bug64720.phpt +++ b/Zend/tests/bug64720.phpt @@ -22,7 +22,7 @@ class Foo { } } -class Error { +class ErrorTest { private $trace; public function __construct() { $this->trace = debug_backtrace(1); @@ -32,11 +32,11 @@ class Error { class Bar { public function __destruct() { Stat::getInstance(); - new Error(); + new ErrorTest(); } public function test() { - new Error(); + new ErrorTest(); } } @@ -45,7 +45,7 @@ $bar = new Bar(); $bar->test(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: Stat::$requests' in %sbug64720.php:12 +Fatal error: Uncaught exception 'Error' with message '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/bug64966.phpt b/Zend/tests/bug64966.phpt index 931460ba60..f533093e60 100644 --- a/Zend/tests/bug64966.phpt +++ b/Zend/tests/bug64966.phpt @@ -5,7 +5,7 @@ Bug #64966 (segfault in zend_do_fcall_common_helper_SPEC) function test($func) { try { $a = $func(""); - } catch (EngineException $e) { + } catch (Error $e) { throw new Exception(); } return true; diff --git a/Zend/tests/bug65784.phpt b/Zend/tests/bug65784.phpt index 2f80e93b35..5f363fc38c 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 'EngineException' with message 'Class 'NotExists' not found' in %sbug65784.php:%d +Fatal error: Uncaught exception 'Error' with message '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 470d45f1f5..c9b5eef09d 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 'EngineException' with message 'Access to undeclared static property: A::$this' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Access to undeclared static property: A::$this' in %s:%d Stack trace: #0 %s(%d): B->go() #1 {main} diff --git a/Zend/tests/bug68475.phpt b/Zend/tests/bug68475.phpt index 351edb2e94..1bf74f2603 100644 --- a/Zend/tests/bug68475.phpt +++ b/Zend/tests/bug68475.phpt @@ -36,7 +36,7 @@ $callback(...$args); $callback = 'TestClass::undefinedMethod'; try { $callback(); -} catch (EngineException $e) { +} catch (Error $e) { echo $e->getMessage() . "\n"; } @@ -44,7 +44,7 @@ try { $callback = 'UndefinedClass::testMethod'; try { $callback(); -} catch (EngineException $e) { +} catch (Error $e) { echo $e->getMessage() . "\n"; } ?> diff --git a/Zend/tests/bug68652.phpt b/Zend/tests/bug68652.phpt index e96a263aaa..054e5e3f4c 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 'EngineException' with message 'Access to undeclared static property: Bar::$instance' in %sbug68652.php:%d +Fatal error: Uncaught exception 'Error' with message '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/call_static_004.phpt b/Zend/tests/call_static_004.phpt index 09d28dd371..c2f36e0f35 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 'EngineException' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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_005.phpt b/Zend/tests/call_static_005.phpt index 273fc74a80..3b8d3465f6 100644 --- a/Zend/tests/call_static_005.phpt +++ b/Zend/tests/call_static_005.phpt @@ -12,7 +12,7 @@ class foo { try { $a = 'foo::'; $a(); -} catch (EngineException $e) { +} catch (Error $e) { echo $e->getMessage(); } diff --git a/Zend/tests/call_static_006.phpt b/Zend/tests/call_static_006.phpt index 723c65747d..69e3e2425f 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 'EngineException' with message 'Cannot call constructor' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 cc675cc400..f7713950f0 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 'EngineException' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 b294b01ac9..4182654dd9 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 'EngineException' with message 'Cannot instantiate abstract class foo' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8bb1026eaf..085abef20f 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 'EngineException' with message 'Class 'foo\foo' not found' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 a29f90c77d..f7a30a597e 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 'EngineException' with message 'Class 'foo\bar' not found' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8eebc58bda..89d0a01538 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 'EngineException' with message 'Undefined class constant 'val3'' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 32524d11f9..8dae871978 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 'EngineException' with message 'Cannot use "static" when no class scope is active' in %s:3 +Fatal error: Uncaught exception 'Error' with message '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 954ab2e23b..cc62713fbd 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 'EngineException' with message 'Cannot use "parent" when no class scope is active' in %s:3 +Fatal error: Uncaught exception 'Error' with message '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 fac2dbeb22..5b51a30409 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 'EngineException' with message 'Cannot use "self" when no class scope is active' in %s:3 +Fatal error: Uncaught exception 'Error' with message '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 9f147f9e35..08cf1df061 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 'EngineException' with message '__clone method called on non-object' in %s:%d +Fatal error: Uncaught exception 'Error' with message '__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 4a97c565b1..6656026d64 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 'EngineException' with message '__clone method called on non-object' in %s:%d +Fatal error: Uncaught exception 'Error' with message '__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 10b18fbc54..1e09902e93 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 'EngineException' with message 'Cannot use object of type foo as array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 0143ac173c..9c84115581 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 'EngineException' with message 'Using $this when not in object context' in %sclosure_005.php:28 +Fatal error: Uncaught exception 'Error' with message '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 682c7db634..c46db6b80b 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 'EngineException' with message 'Cannot pass parameter 1 by reference' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 edc9659ca1..ad88d28cb5 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 'EngineException' with message 'Cannot access private property foo::$test' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 55f1ff5a8d..70cc74177f 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 'EngineException' with message 'Closure object cannot have properties' in %sclosure_022.php:5 +Fatal error: Uncaught exception 'Error' with message '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_031.phpt b/Zend/tests/closure_031.phpt index 6b4586e8b0..241ddb42cd 100644 --- a/Zend/tests/closure_031.phpt +++ b/Zend/tests/closure_031.phpt @@ -10,7 +10,7 @@ $foo = function() { }; try { var_dump($foo->a); -} catch (EngineException $ex) { +} catch (Error $ex) { echo "Error: {$ex->getMessage()}\n"; } ?> diff --git a/Zend/tests/closure_033.phpt b/Zend/tests/closure_033.phpt index bc7eb88b2f..39b213ddf1 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 'EngineException' with message 'Call to private method Test::func() from context ''' in %sclosure_033.php:%d +Fatal error: Uncaught exception 'Error' with message '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 b1e9406872..6b9acfef69 100644 --- a/Zend/tests/closure_038.phpt +++ b/Zend/tests/closure_038.phpt @@ -55,17 +55,17 @@ Testing with scope as string int(23) int(24) -Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Cannot access private property B::$x' in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Next exception 'Error' with message 'Cannot access private property B::$x' in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Next exception 'Error' with message '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 9e5ecbd21b..e8f7f820b0 100644 --- a/Zend/tests/closure_039.phpt +++ b/Zend/tests/closure_039.phpt @@ -55,17 +55,17 @@ Testing with scope as string int(23) int(24) -Fatal error: Uncaught exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Cannot access private property B::$x' in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Next exception 'Error' with message 'Cannot access private property B::$x' in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} -Next exception 'EngineException' with message 'Cannot access private property B::$x' in %s:%d +Next exception 'Error' with message 'Cannot access private property B::$x' in %s:%d Stack trace: #0 %s(%d): Closure->{closure}() #1 {main} diff --git a/Zend/tests/closure_059.phpt b/Zend/tests/closure_059.phpt index de9c574746..1ee7fe6695 100644 --- a/Zend/tests/closure_059.phpt +++ b/Zend/tests/closure_059.phpt @@ -19,17 +19,17 @@ call_user_func(array($f,"__invoke"), $a); try { $f($b); -} catch (EngineException $e) { +} catch (Error $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { $f->__invoke($b); -} catch (EngineException $e) { +} catch (Error $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { call_user_func(array($f,"__invoke"), $b); -} catch (EngineException $e) { +} catch (Error $e) { echo "Exception: " . $e->getMessage() . "\n"; } --EXPECTF-- diff --git a/Zend/tests/constant_expressions_exceptions_002.phpt b/Zend/tests/constant_expressions_exceptions_002.phpt index 3259483197..fc15af5e9a 100644 --- a/Zend/tests/constant_expressions_exceptions_002.phpt +++ b/Zend/tests/constant_expressions_exceptions_002.phpt @@ -4,7 +4,7 @@ Constant Expressions with unsupported operands 002 <?php try { require("constant_expressions_exceptions.inc"); -} catch (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } ?> diff --git a/Zend/tests/constant_expressions_invalid_offset_type_error.phpt b/Zend/tests/constant_expressions_invalid_offset_type_error.phpt index ded692c2c4..d3b38fd035 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 'EngineException' with message 'Illegal offset type' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 6820f47ded..c31b5d47b8 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 'EngineException' with message 'Cannot declare self-referencing constant 'self::FOO'' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/dereference_002.phpt b/Zend/tests/dereference_002.phpt index 4d8d9c9942..c7ac94ab7a 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 'EngineException' with message 'Call to a member function bar() on null' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 16c76eb777..a20288a687 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 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 6a7794fa46..9f8b6c9a31 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 5a1025cfa7..44df985e64 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 'EngineException' with message 'Non-static method foo::foo() cannot be called statically' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 c8fad52241..a323d34a57 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 'EngineException' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 7d5e3e5507..17d54da9e9 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 'EngineException' with message 'Function name must be a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 056adfc16b..9092492311 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 'EngineException' with message 'Class name must be a valid object or a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 50234f89c6..af7ec49fac 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 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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_004.phpt b/Zend/tests/exception_004.phpt index cc9990c386..0bcfc13042 100644 --- a/Zend/tests/exception_004.phpt +++ b/Zend/tests/exception_004.phpt @@ -15,7 +15,7 @@ try { ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Exceptions must be valid objects derived from the Exception base class' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Exceptions must be valid objects implementing Throwable' 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 e52b907ac3..032923392e 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 'EngineException' with message 'Cannot instantiate interface a' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 fb131b5de4..ac68c104d6 100644 --- a/Zend/tests/exception_006.phpt +++ b/Zend/tests/exception_006.phpt @@ -7,7 +7,7 @@ throw 1; ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Can only throw objects' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Can only throw objects' in %s:%d Stack trace: #0 {main} thrown in %s on line %d diff --git a/Zend/tests/exception_010.phpt b/Zend/tests/exception_010.phpt index d67cddab58..6bff8c6e5e 100644 --- a/Zend/tests/exception_010.phpt +++ b/Zend/tests/exception_010.phpt @@ -15,16 +15,16 @@ $x->getcode(1); ?> --EXPECTF-- -Warning: BaseException::getTraceAsString() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getTraceAsString() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::__toString() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::__toString() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::getTrace() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getTrace() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::getLine() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getLine() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::getFile() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getFile() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::getMessage() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getMessage() expects exactly 0 parameters, 1 given in %s on line %d -Warning: BaseException::getCode() expects exactly 0 parameters, 1 given in %s on line %d +Warning: Exception::getCode() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/Zend/tests/exception_013.phpt b/Zend/tests/exception_013.phpt index 4bbfc32050..748e354bb3 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { var_dump(C::$p); -} catch (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { unset(C::$a); -} catch (EngineException $e) { +} catch (Error $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 'EngineException' with message 'Access to undeclared static property: C::$a' in %sexception_013.php:24 +Fatal error: Uncaught exception 'Error' with message '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 c1f8615926..cee08e1d58 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 (EngineException $e) { +} catch (Error $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 'EngineException' with message 'Cannot access private property C::$p' in %sexception_014.php:%d +Fatal error: Uncaught exception 'Error' with message '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 f4db02aa40..c94bd3a467 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 (EngineException $e) { +} catch (Error $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 'EngineException' with message '[] operator not supported for strings' in %sexception_015.php:%d +Fatal error: Uncaught exception 'Error' with message '[] 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 f4ad66855b..0c0470b8d9 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 (EngineException $e) { +} catch (Error $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 'EngineException' with message 'Using $this when not in object context' in %sexception_016.php:%d +Fatal error: Uncaught exception 'Error' with message '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 5a5cca7488..b81664ceae 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . " in " , $e->getFile() . " on line " . $e->getLine() . "\n"; } try { foo("C::foo"); -} catch (EngineException $e) { +} catch (Error $e) { echo "\n"; do { echo "Exception: " . $e->getMessage() . "\n"; $e = $e->getPrevious(); - } while ($e instanceof EngineException); + } while ($e instanceof Error); } 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 'EngineException' with message 'Cannot call abstract method C::foo()' in %sexception_017.php:%d +Fatal error: Uncaught exception 'Error' with message '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_before_fatal.phpt b/Zend/tests/exception_before_fatal.phpt index 1109097e1f..7a1399fb7a 100644 --- a/Zend/tests/exception_before_fatal.phpt +++ b/Zend/tests/exception_before_fatal.phpt @@ -10,38 +10,38 @@ set_error_handler("exception_error_handler"); try { $foo->a(); -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } try { new $foo(); -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } try { throw $foo; -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } try { $foo(); -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } try { $foo::b(); -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } try { $b = clone $foo; -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } @@ -50,7 +50,7 @@ class b { try { b::$foo(); -} catch(BaseException $e) { +} catch(Throwable $e) { var_dump($e->getMessage()); } ?> diff --git a/Zend/tests/generators/bug63066.phpt b/Zend/tests/generators/bug63066.phpt index 439b1f5a64..c00e6d481e 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 'EngineException' with message 'Call to undefined method stdClass::fatalError()' in %sbug63066.php:5 +Fatal error: Uncaught exception 'Error' with message '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 104462fd22..c11a1730a5 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 'EngineException' with message 'Call to undefined function foo()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/bug67497.phpt b/Zend/tests/generators/bug67497.phpt index 63e535d331..edbd578da5 100644 --- a/Zend/tests/generators/bug67497.phpt +++ b/Zend/tests/generators/bug67497.phpt @@ -10,7 +10,7 @@ function gen() { try { eval('abc'); -} catch (ParseException $ex) { +} catch (ParseError $ex) { } $values = gen(); diff --git a/Zend/tests/generators/clone.phpt b/Zend/tests/generators/clone.phpt index cdf0453577..18c55a0cb5 100644 --- a/Zend/tests/generators/clone.phpt +++ b/Zend/tests/generators/clone.phpt @@ -12,7 +12,7 @@ clone $gen; ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Trying to clone an uncloneable object of class Generator' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 a67a2f30c8..39d9f40279 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 'EngineException' with message 'The "Generator" class is reserved for internal use and cannot be manually instantiated' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/resume_running_generator_error.phpt b/Zend/tests/generators/errors/resume_running_generator_error.phpt index e31a2c49ae..5a309428c3 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 (EngineException $e) { + } catch (Error $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 'EngineException' with message 'Cannot resume an already running generator' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/yield_in_force_closed_finally_error.phpt b/Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt index 83523b1baa..d0992d4445 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 'EngineException' with message 'Cannot yield from finally in a force-closed generator' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/throw_not_an_exception.phpt b/Zend/tests/generators/throw_not_an_exception.phpt index 4ff1464e7c..a212b5ae42 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 'EngineException' with message 'Exceptions must be valid objects derived from the Exception base class' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Exceptions must be valid objects implementing Throwable' in %s:%d Stack trace: #0 [internal function]: gen() #1 %s(%d): Generator->throw(Object(stdClass)) diff --git a/Zend/tests/generators/yield_from_already_running.phpt b/Zend/tests/generators/yield_from_already_running.phpt index 16fda98368..38c8e7bb3a 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 'EngineException' with message 'Impossible to yield from the Generator being currently run' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/indirect_call_array_001.phpt b/Zend/tests/indirect_call_array_001.phpt index 73bd1584ef..104cb19dbe 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 'EngineException' with message 'Class 'a' not found' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 09c3e79e1a..402eb05f5a 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 'EngineException' with message 'Call to undefined method stdClass::b()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8b3e9299dd..671a14d050 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 'EngineException' with message 'Call to undefined method foo::www()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 d82120e252..b4fb93b1ae 100644 --- a/Zend/tests/list_005.phpt +++ b/Zend/tests/list_005.phpt @@ -44,7 +44,7 @@ NULL NULL ---- -Fatal error: Uncaught exception 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 1752b749d8..b7ce1d289f 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 'EngineException' with message 'Cannot use object of type Closure as array' in %slist_007.php:3 +Fatal error: Uncaught exception 'Error' with message '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-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt index 5e946161c1..2082433181 100644 --- a/Zend/tests/methods-on-non-objects-catch.phpt +++ b/Zend/tests/methods-on-non-objects-catch.phpt @@ -9,7 +9,7 @@ set_error_handler(function($code, $message) { $x= null; try { var_dump($x->method()); -} catch (EngineException $e) { +} catch (Error $e) { var_dump($e->getCode(), $e->getMessage()); } echo "Alive\n"; diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index cb50d22561..d52a0fddb5 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -11,7 +11,7 @@ $list= [1, 4, 2, 3, -1]; usort($list, function($a, $b) use ($comparator) { try { return $comparator->compare($a, $b); - } catch (EngineException $e) { + } catch (Error $e) { var_dump($e->getCode(), $e->getMessage()); return 0; } diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt index 803de1cffa..014027dbf6 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 'EngineException' with message 'Call to a member function method() on null' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 71ec3feb54..c9f9ddc7ad 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 78899a4652..fb4fe379bc 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 e7b63ea1ac..b37938b4a6 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 'EngineException' with message 'Class 'test\ns1\Exception' not found' in %sns_004.php:%d +Fatal error: Uncaught exception 'Error' with message '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 bb596901e3..49ab2d82f5 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 'EngineException' with message 'Call to undefined function Foo\Foo\Bar()' in %sns_026.php:%d +Fatal error: Uncaught exception 'Error' with message '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 5664eafdcb..172e9bf1d4 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 'EngineException' with message 'Call to undefined method Exception::bar()' in %sns_038.php:7 +Fatal error: Uncaught exception 'Error' with message '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 aae2e7c12b..34892e2286 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 'EngineException' with message 'Undefined constant 'Test\ns1\unknown'' in %sns_057.php:%d +Fatal error: Uncaught exception 'Error' with message '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 b46c968ff4..d0096fb385 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_058.php:%d +Fatal error: Uncaught exception 'Error' with message '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_076.phpt b/Zend/tests/ns_076.phpt index ac4e519b8a..3f7ef4388b 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_076.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ffe4a7d3a5..f003a04223 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 c8c1b96399..3f9ffacbe7 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ff53e793c2..0d42fb5b85 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 'EngineException' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 4b7f06dc9a..34eca93b9c 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 'EngineException' with message 'Undefined constant 'foo\unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ade0983e1f..1afcdc3b3d 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ade0983e1f..1afcdc3b3d 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 650eb07b63..99a6699b9b 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 34e9554164..2d7c9ac0bc 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 'EngineException' with message 'Undefined constant 'unknown'' in %sns_077_%d.php:%d +Fatal error: Uncaught exception 'Error' with message '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 ef0f5dacf9..41cf269f8e 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 'EngineException' with message 'Call to undefined function Foo\Bar\A()' in %sns_092.php:45 +Fatal error: Uncaught exception 'Error' with message '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 c07de71b73..5881d2dcb7 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 'EngineException' with message 'Cannot access private property foo::$test' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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_025.phpt b/Zend/tests/objects_025.phpt index e2711bd417..3afabed9d6 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 'EngineException' with message 'Method name must be a string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 e3bc411a46..560247fa36 100644 --- a/Zend/tests/objects_026.phpt +++ b/Zend/tests/objects_026.phpt @@ -10,7 +10,7 @@ try { ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Using $this when not in object context' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 883785d75c..cc8ca903c5 100644 --- a/Zend/tests/objects_029.phpt +++ b/Zend/tests/objects_029.phpt @@ -23,7 +23,7 @@ new foo; ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: foo::$f' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 21e42cb247..5805de5a86 100644 --- a/Zend/tests/objects_030.phpt +++ b/Zend/tests/objects_030.phpt @@ -23,7 +23,7 @@ new foo; ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Access to undeclared static property: bar::$f' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 ab547c8cd1..0f82b73c76 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 'EngineException' with message 'Cannot use string offset as an array' in %soffset_assign.php:%d +Fatal error: Uncaught exception 'Error' with message '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 4b9d9329a2..54d626a1e6 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 'EngineException' with message 'Cannot use object of type stdClass as array' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8cef8619e3..f4d6307299 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 'EngineException' with message 'Cannot use "parent" when current class scope has no parent' in %s:5 +Fatal error: Uncaught exception 'Error' with message '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/require_parse_exception.phpt b/Zend/tests/require_parse_exception.phpt index c1de21a4de..db6844c2ea 100644 --- a/Zend/tests/require_parse_exception.phpt +++ b/Zend/tests/require_parse_exception.phpt @@ -8,7 +8,7 @@ allow_url_include=1 function test_parse_error($code) { try { require 'data://text/plain;base64,' . base64_encode($code); - } catch (ParseException $e) { + } catch (ParseError $e) { echo $e->getMessage(), " on line ", $e->getLine(), "\n"; } } diff --git a/Zend/tests/str_offset_002.phpt b/Zend/tests/str_offset_002.phpt index 596a7c6eba..481aaf748a 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 'EngineException' with message 'Cannot create references to/from string offsets' in %sstr_offset_002.php:3 -Stack trace: -#0 {main} +Fatal error: Uncaught exception 'Error' with message '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 bbfdaa7fa5..030e306309 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 (EngineException $e) { +} catch (Error $e) { echo "\nException: " . $e->getMessage() . "\n"; } @@ -20,7 +20,7 @@ echo "Done\n"; --EXPECTF-- Exception: Unsupported operand types -Fatal error: Uncaught exception 'EngineException' with message 'Unsupported operand types' in %s:%d +Fatal error: Uncaught exception 'Error' with message 'Unsupported operand types' 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 ddc667693b..7daa102934 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 'EngineException' with message 'Cannot instantiate trait foo' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 094948c273..12b4ca79c6 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 'EngineException' with message 'Call to undefined method C1::a2()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 92ff664174..e231547269 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 'EngineException' with message 'Cannot instantiate trait abc' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8e631fd5cc..c6e5e04134 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 'EngineException' with message 'Call to protected method bar::test() from context ''' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 45164d550c..1dad14b250 100644 --- a/Zend/tests/traits/language008a.phpt +++ b/Zend/tests/traits/language008a.phpt @@ -20,7 +20,7 @@ $o->sayHello(); ?> --EXPECTF-- -Fatal error: Uncaught exception 'EngineException' with message 'Call to protected method MyClass::sayHello() from context ''' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 14e4ba8198..4bcb33f389 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 'EngineException' with message 'Call to private method MyClass::sayHelloWorld() from context ''' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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/typehints/internal_function_strict_mode.phpt b/Zend/tests/typehints/internal_function_strict_mode.phpt index 3e5629af95..f501c2b75f 100644 --- a/Zend/tests/typehints/internal_function_strict_mode.phpt +++ b/Zend/tests/typehints/internal_function_strict_mode.phpt @@ -7,21 +7,21 @@ declare(strict_types=1); echo "*** Trying Ord With Integer" . PHP_EOL; try { var_dump(ord(1)); -} catch (TypeException $e) { +} catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } echo "*** Trying Array Map With Invalid Callback" . PHP_EOL; try { array_map([null, "bar"], []); -} catch (TypeException $e) { +} catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } echo "*** Trying Strlen With Float" . PHP_EOL; try { var_dump(strlen(1.5)); -} catch (TypeException $e) { +} catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } diff --git a/Zend/tests/typehints/scalar_basic.phpt b/Zend/tests/typehints/scalar_basic.phpt index 08a0121bbe..f27dc2b885 100644 --- a/Zend/tests/typehints/scalar_basic.phpt +++ b/Zend/tests/typehints/scalar_basic.phpt @@ -51,7 +51,7 @@ foreach ($functions as $type => $function) { var_dump($value); try { var_dump($function($value)); - } catch (\TypeException $e) { + } catch (\TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_none.phpt b/Zend/tests/typehints/scalar_none.phpt index af6d8c8dfa..5a98377022 100644 --- a/Zend/tests/typehints/scalar_none.phpt +++ b/Zend/tests/typehints/scalar_none.phpt @@ -28,7 +28,7 @@ foreach ($functions as $type => $function) { echo "Testing $type:", PHP_EOL; try { var_dump($function()); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_null.phpt b/Zend/tests/typehints/scalar_null.phpt index e149388ef0..f409e34867 100644 --- a/Zend/tests/typehints/scalar_null.phpt +++ b/Zend/tests/typehints/scalar_null.phpt @@ -28,7 +28,7 @@ foreach ($functions as $type => $function) { echo "Testing $type:", PHP_EOL; try { var_dump($function(null)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_return_basic.phpt b/Zend/tests/typehints/scalar_return_basic.phpt index 76b01a8c89..b01a930485 100644 --- a/Zend/tests/typehints/scalar_return_basic.phpt +++ b/Zend/tests/typehints/scalar_return_basic.phpt @@ -54,7 +54,7 @@ foreach ($functions as $type => $function) { var_dump($value); try { var_dump($function($value)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_return_basic_64bit.phpt b/Zend/tests/typehints/scalar_return_basic_64bit.phpt index edb5231dc0..6994817404 100644 --- a/Zend/tests/typehints/scalar_return_basic_64bit.phpt +++ b/Zend/tests/typehints/scalar_return_basic_64bit.phpt @@ -54,7 +54,7 @@ foreach ($functions as $type => $function) { var_dump($value); try { var_dump($function($value)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_strict.phpt b/Zend/tests/typehints/scalar_strict.phpt index e0f89f95b1..59ec45ac4f 100644 --- a/Zend/tests/typehints/scalar_strict.phpt +++ b/Zend/tests/typehints/scalar_strict.phpt @@ -55,7 +55,7 @@ foreach ($functions as $type => $function) { var_dump($value); try { var_dump($function($value)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_strict_64bit.phpt b/Zend/tests/typehints/scalar_strict_64bit.phpt index da3e1e4546..4671b07609 100644 --- a/Zend/tests/typehints/scalar_strict_64bit.phpt +++ b/Zend/tests/typehints/scalar_strict_64bit.phpt @@ -55,7 +55,7 @@ foreach ($functions as $type => $function) { var_dump($value); try { var_dump($function($value)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/typehints/scalar_strict_basic.phpt b/Zend/tests/typehints/scalar_strict_basic.phpt index d56af159d7..15030e1c86 100644 --- a/Zend/tests/typehints/scalar_strict_basic.phpt +++ b/Zend/tests/typehints/scalar_strict_basic.phpt @@ -54,7 +54,7 @@ foreach ($functions as $type => $function) { echo PHP_EOL . "*** Trying ", type($value), " value", PHP_EOL; try { var_dump($function($value)); - } catch (TypeException $e) { + } catch (TypeError $e) { echo "*** Caught " . $e->getMessage() . PHP_EOL; } } diff --git a/Zend/tests/use_const/no_global_fallback.phpt b/Zend/tests/use_const/no_global_fallback.phpt index 40978c17fb..c83bea944a 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 'EngineException' with message 'Undefined constant 'foo\bar\baz'' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 45fc32c4da..6756b0ceeb 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 'EngineException' with message 'Call to undefined function foo\bar\baz()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 24551e0089..c53c984c1a 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 'EngineException' with message 'Call to undefined function bar\test()' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 93b51a2570..e423a15063 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 'EngineException' with message 'Call to a member function length() on string' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 9421d8edc5..3ec22ef55c 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 'EngineException' with message 'Cannot use temporary expression in write context' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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 8bcb9198e7..0222f0d1b9 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 'EngineException' with message 'Cannot use temporary expression in write context' in %s:%d +Fatal error: Uncaught exception 'Error' with message '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_suppressed_error.phpt b/Zend/tests/variadic/typehint_suppressed_error.phpt index 5879de6d95..24109e0891 100644 --- a/Zend/tests/variadic/typehint_suppressed_error.phpt +++ b/Zend/tests/variadic/typehint_suppressed_error.phpt @@ -9,7 +9,7 @@ function test(array... $args) { try { test([0], [1], 2); -} catch(EngineException $e) { +} catch(Error $e) { var_dump($e->getMessage()); } |