summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/tests')
-rw-r--r--Zend/tests/array_type_hint_001.phpt2
-rw-r--r--Zend/tests/bug33996.phpt2
-rw-r--r--Zend/tests/bug39003.phpt2
-rw-r--r--Zend/tests/bug42802.phpt2
-rw-r--r--Zend/tests/bug43332_1.phpt2
-rw-r--r--Zend/tests/bug50146.phpt2
-rw-r--r--Zend/tests/bug55705.phpt2
-rw-r--r--Zend/tests/bug68446.phpt2
-rw-r--r--Zend/tests/closure_022.phpt2
-rw-r--r--Zend/tests/closure_027.phpt2
-rw-r--r--Zend/tests/dereference_002.phpt2
-rw-r--r--Zend/tests/generators/errors/generator_instantiate_error.phpt2
-rw-r--r--Zend/tests/methods-on-non-objects-catch.phpt2
-rw-r--r--Zend/tests/methods-on-non-objects-usort.phpt8
-rw-r--r--Zend/tests/methods-on-non-objects.phpt2
-rw-r--r--Zend/tests/ns_071.phpt2
-rw-r--r--Zend/tests/ns_072.phpt2
-rw-r--r--Zend/tests/objects_022.phpt2
-rw-r--r--Zend/tests/return_types/001.phpt2
-rw-r--r--Zend/tests/return_types/002.phpt2
-rw-r--r--Zend/tests/return_types/003.phpt2
-rw-r--r--Zend/tests/return_types/004.phpt2
-rw-r--r--Zend/tests/return_types/005.phpt2
-rw-r--r--Zend/tests/return_types/010.phpt2
-rw-r--r--Zend/tests/return_types/013.phpt2
-rw-r--r--Zend/tests/return_types/rfc001.phpt2
-rw-r--r--Zend/tests/return_types/rfc002.phpt2
-rw-r--r--Zend/tests/return_types/rfc003.phpt2
-rw-r--r--Zend/tests/variadic/typehint_error.phpt2
29 files changed, 32 insertions, 32 deletions
diff --git a/Zend/tests/array_type_hint_001.phpt b/Zend/tests/array_type_hint_001.phpt
index a676992778..8753a26d7a 100644
--- 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 e722eceafb..678f10053e 100644
--- 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 7a3da849bd..8b2c87ce9e 100644
--- 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 2aa7061f35..b74ace1999 100644
--- 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 807c6cb545..1642d6aed0 100644
--- 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 7aa26a6509..2ad1ff6e5a 100644
--- 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 69220bfdeb..e2656cbddb 100644
--- 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 48e6f52f1c..e19610b5ca 100644
--- 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 8621d2c095..25fbe931d8 100644
--- 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 f26e114045..442615c278 100644
--- 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 cc0f27d534..da13decc39 100644
--- 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 f8941c087a..990c7481c6 100644
--- 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 b38da3657b..5e946161c1 100644
--- 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 54779cd1ea..cb50d22561 100644
--- 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 01031b8b1d..baf9e1c8c7 100644
--- 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 604e649836..9965fde809 100644
--- 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 c500bfddb7..2ae417e957 100644
--- 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 5a80e0a411..3c2e0d4a51 100644
--- 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 a751bd3f2f..c09d627be9 100644
--- 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 d8b77925e3..553611597d 100644
--- 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 0ca023b308..26a827158b 100644
--- 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 44712f5dba..41f06bf014 100644
--- 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 5b979a3b67..d3ae04769a 100644
--- 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 75deb3a32b..5f53220815 100644
--- 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 ca03d2f983..ee6568522f 100644
--- 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 4d5275227d..df96e7edb8 100644
--- 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 29b5ed3220..7ccef60d3d 100644
--- 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 3aad309b47..1fdf19f612 100644
--- 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 3006b99957..2661567224 100644
--- 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