Errors converted to exceptions are not "recoverable" anymore.

diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt
index a676992778432a52b8667be46c7eb693e55bba09..8753a26d7ab25cfa95807c898c7e462eb3b94fb6 100644 (file)
--- a/Zend/tests/array_type_hint_001.phpt
+++ b/Zend/tests/array_type_hint_001.phpt
@@ -12,4 +12,4 @@ foo(123);
 --EXPECTF--
 3
 
-Catchable fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2
+Fatal error: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on line 2

diff --git a/Zend/tests/bug33996.phpt b/Zend/tests/bug33996.phpt
index e722eceafb3e97f46c17f8bc6328b728ef0800d2..678f10053e2a56b7a653b19705abf35a5d942c2b 100644 (file)
--- a/Zend/tests/bug33996.phpt
+++ b/Zend/tests/bug33996.phpt
@@ -26,4 +26,4 @@ FooTest(new Foo());
 --EXPECTF--
 Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
 Hi!
-Catchable fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
+Fatal error: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d

diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt
index 7a3da849bd4afda3534c312e27c637d61c99b238..8b2c87ce9eb420a4ca567de6c77ffc4b1b3672d8 100644 (file)
--- a/Zend/tests/bug39003.phpt
+++ b/Zend/tests/bug39003.phpt
@@ -21,4 +21,4 @@ test($obj);
 echo "Done\n";
 ?>
 --EXPECTF--    
-Catchable fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s on line %d

diff --git a/Zend/tests/bug42802.phpt b/Zend/tests/bug42802.phpt
index 2aa7061f35a08b96c32cbdafb098e91cbe9d0129..b74ace1999ba509fae53506de25a6aa94eff64cd 100644 (file)
--- a/Zend/tests/bug42802.phpt
+++ b/Zend/tests/bug42802.phpt
@@ -37,4 +37,4 @@ ok
 ok
 ok
 
-Catchable fatal error: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php on line %d
+Fatal error: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php on line %d

diff --git a/Zend/tests/bug43332_1.phpt b/Zend/tests/bug43332_1.phpt
index 807c6cb5454d6619ee70abc5a6cce0dd3c1fa1f6..1642d6aed0e0a256117826a1dbd0284986df4dcf 100644 (file)
--- a/Zend/tests/bug43332_1.phpt
+++ b/Zend/tests/bug43332_1.phpt
@@ -12,4 +12,4 @@ $foo = new foo;
 $foo->bar($foo); // Ok!
 $foo->bar(new \stdclass); // Error, ok!
 --EXPECTF--
-Catchable fatal error: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php on line 5
+Fatal error: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php on line 5

diff --git a/Zend/tests/bug50146.phpt b/Zend/tests/bug50146.phpt
index 7aa26a650908e19d293a982352ac4892ac936f91..2ad1ff6e5a1d1bab32079d92233a8c89d9d9523c 100644 (file)
--- a/Zend/tests/bug50146.phpt
+++ b/Zend/tests/bug50146.phpt
@@ -17,4 +17,4 @@ var_dump(isset($obj->a));
 bool(false)
 bool(false)
 
-Catchable fatal error: Closure object cannot have properties in %s on line %d
+Fatal error: Closure object cannot have properties in %s on line %d

diff --git a/Zend/tests/bug55705.phpt b/Zend/tests/bug55705.phpt
index 69220bfdeb785b42f7ee83a11a6607e5f0c49af3..e2656cbddb7db0af903be3bb74f589aa6cc87743 100644 (file)
--- a/Zend/tests/bug55705.phpt
+++ b/Zend/tests/bug55705.phpt
@@ -6,4 +6,4 @@ function f(callable $c) {}
 f();
 ?>
 --EXPECTF--
-Catchable fatal error: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s on line %d
+Fatal error: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s on line %d

diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/bug68446.phpt
index 48e6f52f1cc7c3926841cc12acc55eed6e666ab0..e19610b5ca725fd0864048954352ff61bfaaeb6b 100644 (file)
--- a/Zend/tests/bug68446.phpt
+++ b/Zend/tests/bug68446.phpt
@@ -32,5 +32,5 @@ array(1) {
   int(1)
 }
 
-Catchable fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to a() must be of the type array, null given, called in %s on line %d and defined in %s on line %d
 

diff --git a/Zend/tests/closure_022.phpt b/Zend/tests/closure_022.phpt
index 8621d2c095f9c1e2edc2a53d81b3726f8c3940e4..25fbe931d8ad31596343caa30bcebda8de6e8f7a 100644 (file)
--- a/Zend/tests/closure_022.phpt
+++ b/Zend/tests/closure_022.phpt
@@ -8,5 +8,5 @@ $foo = function() use ($a) {
 $foo->a = 1;
 ?>
 --EXPECTF--
-Catchable fatal error: Closure object cannot have properties in %sclosure_022.php on line 5
+Fatal error: Closure object cannot have properties in %sclosure_022.php on line 5
 

diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closure_027.phpt
index f26e1140450a74fac21a6885924787a890b1dd35..442615c2780f0cfd13e572518f13ef1e7db19c65 100644 (file)
--- a/Zend/tests/closure_027.phpt
+++ b/Zend/tests/closure_027.phpt
@@ -28,4 +28,4 @@ Notice: Undefined variable: y in %s on line %d
 Warning: Missing argument 1 for {closure}(), called in %s on line %d and defined in %s on line %d
 NULL
 
-Catchable fatal error: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s on line %d

diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference_002.phpt
index cc0f27d53443424064cb58df6292777a8438d5d1..da13decc396be6b7de19d31e698281d8f5e21ebd 100644 (file)
--- a/Zend/tests/dereference_002.phpt
+++ b/Zend/tests/dereference_002.phpt
@@ -76,4 +76,4 @@ NULL
 
 Notice: Undefined offset: 3 in %s on line %d
 
-Catchable fatal error: Call to a member function bar() on null in %s on line %d
+Fatal error: Call to a member function bar() on null 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 f8941c087af42c0840f87f57b2fdaaa6e373ad9c..990c7481c6a0436b2b908f5c0b170326003bd2cc 100644 (file)
--- a/Zend/tests/generators/errors/generator_instantiate_error.phpt
+++ b/Zend/tests/generators/errors/generator_instantiate_error.phpt
@@ -7,4 +7,4 @@ new Generator;
 
 ?>
 --EXPECTF--
-Catchable fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d
+Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %s on line %d

diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt
index b38da3657b944f288bb776615907aa6e941bdf0e..5e946161c1b4da405d99421f0e9ada86e2224a5c 100644 (file)
--- a/Zend/tests/methods-on-non-objects-catch.phpt
+++ b/Zend/tests/methods-on-non-objects-catch.phpt
@@ -16,6 +16,6 @@ echo "Alive\n";
 ?>
 --EXPECTF--
 
-int(4096)
+int(1)
 string(%d) "Call to a member function method() on null"
 Alive

diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt
index 54779cd1ea8cb575e39a1d36c6c383424f50e674..cb50d2256160e38ce60f63c36811a14c7f5a5fe1 100644 (file)
--- a/Zend/tests/methods-on-non-objects-usort.phpt
+++ b/Zend/tests/methods-on-non-objects-usort.phpt
@@ -20,13 +20,13 @@ var_dump($list);
 echo "Alive\n";
 ?>
 --EXPECTF--
-int(4096)
+int(1)
 string(43) "Call to a member function compare() on null"
-int(4096)
+int(1)
 string(43) "Call to a member function compare() on null"
-int(4096)
+int(1)
 string(43) "Call to a member function compare() on null"
-int(4096)
+int(1)
 string(43) "Call to a member function compare() on null"
 array(5) {
   [0]=>

diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt
index 01031b8b1d7da8c9d74dd32435d46823334016fe..baf9e1c8c707e1eb64fa1048ecbd11502105b916 100644 (file)
--- a/Zend/tests/methods-on-non-objects.phpt
+++ b/Zend/tests/methods-on-non-objects.phpt
@@ -9,4 +9,4 @@ echo "Should not get here!\n";
 ?>
 --EXPECTF--
 
-Catchable fatal error: Call to a member function method() on null in %s on line %d 
+Fatal error: Call to a member function method() on null in %s on line %d 

diff --git a/Zend/tests/ns_071.phpt b/Zend/tests/ns_071.phpt
index 604e649836f047e9858ac0ed7d07fa49935ef8ed..9965fde8097f339501efb1b20f5a80db682b9929 100644 (file)
--- a/Zend/tests/ns_071.phpt
+++ b/Zend/tests/ns_071.phpt
@@ -18,4 +18,4 @@ new bar(new \stdclass);
 --EXPECTF--
 NULL
 
-Catchable fatal error: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to foo\bar::__construct() must be of the type array, object given, called in %s on line %d and defined in %s on line %d

diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt
index c500bfddb7e9ce5e7fc4455dd6c05901335d6bfe..2ae417e957080586248dbcbc3480c2d9608047c7 100644 (file)
--- a/Zend/tests/ns_072.phpt
+++ b/Zend/tests/ns_072.phpt
@@ -30,4 +30,4 @@ object(foo\test)#%d (0) {
 }
 NULL
 
-Catchable fatal error: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to foo\bar::__construct() must implement interface foo\foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d

diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt
index 5a80e0a4110736393e8509e250e0dd169905299b..3c2e0d4a512f265392a28333cc060e53ef6120db 100644 (file)
--- a/Zend/tests/objects_022.phpt
+++ b/Zend/tests/objects_022.phpt
@@ -36,4 +36,4 @@ object(bar)#%d (0) {
 object(baz)#%d (0) {
 }
 
