summaryrefslogtreecommitdiff
path: root/ext/reflection
diff options
context:
space:
mode:
Diffstat (limited to 'ext/reflection')
-rw-r--r--ext/reflection/tests/ReflectionClass_getMethod_002.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_002.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionExtension_constructor_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionFunction_construct.001.phpt4
-rw-r--r--ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_invoke_basic.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_invoke_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionReference_errors.phpt2
-rw-r--r--ext/reflection/tests/bug42976.phpt4
-rw-r--r--ext/reflection/tests/request38992.phpt4
13 files changed, 18 insertions, 18 deletions
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
index 721ad337cc..e48d43587e 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
@@ -62,5 +62,5 @@ Method does not exist
Method 1 does not exist
Method 1.5 does not exist
Method 1 does not exist
-ReflectionClass::getMethod() expects argument #1 ($name) to be of type string, array given
-ReflectionClass::getMethod() expects argument #1 ($name) to be of type string, object given
+ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, array given
+ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, object given
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
index dd3b5f33a2..86060c8acf 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
@@ -60,5 +60,5 @@ Property does not exist
Property 1 does not exist
Property 1.5 does not exist
Property 1 does not exist
-ReflectionClass::getProperty() expects argument #1 ($name) to be of type string, array given
-ReflectionClass::getProperty() expects argument #1 ($name) to be of type string, object given
+ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, array given
+ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, object given
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
index 2cdbcebefb..e034e08215 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
@@ -43,4 +43,4 @@ ReflectionClass::getStaticPropertyValue() expects at most 2 parameters, 3 given
ReflectionClass::getStaticPropertyValue() expects at least 1 parameter, 0 given
Class C does not have a property named
string(3) "def"
-ReflectionClass::getStaticPropertyValue() expects argument #1 ($name) to be of type string, array given
+ReflectionClass::getStaticPropertyValue(): Argument #1 ($name) must be of type string, array given
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
index 1805607e19..e7256ea2cb 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_002.phpt
@@ -16,7 +16,7 @@ var_dump($a);
?>
--EXPECTF--
-Fatal error: Uncaught TypeError: ReflectionClass::newInstanceArgs() expects argument #1 ($args) to be of type array, string given in %s:%d
+Fatal error: Uncaught TypeError: ReflectionClass::newInstanceArgs(): Argument #1 ($args) must be of type array, string given in %s:%d
Stack trace:
#0 %s(%d): ReflectionClass->newInstanceArgs('x')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
index 87cb894ea8..b9bb76c786 100644
--- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_002.phpt
@@ -49,4 +49,4 @@ ReflectionClass::setStaticPropertyValue() expects exactly 2 parameters, 0 given
ReflectionClass::setStaticPropertyValue() expects exactly 2 parameters, 1 given
Class C does not have a property named
Class C does not have a property named 1.5
-ReflectionClass::setStaticPropertyValue() expects argument #1 ($name) to be of type string, array given
+ReflectionClass::setStaticPropertyValue(): Argument #1 ($name) must be of type string, array given
diff --git a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
index 1047c927dc..ccf2414e43 100644
--- a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
@@ -28,4 +28,4 @@ try {
--EXPECTF--
Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given
Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given
-Ok - ReflectionExtension::__construct() expects argument #1 ($name) to be of type string, array given
+Ok - ReflectionExtension::__construct(): Argument #1 ($name) must be of type string, array given
diff --git a/ext/reflection/tests/ReflectionFunction_construct.001.phpt b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
index dbd829252b..1772ba5b68 100644
--- a/ext/reflection/tests/ReflectionFunction_construct.001.phpt
+++ b/ext/reflection/tests/ReflectionFunction_construct.001.phpt
@@ -35,8 +35,8 @@ try {
?>
--EXPECT--
-Ok - ReflectionFunction::__construct() expects argument #1 ($name) to be of type string, array given
+Ok - ReflectionFunction::__construct(): Argument #1 ($name) must be of type string, array given
Function nonExistentFunction() does not exist
Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 0 given
Ok - ReflectionFunction::__construct() expects exactly 1 parameter, 2 given
-Ok - ReflectionFunction::__construct() expects argument #1 ($name) to be of type string, array given
+Ok - ReflectionFunction::__construct(): Argument #1 ($name) must be of type string, array given
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
index 0d585d2a73..869682ccdd 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error2.phpt
@@ -24,4 +24,4 @@ try {
?>
--EXPECT--
-string(90) "ReflectionMethod::invokeArgs() expects argument #2 ($args) to be of type array, bool given"
+string(85) "ReflectionMethod::invokeArgs(): Argument #2 ($args) must be of type array, bool given"
diff --git a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
index 3dc0ed626e..5ff9d2e50d 100644
--- a/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invoke_basic.phpt
@@ -103,7 +103,7 @@ NULL
Static method:
ReflectionMethod::invoke() expects at least 1 parameter, 0 given
-ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, bool given
+ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, bool given
Called staticMethod()
Exception: Using $this when not in object context
NULL
diff --git a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
index 8788370b2f..2b50fa8131 100644
--- a/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invoke_error1.phpt
@@ -59,7 +59,7 @@ try {
?>
--EXPECT--
invoke() on a non-object:
-string(89) "ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, bool given"
+string(84) "ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, bool given"
invoke() on a non-instance:
string(72) "Given object is not an instance of the class this method was declared in"
diff --git a/ext/reflection/tests/ReflectionReference_errors.phpt b/ext/reflection/tests/ReflectionReference_errors.phpt
index e70348cba1..33154ba22e 100644
--- a/ext/reflection/tests/ReflectionReference_errors.phpt
+++ b/ext/reflection/tests/ReflectionReference_errors.phpt
@@ -41,7 +41,7 @@ var_dump(unserialize('O:19:"ReflectionReference":0:{}'));
?>
--EXPECTF--
Call to private ReflectionReference::__construct() from invalid context
-ReflectionReference::fromArrayElement() expects argument #1 ($array) to be of type array, object given
+ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, object given
Key must be array or string
Array key not found
Serialization of 'ReflectionReference' is not allowed
diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt
index 014d0d0321..5e5c3c5be5 100644
--- a/ext/reflection/tests/bug42976.phpt
+++ b/ext/reflection/tests/bug42976.phpt
@@ -26,9 +26,9 @@ echo "Done\n";
--EXPECTF--
string(9) "x.changed"
-Warning: C::__construct() expects argument #1 ($x) to be passed by reference, value given in %s on line %d
+Warning: C::__construct(): Argument #1 ($x) must be passed by reference, value given in %s on line %d
string(10) "x.original"
-Warning: C::__construct() expects argument #1 ($x) to be passed by reference, value given in %s on line %d
+Warning: C::__construct(): Argument #1 ($x) must be passed by reference, value given in %s on line %d
string(10) "x.original"
Done
diff --git a/ext/reflection/tests/request38992.phpt b/ext/reflection/tests/request38992.phpt
index 0266cee430..b7cd212551 100644
--- a/ext/reflection/tests/request38992.phpt
+++ b/ext/reflection/tests/request38992.phpt
@@ -23,5 +23,5 @@ try {
}
?>
--EXPECT--
-ReflectionMethod::invoke() expects argument #1 ($object) to be of type object, string given
-ReflectionMethod::invokeArgs() expects argument #1 ($object) to be of type object, string given
+ReflectionMethod::invoke(): Argument #1 ($object) must be of type object, string given
+ReflectionMethod::invokeArgs(): Argument #1 ($object) must be of type object, string given