-Catchable fatal error: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s on line %d

diff --git a/Zend/tests/return_types/001.phpt b/Zend/tests/return_types/001.phpt
index a751bd3f2feedeada58f7b4006a78762c833be72..c09d627be9f54f4abd5c17b683024e81616fe4bf 100644 (file)
--- a/Zend/tests/return_types/001.phpt
+++ b/Zend/tests/return_types/001.phpt
@@ -9,4 +9,4 @@ function test1() : array {
 test1();
 
 --EXPECTF--
-Catchable fatal error: Return value of test1() must be of the type array, none returned in %s on line %d
+Fatal error: Return value of test1() must be of the type array, none returned in %s on line %d

diff --git a/Zend/tests/return_types/002.phpt b/Zend/tests/return_types/002.phpt
index d8b77925e3b15fb80a6b0895ed3c0f49080317db..553611597d1835030b08d85e5e21d02857517df3 100644 (file)
--- a/Zend/tests/return_types/002.phpt
+++ b/Zend/tests/return_types/002.phpt
@@ -10,4 +10,4 @@ function test1() : array {
 test1();
 
 --EXPECTF--
-Catchable fatal error: Return value of test1() must be of the type array, null returned in %s on line %d
+Fatal error: Return value of test1() must be of the type array, null returned in %s on line %d

diff --git a/Zend/tests/return_types/003.phpt b/Zend/tests/return_types/003.phpt
index 0ca023b30803fa8fea2fafe8319cba0589f9f1e4..26a827158b5dcf3603d18ad9824e53f5925fdb3f 100644 (file)
--- a/Zend/tests/return_types/003.phpt
+++ b/Zend/tests/return_types/003.phpt
@@ -9,4 +9,4 @@ function test1() : array {
 test1();
 
 --EXPECTF--
-Catchable fatal error: Return value of test1() must be of the type array, integer returned in %s on line %d
+Fatal error: Return value of test1() must be of the type array, integer returned in %s on line %d

diff --git a/Zend/tests/return_types/004.phpt b/Zend/tests/return_types/004.phpt
index 44712f5dba22b7bc83782909ef8c93529d42a03b..41f06bf0144b25da4ebcd7bc0854bae56d105153 100644 (file)
--- a/Zend/tests/return_types/004.phpt
+++ b/Zend/tests/return_types/004.phpt
@@ -10,4 +10,4 @@ function test1() : array {
 test1();
 
 --EXPECTF--
-Catchable fatal error: Return value of test1() must be of the type array, string returned in %s on line %d
+Fatal error: Return value of test1() must be of the type array, string returned in %s on line %d

diff --git a/Zend/tests/return_types/005.phpt b/Zend/tests/return_types/005.phpt
index 5b979a3b67fa7ca8477eb8c8f686c95d0bce0ce7..d3ae04769af6ae2afe5533ec4830319a27040273 100644 (file)
--- a/Zend/tests/return_types/005.phpt
+++ b/Zend/tests/return_types/005.phpt
@@ -15,4 +15,4 @@ $qux = new qux();
 $qux->foo();
 
 --EXPECTF--
-Catchable fatal error: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s on line %d
+Fatal error: Return value of qux::foo() must be an instance of foo, instance of qux returned in %s on line %d

diff --git a/Zend/tests/return_types/010.phpt b/Zend/tests/return_types/010.phpt
index 75deb3a32b026271305be8876fa6bf8c8650d956..5f53220815cce461ce29ccff0acb11de511e1714 100644 (file)
--- a/Zend/tests/return_types/010.phpt
+++ b/Zend/tests/return_types/010.phpt
@@ -11,4 +11,4 @@ $array = [1, 2, 3];
 var_dump(foo($array));
 
 --EXPECTF--
-Catchable fatal error: Return value of foo() must be of the type array, null returned in %s on line %d
+Fatal error: Return value of foo() must be of the type array, null returned in %s on line %d

diff --git a/Zend/tests/return_types/013.phpt b/Zend/tests/return_types/013.phpt
index ca03d2f98313a32988aef72d3ffb36d23a5c67d5..ee6568522f00dba881b13af2213fa54236c24ca2 100644 (file)
--- a/Zend/tests/return_types/013.phpt
+++ b/Zend/tests/return_types/013.phpt
@@ -16,4 +16,4 @@ $baz = new foo();
 var_dump($func=$baz->bar(), $func());
 
 --EXPECTF--
-Catchable fatal error: Return value of foo::{closure}() must be of the type array, null returned in %s on line %d
+Fatal error: Return value of foo::{closure}() must be of the type array, null returned in %s on line %d

diff --git a/Zend/tests/return_types/rfc001.phpt b/Zend/tests/return_types/rfc001.phpt
index 4d5275227d2e0e21646e9cdb0729e66690c0e969..df96e7edb82f40e4d0296711dbae307b3b2cc5f6 100644 (file)
--- a/Zend/tests/return_types/rfc001.phpt
+++ b/Zend/tests/return_types/rfc001.phpt
@@ -11,4 +11,4 @@ function get_config(): array {
 get_config();
 
 --EXPECTF--
-Catchable fatal error: Return value of get_config() must be of the type array, integer returned in %s on line %d
+Fatal error: Return value of get_config() must be of the type array, integer returned in %s on line %d

diff --git a/Zend/tests/return_types/rfc002.phpt b/Zend/tests/return_types/rfc002.phpt
index 29b5ed3220fc1cf5cd0a7efe2cf582daa8b7d7d8..7ccef60d3db0f9f37afc8abbc5db18db183f55b7 100644 (file)
--- a/Zend/tests/return_types/rfc002.phpt
+++ b/Zend/tests/return_types/rfc002.phpt
@@ -10,4 +10,4 @@ function answer(): int {
 answer();
 
 --EXPECTF--
-Catchable fatal error: Return value of answer() must be an instance of int, integer returned in %s on line %d
+Fatal error: Return value of answer() must be an instance of int, integer returned in %s on line %d

diff --git a/Zend/tests/return_types/rfc003.phpt b/Zend/tests/return_types/rfc003.phpt
index 3aad309b472dc3d7fd2f6bce7a5fe569877684a9..1fdf19f612f90bf3e8c6ebdf168f0d863f87aed4 100644 (file)
--- a/Zend/tests/return_types/rfc003.phpt
+++ b/Zend/tests/return_types/rfc003.phpt
@@ -10,4 +10,4 @@ function foo(): DateTime {
 foo();
 
 --EXPECTF--
-Catchable fatal error: Return value of foo() must be an instance of DateTime, null returned in %s on line %d
+Fatal error: Return value of foo() must be an instance of DateTime, null returned in %s on line %d

diff --git a/Zend/tests/variadic/typehint_error.phpt b/Zend/tests/variadic/typehint_error.phpt
index 3006b999576c633b203d28d09f386e78d5b14321..2661567224cde3b3ebc48a86e41617f31e9b1c46 100644 (file)
--- a/Zend/tests/variadic/typehint_error.phpt
+++ b/Zend/tests/variadic/typehint_error.phpt
@@ -33,4 +33,4 @@ array(3) {
   }
 }
 
-Catchable fatal error: Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d
+Fatal error: Argument 3 passed to test() must be of the type array, integer given, called in %s on line %d

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 382bb1849a030fb8a5d9fe7337c099cc69c553c1..5904b8473e5af7fa5db2490c1c3703f37d7ef4a1 100644 (file)
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -32,7 +32,7 @@
 #define ZEND_CLOSURE_PRINT_NAME "Closure object"
 
 #define ZEND_CLOSURE_PROPERTY_ERROR() \
-       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Closure object cannot have properties")
+       zend_error(E_EXCEPTION | E_ERROR, "Closure object cannot have properties")
 
 typedef struct _zend_closure {
        zend_object    std;
@@ -53,7 +53,7 @@ ZEND_METHOD(Closure, __invoke) /* {{{ */
        arguments = emalloc(sizeof(zval) * ZEND_NUM_ARGS());
        if (zend_get_parameters_array_ex(ZEND_NUM_ARGS(), arguments) == FAILURE) {
                efree(arguments);
-               zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot get arguments for calling closure");
+               zend_error(E_EXCEPTION | E_ERROR, "Cannot get arguments for calling closure");
                RETVAL_FALSE;
        } else if (call_user_function_ex(CG(function_table), NULL, getThis(), return_value, ZEND_NUM_ARGS(), arguments, 1, NULL) == FAILURE) {
                RETVAL_FALSE;
@@ -168,7 +168,7 @@ ZEND_METHOD(Closure, bind)
 
 static zend_function *zend_closure_get_constructor(zend_object *object) /* {{{ */
 {
-       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Instantiation of 'Closure' is not allowed");
+       zend_error(E_EXCEPTION | E_ERROR, "Instantiation of 'Closure' is not allowed");
        return NULL;
 }
 /* }}} */
@@ -418,7 +418,7 @@ static HashTable *zend_closure_get_gc(zval *obj, zval **table, int *n) /* {{{ */
    Private constructor preventing instantiation */
 ZEND_METHOD(Closure, __construct)
 {
-       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Instantiation of 'Closure' is not allowed");
+       zend_error(E_EXCEPTION | E_ERROR, "Instantiation of 'Closure' is not allowed");
 }
 /* }}} */
 

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 9df49f1bb693a4de3fa55d81cc7e671f3f5c2870..59e585e35b06e23346107f31c92bcb573cfc3ca9 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -636,21 +636,21 @@ static void zend_verify_internal_arg_type(zend_function *zf, uint32_t arg_num, z
                if (Z_TYPE_P(arg) == IS_OBJECT) {
                        need_msg = zend_verify_internal_arg_class_kind((zend_internal_arg_info*)cur_arg_info, &class_name, &ce);
                        if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce)) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
                        }
                } else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
                        need_msg = zend_verify_internal_arg_class_kind((zend_internal_arg_info*)cur_arg_info, &class_name, &ce);
-                       zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
+                       zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
                }
        } else if (cur_arg_info->type_hint) {
                if (cur_arg_info->type_hint == IS_ARRAY) {
                        ZVAL_DEREF(arg);
                        if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
                        }
                } else if (cur_arg_info->type_hint == IS_CALLABLE) {
                        if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null)) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
                        }
 #if ZEND_DEBUG
                } else {
@@ -681,21 +681,21 @@ static void zend_verify_arg_type(zend_function *zf, uint32_t arg_num, zval *arg,
                if (Z_TYPE_P(arg) == IS_OBJECT) {
                        need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
                        if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce)) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name->val, arg);
                        }
                } else if (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value)))) {
                        need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
-                       zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
+                       zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, zend_zval_type_name(arg), "", arg);
                }
        } else if (cur_arg_info->type_hint) {
                if (cur_arg_info->type_hint == IS_ARRAY) {
                        ZVAL_DEREF(arg);
                        if (Z_TYPE_P(arg) != IS_ARRAY && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value))))) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", zend_zval_type_name(arg), "", arg);
                        }
                } else if (cur_arg_info->type_hint == IS_CALLABLE) {
                        if (!zend_is_callable(arg, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(arg) != IS_NULL || !(cur_arg_info->allow_null || (default_value && is_null_constant(default_value))))) {
-                               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
+                               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", zend_zval_type_name(arg), "", arg);
                        }
 #if ZEND_DEBUG
                } else {
@@ -723,13 +723,13 @@ static inline int zend_verify_missing_arg_type(zend_function *zf, uint32_t arg_n
                char *class_name;
 
                need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name, &ce);
-               zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "none", "", NULL);
+               zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, need_msg, class_name, "none", "", NULL);
                return 0;
        } else if (cur_arg_info->type_hint) {
                if (cur_arg_info->type_hint == IS_ARRAY) {
-                       zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array", "", "none", "", NULL);
+                       zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be of the type array", "", "none", "", NULL);
                } else if (cur_arg_info->type_hint == IS_CALLABLE) {
-                       zend_verify_arg_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, arg_num, "be callable", "", "none", "", NULL);
+                       zend_verify_arg_error(E_EXCEPTION | E_ERROR, zf, arg_num, "be callable", "", "none", "", NULL);
 #if ZEND_DEBUG
                } else {
                        zend_error(E_ERROR, "Unknown typehint");
@@ -831,20 +831,20 @@ static void zend_verify_return_type(zend_function *zf, zval *ret)
                if (Z_TYPE_P(ret) == IS_OBJECT) {
                        need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
                        if (!ce || !instanceof_function(Z_OBJCE_P(ret), ce)) {
-                               zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, "instance of ", Z_OBJCE_P(ret)->name->val);
+                               zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, "instance of ", Z_OBJCE_P(ret)->name->val);
                        }
                } else if (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null) {
                        need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
-                       zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, zend_zval_type_name(ret), "");
+                       zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, zend_zval_type_name(ret), "");
                }
        } else if (ret_info->type_hint) {
                if (ret_info->type_hint == IS_ARRAY) {
                        if (Z_TYPE_P(ret) != IS_ARRAY && (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null)) {
-                               zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be of the type array", "", zend_zval_type_name(ret), "");
+                               zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be of the type array", "", zend_zval_type_name(ret), "");
                        }
                } else if (ret_info->type_hint == IS_CALLABLE) {
                        if (!zend_is_callable(ret, IS_CALLABLE_CHECK_SILENT, NULL) && (Z_TYPE_P(ret) != IS_NULL || !ret_info->allow_null)) {
-                               zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be callable", "", zend_zval_type_name(ret), "");
+                               zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be callable", "", zend_zval_type_name(ret), "");
                        }
 #if ZEND_DEBUG
                } else {
@@ -864,13 +864,13 @@ static inline int zend_verify_missing_return_type(zend_function *zf)
                char *class_name;
 
                need_msg = zend_verify_arg_class_kind(ret_info, &class_name, &ce);
-               zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, need_msg, class_name, "none", "");
+               zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, need_msg, class_name, "none", "");
                return 0;
        } else if (ret_info->type_hint) {
                if (ret_info->type_hint == IS_ARRAY) {
-                       zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be of the type array", "", "none", "");
+                       zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be of the type array", "", "none", "");
                } else if (ret_info->type_hint == IS_CALLABLE) {
-                       zend_verify_return_error(E_EXCEPTION | E_RECOVERABLE_ERROR, zf, "be callable", "", "none", "");
+                       zend_verify_return_error(E_EXCEPTION | E_ERROR, zf, "be callable", "", "none", "");
 #if ZEND_DEBUG
                } else {
                        zend_error(E_ERROR, "Unknown typehint");

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 50548c58e7df23f93681b41ee2862821668ab7a5..f0aab0428d845849e4a7e1f70d40e367f5a61aa0 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -286,7 +286,7 @@ ZEND_API void zend_generator_create_zval(zend_execute_data *call, zend_op_array
 
 static zend_function *zend_generator_get_constructor(zend_object *object) /* {{{ */
 {
-       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "The \"Generator\" class is reserved for internal use and cannot be manually instantiated");
+       zend_error(E_EXCEPTION | E_ERROR, "The \"Generator\" class is reserved for internal use and cannot be manually instantiated");
 
        return NULL;
 }

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c08280aaa2c02795be32b856c5c12e582d30af65..ede3dd73699659a61b3baa5904161ed40f28cbe6 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2438,7 +2438,7 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMPVAR|UNUSED|CV, CONST|TMPVAR|CV)
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
                        FREE_OP2();
                        FREE_OP1();
                        HANDLE_EXCEPTION();
@@ -3685,7 +3685,7 @@ ZEND_VM_C_LABEL(send_again):
 
                        ZEND_HASH_FOREACH_STR_KEY_VAL(ht, name, arg) {
                                if (name) {
-                                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot unpack array with string keys");
+                                       zend_error(E_EXCEPTION | E_ERROR, "Cannot unpack array with string keys");
                                        FREE_OP1();
                                        HANDLE_EXCEPTION();
                                }
@@ -3758,7 +3758,7 @@ ZEND_VM_C_LABEL(send_again):
                                        }
 
                                        if (Z_TYPE(key) == IS_STRING) {
-                                               zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR,
+                                               zend_error(E_EXCEPTION | E_ERROR,
                                                        "Cannot unpack Traversable with string keys");
                                                zend_string_release(Z_STR(key));
                                                ZEND_VM_C_GOTO(unpack_iter_dtor);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 320779c2e8abb2aebff090b50e6acf04460ac540..3bc3cdde26a54d3b3b98d8eaf651da9601c47c91 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -905,7 +905,7 @@ send_again:
 
                        ZEND_HASH_FOREACH_STR_KEY_VAL(ht, name, arg) {
                                if (name) {
-                                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Cannot unpack array with string keys");
+                                       zend_error(E_EXCEPTION | E_ERROR, "Cannot unpack array with string keys");
                                        FREE_OP(free_op1);
                                        HANDLE_EXCEPTION();
                                }
@@ -978,7 +978,7 @@ send_again:
                                        }
 
                                        if (Z_TYPE(key) == IS_STRING) {
-                                               zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR,
+                                               zend_error(E_EXCEPTION | E_ERROR,
                                                        "Cannot unpack Traversable with string keys");
                                                zend_string_release(Z_STR(key));
                                                goto unpack_iter_dtor;
@@ -20403,7 +20403,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
 
                        HANDLE_EXCEPTION();
@@ -22664,7 +22664,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
 
                        HANDLE_EXCEPTION();
@@ -24080,7 +24080,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMPVAR_HANDLER(ZEND_
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
                        zval_ptr_dtor_nogc(free_op2);
 
                        HANDLE_EXCEPTION();
@@ -27660,7 +27660,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
 
                        HANDLE_EXCEPTION();
@@ -32068,7 +32068,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
 
                        HANDLE_EXCEPTION();
@@ -34115,7 +34115,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_TMPVAR_HANDLER(ZEND_OPCO
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
                        zval_ptr_dtor_nogc(free_op2);
 
                        HANDLE_EXCEPTION();
@@ -35773,7 +35773,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_CONST_HANDLER(ZEND_O
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
                        zval_ptr_dtor_nogc(free_op1);
                        HANDLE_EXCEPTION();
@@ -37375,7 +37375,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_CV_HANDLER(ZEND_OPCO
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
 
                        zval_ptr_dtor_nogc(free_op1);
                        HANDLE_EXCEPTION();
@@ -38010,7 +38010,7 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMPVAR_TMPVAR_HANDLER(ZEND_
                        if (UNEXPECTED(EG(exception) != NULL)) {
                                HANDLE_EXCEPTION();
                        }
-                       zend_error(E_EXCEPTION | E_RECOVERABLE_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+                       zend_error(E_EXCEPTION | E_ERROR, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
                        zval_ptr_dtor_nogc(free_op2);
                        zval_ptr_dtor_nogc(free_op1);
                        HANDLE_EXCEPTION();

diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt
index 1580f1ae70fc27e55edae3357ff4fd4033644829..3ff2b7d931262ca588e47d8f6d2ba82f4e0e2887 100644 (file)
--- a/ext/date/tests/014.phpt
+++ b/ext/date/tests/014.phpt
@@ -37,4 +37,4 @@ Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on li
 bool(false)
 int(0)
 
-Catchable fatal error: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s
+Fatal error: Argument 1 passed to timezone_offset_get() must be an instance of DateTimeZone, instance of DateTime given in %s

diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index 2e5fadb4ec968d4650163c7d8411bc1d3e799616..0cc4abcf3fdfdf02abdd7b71944e7a898c232f21 100644 (file)
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -38,4 +38,4 @@ Warning: intlcal_add() expects exactly 3 parameters, 4 given in %s on line %d
 Warning: intlcal_add(): intlcal_add: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_add() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index 2fcd81d93ad2708f20a9e9e7c30242562ebd5b1d..b5f3c746c1b0a7ea1771a58a1ba43999198b7a0d 100644 (file)
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -67,9 +67,9 @@ bool(false)
 error: 2, IntlCalendar::before() expects exactly 1 parameter, 0 given
 error: 2, IntlCalendar::before(): intlcal_before/after: bad arguments
 bool(false)
-error: 4096, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to IntlCalendar::after() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to IntlCalendar::before() must be an instance of IntlCalendar, integer given
 
 error: 2, IntlCalendar::after() expects exactly 1 parameter, 2 given
 error: 2, IntlCalendar::after(): intlcal_before/after: bad arguments

diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index 9bde7e2c8d6bbf1949b8797a8044873f90815ec9..37f8d5c019d685a46468f1ec1120e965582fad81 100644 (file)
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -28,4 +28,4 @@ bool(false)
 Warning: intlcal_clear(): intlcal_clear: invalid field in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_clear() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index e6b2397c0989a7fcc126ae84cf30e892ff1b9102..0293bd7bcba50ca194016eb982885e75807c6ad2 100644 (file)
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -49,10 +49,10 @@ try {
 error: 2, IntlCalendar::equals() expects exactly 1 parameter, 0 given
 error: 2, IntlCalendar::equals(): intlcal_equals: bad arguments
 bool(false)
-error: 4096, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
+error: 1, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, instance of stdClass given
 
-error: 4096, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to IntlCalendar::equals() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
+error: 1, Argument 2 passed to intlcal_equals() must be an instance of IntlCalendar, array given
 
-error: 4096, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_equals() must be an instance of IntlCalendar, integer given

diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index ef7e4fc8dca36d97b3f6e1b41ed1ed079dfc8ef3..8df95c2680fa352df5e17a13a4aed34618bf3b97 100644 (file)
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -39,4 +39,4 @@ Warning: intlcal_field_difference() expects exactly 3 parameters, 4 given in %s
 Warning: intlcal_field_difference(): intlcal_field_difference: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_field_difference() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index c7ff2cfebd1c138b91d3035b16ed615a9352f83c..33457b8e400fec3fd822ac75ca1c23a56aacdaaf 100644 (file)
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -41,4 +41,4 @@ Warning: intlcal_get_day_of_week_type() expects parameter 2 to be integer, strin
 Warning: intlcal_get_day_of_week_type(): intlcal_get_day_of_week_type: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_day_of_week_type() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt
index 13aab819233e72408256e4021f31b24ecea36478..be5bb507ad33c4cd0da3d245b21367a48f07a3e4 100644 (file)
--- a/ext/intl/tests/calendar_getErrorCode_error.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_error.phpt
@@ -23,4 +23,4 @@ Warning: IntlCalendar::getErrorCode() expects exactly 0 parameters, 1 given in %
 Warning: IntlCalendar::getErrorCode(): intlcal_get_error_code: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_error_code() must be an instance of IntlCalendar, null given in %s on line %d

diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt
index 6081833904d38a64cf0d7b9e819a3316d7fe0e34..16768304a1c0f2e60c7ba4d74621ea68c73af3df 100644 (file)
--- a/ext/intl/tests/calendar_getErrorMessage_error.phpt
+++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt
@@ -23,4 +23,4 @@ Warning: IntlCalendar::getErrorMessage() expects exactly 0 parameters, 1 given i
 Warning: IntlCalendar::getErrorMessage(): intlcal_get_error_message: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_error_message() must be an instance of IntlCalendar, null given in %s on line %d

diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index e13b5138a72ee5d6e55f3420da96d279f75c9638..b6675b5867bf46e3924a093c4c9a9efef9a4cbff 100644 (file)
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_get_first_day_of_week() expects exactly 1 parameter, 2 given in
 Warning: intlcal_get_first_day_of_week(): intlcal_get_first_day_of_week: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index 42970a9e7fa93247fc47f098315e4d31848f3592..6923efd02577be2b93c7473db37eb52bdfb6a69d 100644 (file)
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -39,4 +39,4 @@ Warning: intlcal_get_locale() expects exactly 2 parameters, 1 given in %s on lin
 Warning: intlcal_get_locale(): intlcal_get_locale: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_locale() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index 8e1971dc2b0857fbff050aaabeb6e10842273183..02df2d59c470ad0c9d26f8cb49780eeac488957e 100644 (file)
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_get_minimal_days_in_first_week() expects exactly 1 parameter, 2
 Warning: intlcal_get_minimal_days_in_first_week(): intlcal_get_minimal_days_in_first_week: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index e07135586cbbc3277c34de107b4122f899b78857..e64983acc789a45f29e1febf8234577c7950652e 100644 (file)
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -44,4 +44,4 @@ Warning: intlcal_get_repeated_wall_time_option() expects exactly 1 parameter, 2
 Warning: intlcal_get_repeated_wall_time_option(): intlcal_get_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_skipped_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 470701cd9150eb17ccf52b70116b1c83da80f553..789623676a2573e3409d6844a59784a44863d2c5 100644 (file)
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_get_time_zone() expects exactly 1 parameter, 2 given in %s on l
 Warning: intlcal_get_time_zone(): intlcal_get_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_time_zone() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 5d27e21101dcf8abd5d5502d32be256d9f96ad24..216d20e4124cbbd73da532a6ca0cbc230e1246ba 100644 (file)
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -28,4 +28,4 @@ Warning: intlcal_get_time() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_time(): intlcal_get_time: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_time() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index 668ebeafb47b5f27514d7e56dc7c01f964fdef4c..9b65244a2506508d8c56f8b289c489534da6395e 100644 (file)
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_get_type() expects exactly 1 parameter, 2 given in %s on line %
 Warning: intlcal_get_type(): intlcal_get_type: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_type() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index f7c9cc7ed1d0371f07f98fcd770cfc83b8d0d8a7..e642fa8ca12f2b5bf4d7495a37163f6b0a27eaec 100644 (file)
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -41,4 +41,4 @@ Warning: intlcal_get_weekend_transition() expects exactly 2 parameters, 1 given
 Warning: intlcal_get_weekend_transition(): intlcal_get_weekend_transition: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_get_weekend_transition() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 653df1a04304169bad967bc608ff3d6271f6f2ae..0764fe267d943eb9c2adacd8ac34fec248290056 100644 (file)
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -98,11 +98,11 @@ bool(false)
 
 Warning: intlcal_get_minimum(): intlcal_get_minimum: invalid field in %s on line %d
 bool(false)
-error: 4096, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_least_maximum() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_maximum() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_greatest_minimum() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_minimum() must be an instance of IntlCalendar, integer given
 

diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index 4940b19b407a6e98d5f39491599eddce597ce124..e117f03a57305a1da3afa295810f8b7ee92f6793 100644 (file)
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -105,9 +105,9 @@ bool(false)
 error: 2, intlcal_get_actual_minimum() expects parameter 2 to be integer, string given
 error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
 bool(false)
-error: 4096, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
 

diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index 9af9aa5048f4b25b2d63c8eb2b34253eb47ced9c..f39f85f625776379b38c86c0de54c8aa659a5341 100644 (file)
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_in_daylight_time() expects exactly 1 parameter, 2 given in %s o
 Warning: intlcal_in_daylight_time(): intlcal_in_daylight_time: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_in_daylight_time() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index 055b0f18e156b6028ffcd9a6a8b6a8708a05e748..740b07b1fee18db69784517c8c420333eb3733bc 100644 (file)
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -50,16 +50,16 @@ try {
 }
 
 --EXPECT--
-error: 4096, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
 
 error: 2, IntlCalendar::isEquivalentTo() expects exactly 1 parameter, 2 given
 error: 2, IntlCalendar::isEquivalentTo(): intlcal_is_equivalent_to: bad arguments
 bool(false)
-error: 4096, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to IntlCalendar::isEquivalentTo() must be an instance of IntlCalendar, integer given
 
 error: 2, intlcal_is_equivalent_to() expects exactly 2 parameters, 1 given
 error: 2, intlcal_is_equivalent_to(): intlcal_is_equivalent_to: bad arguments
 bool(false)
-error: 4096, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 1, Argument 2 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
 
-error: 4096, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_is_equivalent_to() must be an instance of IntlCalendar, integer given

diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index 7ddde1ae02c5b4a0778ae4ec9c0fd59891d014db..ea4aab2a13f51053963d35112a39b5ea3a7d57e2 100644 (file)
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -29,4 +29,4 @@ Warning: intlcal_is_lenient() expects exactly 1 parameter, 2 given in %s on line
 Warning: intlcal_is_lenient(): intlcal_is_lenient: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_is_lenient() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index f238d776b28520d17e0a4a56badc1c2195354615..66060fc081439b6779a358e05adaba3424101b20 100644 (file)
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -39,4 +39,4 @@ Warning: intlcal_is_set() expects exactly 2 parameters, 1 given in %s on line %d
 Warning: intlcal_is_set(): intlcal_is_set: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_is_set() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index ebd1ca3dc0684a4b37834975bfe9eb35ffd512ad..cac7a0de8b0cfb9a52f0b29f2a1b7a3c20647514 100644 (file)
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -35,4 +35,4 @@ Warning: intlcal_is_weekend() expects parameter 2 to be float, string given in %
 Warning: intlcal_is_weekend(): intlcal_is_weekend: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_is_weekend() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index a56739469905a344c2f292a4d724a548c4f6c34b..e8669baabe295bc0bee7252948a7dda4af974c2e 100644 (file)
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -34,4 +34,4 @@ bool(false)
 Warning: intlcal_roll(): intlcal_set: too many arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_roll() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 98237e56fa2c489b00e4b5ea2957c1f472475414..bbbbcf30fb16bc658d60ef1b727430132b4db296 100644 (file)
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -37,4 +37,4 @@ bool(false)
 Warning: intlcal_set_first_day_of_week(): intlcal_set_first_day_of_week: invalid day of week in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set_first_day_of_week() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 2b1d7b016d70be446e283cbe20a7e7a760ac93c3..37817c61c2e34325f1626e73f9e521ac9ee5e22f 100644 (file)
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -41,4 +41,4 @@ Warning: intlcal_set_lenient() expects parameter 2 to be boolean, array given in
 Warning: intlcal_set_lenient(): intlcal_set_lenient: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set_lenient() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index c133558ddc5c3dd5378e9bccba86fd7c12b0cffc..098c46a44a4bb0af0eb641b362c89934ca05697a 100644 (file)
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -36,5 +36,5 @@ bool(false)
 Warning: intlcal_set_minimal_days_in_first_week(): intlcal_set_minimal_days_in_first_week: invalid number of days; must be between 1 and 7 in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set_minimal_days_in_first_week() must be an instance of IntlCalendar, integer given in %s on line %d
 

diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 817246640a7a840eb1ba8b0682c48b296bf5f8ea..2621e11d52e4efbbb9cd36332f5a5f6be6ac3658 100644 (file)
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -79,4 +79,4 @@ Warning: intlcal_set_repeated_wall_time_option() expects exactly 2 parameters, 1
 Warning: intlcal_set_repeated_wall_time_option(): intlcal_set_repeated_wall_time_option: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set_repeated_wall_time_option() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 70e5380ef8dbdc2eb5721c022e3419639b6bf9b2..6230efad8add9b4218a5c049b14d2bf44dbb41d8 100644 (file)
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -51,4 +51,4 @@ bool(false)
 error: 2, intlcal_set_time_zone() expects exactly 2 parameters, 3 given
 error: 2, intlcal_set_time_zone(): intlcal_set_time_zone: bad arguments
 bool(false)
-error: 4096, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given
+error: 1, Argument 1 passed to intlcal_set_time_zone() must be an instance of IntlCalendar, integer given

diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index 6586ed6a1a46b9c1cca75bd4233941b43ab2b565..f00597b00d6ad821acee5047876154073c8ba139 100644 (file)
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -34,4 +34,4 @@ Warning: intlcal_set_time() expects exactly 2 parameters, 3 given in %s on line
 Warning: intlcal_set_time(): intlcal_set_time: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set_time() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index 669b1888e02d3f633aba7379c0aa40dbc9f2a780..a61e63117488077a28fb9665d63380a1e465efc7 100644 (file)
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -38,4 +38,4 @@ bool(false)
 Warning: intlcal_set(): intlcal_set: invalid field in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_set() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index 961a9c86a6a1dd3ebf842ea662d4adda6768de78..ac31e75ab525f33fcea1707f8458d91a0e56b97d 100644 (file)
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -38,4 +38,4 @@ bool(false)
 Warning: IntlCalendar::toDateTime(): intlcal_to_date_time: DateTimeZone constructor threw exception in %s on line %d
 string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)"
 
-Catchable fatal error: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlcal_to_date_time() must be an instance of IntlCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index 58d566223b6850f8392e50294c154ce0ba3cf180..6d7862f94120757da138db5185c2f64a0f9ea447 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -27,4 +27,4 @@ Warning: intlgregcal_get_gregorian_change() expects exactly 1 parameter, 2 given
 Warning: intlgregcal_get_gregorian_change(): intlgregcal_get_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlgregcal_get_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 279744f195bf17722b34b0a1f48d357f91150980..5c72929c94abd0bb6e9565d4205433d2f08d30b2 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -45,4 +45,4 @@ Warning: intlgregcal_is_leap_year() expects exactly 2 parameters, 1 given in %s
 Warning: intlgregcal_is_leap_year(): intlgregcal_is_leap_year: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlgregcal_is_leap_year() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
index 2ee6ff572fc854b0e9a6d79f70a33aefa19ea01a..5c426b34866a9637c8cdc8a31e682bcd13ed7c7c 100644 (file)
--- a/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_setGregorianChange_error.phpt
@@ -39,4 +39,4 @@ Warning: intlgregcal_set_gregorian_change() expects exactly 2 parameters, 1 give
 Warning: intlgregcal_set_gregorian_change(): intlgregcal_set_gregorian_change: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d
+Fatal error: Argument 1 passed to intlgregcal_set_gregorian_change() must be an instance of IntlGregorianCalendar, integer given in %s on line %d

diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index e1469f4ac6d654e698dae850eba2bee4b33c4b99..bd78e9f8f4b04224705e1113b9f50d8d9573f49f 100644 (file)
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -20,4 +20,4 @@ Warning: IntlTimeZone::getDSTSavings() expects exactly 0 parameters, 1 given in
 Warning: IntlTimeZone::getDSTSavings(): intltz_get_dst_savings: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_dst_savings() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 01919a328ebe7557150b1920ea69017537a83f12..8a527cd925922ffeb727f37e11f0240739d93efc 100644 (file)
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -42,4 +42,4 @@ Warning: IntlTimeZone::getDisplayName() expects at most 3 parameters, 4 given in
 Warning: IntlTimeZone::getDisplayName(): intltz_get_display_name: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_display_name() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index b56d3b0a48a02f8cb2ed4d045144f8f97c7cffd7..cb28628bf3afd70f3046d475f233e9fe69c99834 100644 (file)
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -20,4 +20,4 @@ Warning: IntlTimeZone::getErrorCode() expects exactly 0 parameters, 1 given in %
 Warning: IntlTimeZone::getErrorCode(): intltz_get_error_code: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_error_code() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index 067dcdc13b8081d4dc947f19356bbbe2732b1228..2ef5aa75f1892352802fe013fb55120b249ef356 100644 (file)
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -20,4 +20,4 @@ Warning: IntlTimeZone::getErrorMessage() expects exactly 0 parameters, 1 given i
 Warning: IntlTimeZone::getErrorMessage(): intltz_get_error_message: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_error_message() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index b239b3facf6371c11ef89eb8a5cd7a09e954fd19..ad2853250804c4c7938320f01a86cbd91d4f5326 100644 (file)
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -20,4 +20,4 @@ Warning: IntlTimeZone::getID() expects exactly 0 parameters, 1 given in %s on li
 Warning: IntlTimeZone::getID(): intltz_get_id: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_id() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index 73555002c02e9e9ace03301ca180da3916e591c7..296eb1dd1a087008393dc88cda6acd0888366608 100644 (file)
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -30,4 +30,4 @@ Warning: IntlTimeZone::getOffset() expects exactly 4 parameters, 5 given in %s o
 Warning: IntlTimeZone::getOffset(): intltz_get_offset: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_offset() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index eb6aac02cd0ddad45d65441bed26857f6c305a40..2d23b4ee1885414f79c5d9820dd1c75526443403 100644 (file)
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -20,4 +20,4 @@ Warning: IntlTimeZone::getRawOffset() expects exactly 0 parameters, 1 given in %
 Warning: IntlTimeZone::getRawOffset(): intltz_get_raw_offset: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_get_raw_offset() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index 102dfc9f8d00a7c3da5abe5665270b1129f9f5ee..d3c25661e3f050f8c5f0f9d53e765b0b365b72dc 100644 (file)
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -31,9 +31,9 @@ try {
 }
 
 --EXPECT--
-int(4096)
+int(1)
 string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given"
 
-int(4096)
+int(1)
 string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given"
 

diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index e48d7aca92135788503b08c3c999361890e76d65..aa33f9196d665bd3fad87c8bfe783e32548bee65 100644 (file)
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -35,4 +35,4 @@ Warning: intltz_to_date_time_zone() expects exactly 1 parameter, 0 given in %s o
 Warning: intltz_to_date_time_zone(): intltz_to_date_time_zone: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s on line %d
+Fatal error: Argument 1 passed to intltz_to_date_time_zone() must be an instance of IntlTimeZone, integer given in %s on line %d

diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index aa5ca6cfca02ea5b42368d335c7e1fca1f8886b0..455a9acf11f3e87bf5dd6a6a718ffaeb29340177 100644 (file)
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -19,4 +19,4 @@ Warning: IntlTimeZone::useDaylightTime() expects exactly 0 parameters, 1 given i
 Warning: IntlTimeZone::useDaylightTime(): intltz_use_daylight_time: bad arguments in %s on line %d
 bool(false)
 
-Catchable fatal error: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s on line %d
+Fatal error: Argument 1 passed to intltz_use_daylight_time() must be an instance of IntlTimeZone, null given in %s on line %d

diff --git a/ext/intl/tests/transliterator_create_inverse_error.phpt b/ext/intl/tests/transliterator_create_inverse_error.phpt
index 92141c93d455d38d1ae5987974b5c8c407d1684d..6f6caeffad9955e1e5be05b72002089f5c1cf0cf 100644 (file)
--- a/ext/intl/tests/transliterator_create_inverse_error.phpt
+++ b/ext/intl/tests/transliterator_create_inverse_error.phpt
@@ -18,4 +18,4 @@ Warning: Transliterator::createInverse() expects exactly 0 parameters, 1 given i
 
 Warning: Transliterator::createInverse(): transliterator_create_inverse: bad arguments in %s on line %d
 
-Catchable fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s on line %d
+Fatal error: Argument 1 passed to transliterator_create_inverse() must be an instance of Transliterator, string given in %s on line %d

diff --git a/ext/intl/tests/transliterator_get_error_code_error.phpt b/ext/intl/tests/transliterator_get_error_code_error.phpt
index 94daa120d75a28432130483c560e439a99969d7a..3d68d20927eec679a9a0fae7bd7ed5a6d45a4d11 100644 (file)
--- a/ext/intl/tests/transliterator_get_error_code_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_code_error.phpt
@@ -21,4 +21,4 @@ Warning: Transliterator::getErrorCode() expects exactly 0 parameters, 1 given in
 Warning: Transliterator::getErrorCode(): transliterator_get_error_code: unable to parse input params in %s on line %d
 
 
-Catchable fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s on line %d
+Fatal error: Argument 1 passed to transliterator_get_error_code() must be an instance of Transliterator, array given in %s on line %d

diff --git a/ext/intl/tests/transliterator_get_error_message_error.phpt b/ext/intl/tests/transliterator_get_error_message_error.phpt
index 4ab21045b27a33e2e5c768a9b6357187944ecce9..5fe89afdb3fa64fc098fb4b80e4d60d21b2273e6 100644 (file)
--- a/ext/intl/tests/transliterator_get_error_message_error.phpt
+++ b/ext/intl/tests/transliterator_get_error_message_error.phpt
@@ -21,4 +21,4 @@ Warning: Transliterator::getErrorMessage() expects exactly 0 parameters, 1 given
 Warning: Transliterator::getErrorMessage(): transliterator_get_error_message: unable to parse input params in %s on line %d
 
 
-Catchable fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s on line %d
+Fatal error: Argument 1 passed to transliterator_get_error_message() must be an instance of Transliterator, array given in %s on line %d

diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index c83e12649567abb53714c59e76d19e3e328919f1..8cab16ca4d9210ef6935347180f757a352c1b23d 100644 (file)
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #33491 (extended mysqli class crashes when result is not object)
 --INI--
-error_reporting=4096
+error_reporting=1
 --SKIPIF--
 <?php 
 require_once('skipif.inc'); 
@@ -26,4 +26,4 @@ $DB->query_single('SELECT DATE()');
 
 ?>
 --EXPECTF--
-Catchable fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d
+Fatal error: Call to a member function fetch_row() on boolean in %sbug33491.php on line %d

diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt
index 06c721ac879b570126534c91f69769413ee471d3..0820a20b81e2e26a20bc9434c89f130320085808 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user_new.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_new.phpt
@@ -41,4 +41,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d
 Warning: mysqli_query(): Error reading result set's header in %s on line %d
 [003] [2006] MySQL server has gone away
 
-Catchable fatal error: Call to a member function fetch_assoc() on %s in %s on line %d
+Fatal error: Call to a member function fetch_assoc() on %s in %s on line %d

diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt
index 0a970a82b82d86b834327bf5d3f1d2eef5e9ab3e..25457346d75fa43611a2e1dd395170eab7474ad7 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object.phpt
@@ -150,6 +150,6 @@ NULL
 NULL
 [E_WARNING] mysqli_fetch_object(): Couldn't fetch mysqli_result in %s on line %d
 NULL
-[E_RECOVERABLE_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d
+[E_ERROR] Argument 3 passed to mysqli_fetch_object() must be of the type array, string given in %s on line %d
 
-Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d
\ No newline at end of file
+Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d

diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index ff53fbefcdfedad3aacfa0017272aae7084ec19e..b5ebd110a4f140c1adfd585c11ceb5f62a8396d3 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -129,9 +129,9 @@ require_once('skipifconnectfailure.inc');
 %s on line %d
 [E_WARNING] mysqli_result::fetch_object(): Couldn't fetch mysqli_result in %s on line %d
 [E_WARNING] mysqli_result::fetch_object() expects parameter 1 to be string, object given in %s on line %d
-[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
-[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
-[E_RECOVERABLE_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, null given in %s on line %d
+[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
+[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, object given in %s on line %d
+[E_ERROR] Argument 2 passed to mysqli_result::fetch_object() must be of the type array, null given in %s on line %d
 [E_WARNING] Missing argument 2 for mysqli_fetch_object_construct::__construct() in %s on line %d
 [E_NOTICE] Undefined variable: b in %s on line %d
 NULL

diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
index 0beca905cd34a0a169bb12c1e8644790f057dacc..224684b8782d9edfc36440feec78360716ed258c 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
@@ -93,4 +93,4 @@ array(1) {
 
 Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d
 
-Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Call to a member function execute() on boolean in %s on line %d

diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
index fc5554722f79a7703b2aadfa79367bac17c0df5d..b7b0ab6294cc1451825e5c9f6795913ab75e0ca6 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
@@ -36,4 +36,4 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named
 
 Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d
 
-Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Call to a member function execute() on boolean in %s on line %d

diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
index 36295e9c5e52f46700c7e134ecf480a6fc76c7f9..c16ce5dd1cbdcb3ab98aab96334783955c0a0fa4 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
@@ -56,4 +56,4 @@ Testing native PS...
 
 Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d
 
-Catchable fatal error: Call to a member function execute() on boolean in %s on line %d
+Fatal error: Call to a member function execute() on boolean in %s on line %d

diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
index 278cd4e7f841c6f47255ff38563a609b95f93293..b367f3e188be15c28665b11bdbf5c18c2fe0d092 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
@@ -99,4 +99,4 @@ Native Prepared Statements...
 
 Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d
 
-Catchable fatal error: Call to a member function errorInfo() on boolean in %s on line %d
\ No newline at end of file
+Fatal error: Call to a member function errorInfo() on boolean in %s on line %d
\ No newline at end of file

diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
index dd6f4384eecdab29915bbed9b33807901c41c26f..b06818901dc2066f9324820c9a0d9996a02ac6a7 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
@@ -17,4 +17,4 @@ var_dump($a);
 ?>
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s on line 8
+Fatal error: Argument 1 passed to ReflectionClass::newInstanceArgs() must be of the type array, string given in %s on line 8

diff --git a/ext/reflection/tests/bug64007.phpt b/ext/reflection/tests/bug64007.phpt
index ae3ec503289ea924d7851cfc091fa0fa95abd85e..50149a2a74c0e79c83337085ace34aa929d4502a 100644 (file)
--- a/ext/reflection/tests/bug64007.phpt
+++ b/ext/reflection/tests/bug64007.phpt
@@ -16,4 +16,4 @@ var_dump($generator);
 --EXPECTF--
 string(%d) "Class Generator is an internal class marked as final that cannot be instantiated without invoking its constructor"
 
-Catchable fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d
+Fatal error: The "Generator" class is reserved for internal use and cannot be manually instantiated in %sbug64007.php on line %d

diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index f0a599f2299ca09dee2097e6bc66b12d420156b7..2d5184495e21ec21faf0750631e8a57b2c0a3df7 100644 (file)
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -11,4 +11,4 @@ Notice: Undefined variable: x in %s on line %d
 
 Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d
 
-Catchable fatal error: Call to a member function xpath() on null in %s on line %d
+Fatal error: Call to a member function xpath() on null in %s on line %d

diff --git a/ext/spl/tests/iterator_count.phpt b/ext/spl/tests/iterator_count.phpt
index 9aa4e1197c99cea81b13a0f980e289dd9f17fefc..a93bf840ba20bff1a99599d25acf74ad9f6c5691 100644 (file)
--- a/ext/spl/tests/iterator_count.phpt
+++ b/ext/spl/tests/iterator_count.phpt
@@ -23,4 +23,4 @@ Warning: iterator_count() expects exactly 1 parameter, 0 given in %s
 
 Warning: iterator_count() expects exactly 1 parameter, 2 given in %s
 
-Catchable fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s
+Fatal error: Argument 1 passed to iterator_count() must implement interface Traversable, %unicode_string_optional% given %s

diff --git a/ext/spl/tests/iterator_to_array.phpt b/ext/spl/tests/iterator_to_array.phpt
index 958d370cca71bc78a289d0b8f842692e28d12425..6ea19cee7ff5cee0ac4aeddfdb8eba672919b7ce 100644 (file)
--- a/ext/spl/tests/iterator_to_array.phpt
+++ b/ext/spl/tests/iterator_to_array.phpt
@@ -22,4 +22,4 @@ Warning: iterator_to_array() expects at least 1 parameter, 0 given in %s
 
 Warning: iterator_to_array() expects at most 2 parameters, 3 given in %s
 
-Catchable fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s
+Fatal error: Argument 1 passed to iterator_to_array() must implement interface Traversable, %unicode_string_optional% given %s

diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt
index 1e4c8c50c6bb9a347f1a6b0eda92885e25950547..a4521423846efad3c566e1603f8b1f0f3d425bd8 100644 (file)
--- a/ext/standard/tests/file/bug38450_3.phpt
+++ b/ext/standard/tests/file/bug38450_3.phpt
@@ -104,4 +104,4 @@ echo "Done\n";
 --EXPECTF--    
 Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d
 
-Catchable fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s on line %d
+Fatal error: Argument 1 passed to VariableStream::__construct() must be of the type array, none given in %s on line %d

diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt
index 46f6055fefa0978cb80cb50ad3f6178a9c083aee..7b7e88dd26560e9a05e66e51c5b7adef42bfd282 100644 (file)
--- a/tests/classes/autoload_009.phpt
+++ b/tests/classes/autoload_009.phpt
@@ -15,6 +15,6 @@ Ensure type hints for unknown types do not trigger autoload.
 ?>
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s
+Fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s
 
 

diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt
index f9ab92bb151a1d05a1b6a5db6cc06571a620a1a0..f95cbc1ef3816c6a6e5834d1bae1a81cb09ad65e 100644 (file)
--- a/tests/classes/interfaces_003.phpt
+++ b/tests/classes/interfaces_003.phpt
@@ -23,4 +23,4 @@ $obj = new MyTestClass;
 ===DONE===
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d
+Fatal error: Argument 1 passed to MyTestClass::__construct() must be an instance of MyObject, none given, called in %sinterfaces_003.php on line %d

diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index f55dd53bf4c9351722b7f797e571e397f4ec48c9..5479a4c19364b034e8f694aa77d0c1ea5851b473 100644 (file)
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -35,4 +35,4 @@ $a->b($b);
 ?>
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12
+Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s on line 12

diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt
index 7c685bfdba3e39aef3832f6c08e4906e84a8f7ca..7c0581624bfb63dec4dc601dd4681f45ebd06936 100644 (file)
--- a/tests/classes/type_hinting_002.phpt
+++ b/tests/classes/type_hinting_002.phpt
@@ -13,4 +13,4 @@ $o = new Foo;
 $o->a($o);
 ?>
 --EXPECTF--
-Catchable fatal error: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s on line %d

diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
index a966210fbaa037ecac96e4c067db4f4bf05d14d9..fbfe0cefeb4512e909732b58f12057278afa8970 100644 (file)
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
@@ -57,4 +57,4 @@ array(1) {
   int(25)
 }
 
-Catchable fatal error: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s on line %d
+Fatal error: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s on line %d

diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
index 70637173bde498a002e9efd0e7d6c281fb4f18b2..d533699b8b7cfe2f73baf19d0ac1e6f633310e1c 100644 (file)
--- a/tests/classes/type_hinting_004.phpt
+++ b/tests/classes/type_hinting_004.phpt
@@ -149,10 +149,10 @@ Ensure type hints are enforced for functions invoked as callbacks.
 ?>
 --EXPECTF--
 ---> Type hints with callback function:
-4096: Argument 1 passed to f1() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to f1() must be an instance of A, integer given%s(%d)
 
 in f1;
-4096: Argument 1 passed to f2() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to f2() must be an instance of A, integer given%s(%d)
 
 in f2;
 in f2;
@@ -160,10 +160,10 @@ in f2;
 
 
 ---> Type hints with callback static method:
-4096: Argument 1 passed to C::f1() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to C::f1() must be an instance of A, integer given%s(%d)
 
 in C::f1 (static);
-4096: Argument 1 passed to C::f2() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to C::f2() must be an instance of A, integer given%s(%d)
 
 in C::f2 (static);
 in C::f2 (static);
@@ -171,10 +171,10 @@ in C::f2 (static);
 
 
 ---> Type hints with callback instance method:
-4096: Argument 1 passed to D::f1() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to D::f1() must be an instance of A, integer given%s(%d)
 
 in C::f1 (instance);
-4096: Argument 1 passed to D::f2() must be an instance of A, integer given%s(%d)
+1: Argument 1 passed to D::f2() must be an instance of A, integer given%s(%d)
 
 in C::f2 (instance);
 in C::f2 (instance);

diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt
index 944fe44ce8f7a0308425a5845dd52fd77e26dc3d..635eb8cd0c8d699dca636224bb6ac5ba9f53d013 100644 (file)
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -53,4 +53,4 @@ int(2)
 object(foo)#%d (0) {
 }
 
-Catchable fatal error: Argument 1 passed to typehint() must be an instance of foo, integer given in %s on line %d
+Fatal error: Argument 1 passed to typehint() must be an instance of foo, integer given in %s on line %d

diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt
index f6bbdd976deeb4be0cf087efde7b0c76371cdb01..e3e36924408e10d8c5e0fd03c44f15d80556da3f 100644 (file)
--- a/tests/lang/catchable_error_001.phpt
+++ b/tests/lang/catchable_error_001.phpt
@@ -19,4 +19,4 @@ Catchable fatal error [1]
        echo "ALIVE!\n";
 ?>
 --EXPECTF--
-Catchable fatal error: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5
+Fatal error: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php on line 5

diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index 57808d474f6a88897c1baac64f783c7672d004af..48004ba97f9cdc975fa693c42e700e13acd62210 100644 (file)
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -23,4 +23,4 @@ type_hint_foo($bar);
 ?>
 --EXPECTF--
 
-Catchable fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s on line 9
+Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s on line 9