summaryrefslogtreecommitdiff
path: root/ext/reflection/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/reflection/tests')
-rw-r--r--ext/reflection/tests/007.phpt3
-rw-r--r--ext/reflection/tests/008.phpt12
-rw-r--r--ext/reflection/tests/ReflectionClassConstant_basic1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_constructor_002.phpt10
-rw-r--r--ext/reflection/tests/ReflectionClass_getMethod_001.phpt12
-rw-r--r--ext/reflection/tests/ReflectionClass_getMethod_002.phpt8
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_001.phpt26
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_002.phpt8
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_003.phpt38
-rw-r--r--ext/reflection/tests/ReflectionClass_getProperty_004.phpt38
-rw-r--r--ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt4
-rw-r--r--ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt2
-rw-r--r--ext/reflection/tests/ReflectionMethod_constructor_error1.phpt6
-rw-r--r--ext/reflection/tests/ReflectionMethod_constructor_error2.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt2
-rw-r--r--ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_constructor_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_getValue_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_isInitialized.phpt2
-rw-r--r--ext/reflection/tests/ReflectionProperty_setAccessible.phpt14
-rw-r--r--ext/reflection/tests/ReflectionProperty_setValue_error.phpt2
-rw-r--r--ext/reflection/tests/ReflectionReference_errors.phpt2
-rw-r--r--ext/reflection/tests/ReflectionZendExtension_error.phpt2
-rw-r--r--ext/reflection/tests/bug37816.phpt2
-rw-r--r--ext/reflection/tests/bug49719.phpt2
-rw-r--r--ext/reflection/tests/bug74673.phpt2
-rw-r--r--ext/reflection/tests/parameters_002.phpt4
31 files changed, 109 insertions, 110 deletions
diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt
index df1d97eea9..53622ec19c 100644
--- a/ext/reflection/tests/007.phpt
+++ b/ext/reflection/tests/007.phpt
@@ -91,7 +91,7 @@ test('WithCtorWithArgs');
--EXPECTF--
====>Class_does_not_exist
{closure}(Class_does_not_exist)
-string(41) "Class Class_does_not_exist does not exist"
+string(43) "Class "Class_does_not_exist" does not exist"
====>NoCtor
====>newInstance()
object(NoCtor)#%d (0) {
@@ -148,4 +148,3 @@ array(2) {
}
object(WithCtorWithArgs)#%d (0) {
}
-
diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt
index 0b9a867884..99081c66df 100644
--- a/ext/reflection/tests/008.phpt
+++ b/ext/reflection/tests/008.phpt
@@ -29,11 +29,11 @@ echo "Done\n";
--EXPECT--
string(91) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name"
string(91) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name"
-string(21) "Class does not exist"
-string(22) "Class a does not exist"
-string(21) "Class does not exist"
-string(22) "Class a does not exist"
-string(21) "Class does not exist"
+string(23) "Class "" does not exist"
+string(24) "Class "a" does not exist"
+string(23) "Class "" does not exist"
+string(24) "Class "a" does not exist"
+string(23) "Class "" does not exist"
string(104) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be of type object|string, int given"
-string(21) "Class does not exist"
+string(23) "Class "" does not exist"
Done
diff --git a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
index 414fac8543..2ab8990d95 100644
--- a/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClassConstant_basic1.phpt
@@ -154,7 +154,7 @@ bool(false)
**********************************
-Fatal error: Uncaught ReflectionException: Class Constant TestClass::BAD_CONST does not exist in %s:%d
+Fatal error: Uncaught ReflectionException: Constant TestClass::BAD_CONST does not exist in %s:%d
Stack trace:
#0 %s(%d): ReflectionClassConstant->__construct(Object(TestClass), 'BAD_CONST')
#1 %s(%d): reflectClassConstant(Object(TestClass), 'BAD_CONST')
diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
index 3744fec06c..54f4b8eda2 100644
--- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
@@ -47,11 +47,11 @@ try {
?>
--EXPECTF--
ReflectionClass::__construct() expects exactly 1 parameter, 0 given
-Class does not exist
-Class 1 does not exist
-Class 1 does not exist
+Class "" does not exist
+Class "1" does not exist
+Class "1" does not exist
Warning: Array to string conversion in %s on line %d
-Class Array does not exist
+Class "Array" does not exist
ReflectionClass::__construct() expects exactly 1 parameter, 2 given
-Class X does not exist
+Class "X" does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
index c8a2ed14ed..4e89466af0 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
@@ -65,7 +65,7 @@ Reflecting on class pubf:
["class"]=>
string(4) "pubf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method pubf::doesNotExist() does not exist
Reflecting on class subpubf:
--> Check for f(): object(ReflectionMethod)#%d (2) {
["name"]=>
@@ -85,7 +85,7 @@ Reflecting on class subpubf:
["class"]=>
string(4) "pubf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method subpubf::doesNotExist() does not exist
Reflecting on class protf:
--> Check for f(): object(ReflectionMethod)#%d (2) {
["name"]=>
@@ -105,7 +105,7 @@ Reflecting on class protf:
["class"]=>
string(5) "protf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method protf::doesNotExist() does not exist
Reflecting on class subprotf:
--> Check for f(): object(ReflectionMethod)#%d (2) {
["name"]=>
@@ -125,7 +125,7 @@ Reflecting on class subprotf:
["class"]=>
string(5) "protf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method subprotf::doesNotExist() does not exist
Reflecting on class privf:
--> Check for f(): object(ReflectionMethod)#%d (2) {
["name"]=>
@@ -145,7 +145,7 @@ Reflecting on class privf:
["class"]=>
string(5) "privf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method privf::doesNotExist() does not exist
Reflecting on class subprivf:
--> Check for f(): object(ReflectionMethod)#%d (2) {
["name"]=>
@@ -165,4 +165,4 @@ Reflecting on class subprivf:
["class"]=>
string(5) "privf"
}
- --> Check for doesNotExist(): Method doesNotExist does not exist
+ --> Check for doesNotExist(): Method subprivf::doesNotExist() does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
index e5dce75367..99d5bb7e86 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
@@ -58,9 +58,9 @@ try {
Check invalid params:
ReflectionClass::getMethod() expects exactly 1 parameter, 0 given
ReflectionClass::getMethod() expects exactly 1 parameter, 2 given
-Method does not exist
-Method 1 does not exist
-Method 1.5 does not exist
-Method 1 does not exist
+Method C::() does not exist
+Method C::1() does not exist
+Method C::1.5() does not exist
+Method C::1() does not exist
ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, array given
ReflectionClass::getMethod(): Argument #1 ($name) must be of type string, C given
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
index 2d5494b264..e2e6e3ba3c 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
@@ -72,8 +72,8 @@ Reflecting on class pubf:
["class"]=>
string(4) "pubf"
}
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for A: Property pubf::$A does not exist
+ --> Check for doesNotExist: Property pubf::$doesNotExist does not exist
Reflecting on class subpubf:
--> Check for s: object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -87,8 +87,8 @@ Reflecting on class subpubf:
["class"]=>
string(4) "pubf"
}
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for A: Property subpubf::$A does not exist
+ --> Check for doesNotExist: Property subpubf::$doesNotExist does not exist
Reflecting on class protf:
--> Check for s: object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -102,8 +102,8 @@ Reflecting on class protf:
["class"]=>
string(5) "protf"
}
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for A: Property protf::$A does not exist
+ --> Check for doesNotExist: Property protf::$doesNotExist does not exist
Reflecting on class subprotf:
--> Check for s: object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -117,8 +117,8 @@ Reflecting on class subprotf:
["class"]=>
string(5) "protf"
}
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for A: Property subprotf::$A does not exist
+ --> Check for doesNotExist: Property subprotf::$doesNotExist does not exist
Reflecting on class privf:
--> Check for s: object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -132,8 +132,8 @@ Reflecting on class privf:
["class"]=>
string(5) "privf"
}
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for A: Property privf::$A does not exist
+ --> Check for doesNotExist: Property privf::$doesNotExist does not exist
Reflecting on class subprivf:
--> Check for s: object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -141,6 +141,6 @@ Reflecting on class subprivf:
["class"]=>
string(5) "privf"
}
- --> Check for a: Property a does not exist
- --> Check for A: Property A does not exist
- --> Check for doesNotExist: Property doesNotExist does not exist
+ --> Check for a: Property subprivf::$a does not exist
+ --> Check for A: Property subprivf::$A does not exist
+ --> Check for doesNotExist: Property subprivf::$doesNotExist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
index 61d29b89d7..606a124d5c 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
@@ -56,9 +56,9 @@ try {
Check invalid params:
ReflectionClass::getProperty() expects exactly 1 parameter, 0 given
ReflectionClass::getProperty() expects exactly 1 parameter, 2 given
-Property does not exist
-Property 1 does not exist
-Property 1.5 does not exist
-Property 1 does not exist
+Property C::$ does not exist
+Property C::$1 does not exist
+Property C::$1.5 does not exist
+Property C::$1 does not exist
ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, array given
ReflectionClass::getProperty(): Argument #1 ($name) must be of type string, C given
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
index 34ade2fc5e..b3c2ceb88a 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
@@ -110,9 +110,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member C::$protA
+Cannot access non-public property C::$protA
--- (Reflecting on privA) ---
-Property privA does not exist
+Property C::$privA does not exist
--- (Reflecting on pubB) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -128,9 +128,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member C::$protB
+Cannot access non-public property C::$protB
--- (Reflecting on privB) ---
-Property privB does not exist
+Property C::$privB does not exist
--- (Reflecting on pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -146,7 +146,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$protC
+Cannot access non-public property C::$protC
--- (Reflecting on privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -154,9 +154,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$privC
+Cannot access non-public property C::$privC
--- (Reflecting on doesNotExist) ---
-Property doesNotExist does not exist
+Property C::$doesNotExist does not exist
--- (Reflecting on A::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -172,7 +172,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member A::$protC
+Cannot access non-public property A::$protC
--- (Reflecting on A::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -180,7 +180,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member A::$privC
+Cannot access non-public property A::$privC
--- (Reflecting on B::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -196,7 +196,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member B::$protC
+Cannot access non-public property B::$protC
--- (Reflecting on B::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -204,7 +204,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member B::$privC
+Cannot access non-public property B::$privC
--- (Reflecting on c::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -214,7 +214,7 @@ object(ReflectionProperty)#%d (2) {
}
string(9) "pubC in C"
--- (Reflecting on c::PUBC) ---
-Property PUBC does not exist
+Property C::$PUBC does not exist
--- (Reflecting on C::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -230,7 +230,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$protC
+Cannot access non-public property C::$protC
--- (Reflecting on C::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -238,14 +238,14 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$privC
+Cannot access non-public property C::$privC
--- (Reflecting on X::pubC) ---
-Fully qualified property name X::pubC does not specify a base class of C
+Fully qualified property name X::$pubC does not specify a base class of C
--- (Reflecting on X::protC) ---
-Fully qualified property name X::protC does not specify a base class of C
+Fully qualified property name X::$protC does not specify a base class of C
--- (Reflecting on X::privC) ---
-Fully qualified property name X::privC does not specify a base class of C
+Fully qualified property name X::$privC does not specify a base class of C
--- (Reflecting on X::doesNotExist) ---
-Fully qualified property name X::doesNotExist does not specify a base class of C
+Fully qualified property name X::$doesNotExist does not specify a base class of C
--- (Reflecting on doesNotexist::doesNotExist) ---
-Class doesnotexist does not exist
+Class "doesnotexist" does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
index b5396aae40..bbc9963d8a 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
@@ -110,9 +110,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member C::$protA
+Cannot access non-public property C::$protA
--- (Reflecting on privA) ---
-Property privA does not exist
+Property C::$privA does not exist
--- (Reflecting on pubB) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -128,9 +128,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member C::$protB
+Cannot access non-public property C::$protB
--- (Reflecting on privB) ---
-Property privB does not exist
+Property C::$privB does not exist
--- (Reflecting on pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -146,7 +146,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$protC
+Cannot access non-public property C::$protC
--- (Reflecting on privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -154,9 +154,9 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$privC
+Cannot access non-public property C::$privC
--- (Reflecting on doesNotExist) ---
-Property doesNotExist does not exist
+Property C::$doesNotExist does not exist
--- (Reflecting on A::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -172,7 +172,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member A::$protC
+Cannot access non-public property A::$protC
--- (Reflecting on A::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -180,7 +180,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "A"
}
-Cannot access non-public member A::$privC
+Cannot access non-public property A::$privC
--- (Reflecting on B::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -196,7 +196,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member B::$protC
+Cannot access non-public property B::$protC
--- (Reflecting on B::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -204,7 +204,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "B"
}
-Cannot access non-public member B::$privC
+Cannot access non-public property B::$privC
--- (Reflecting on c::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -214,7 +214,7 @@ object(ReflectionProperty)#%d (2) {
}
string(9) "pubC in C"
--- (Reflecting on c::PUBC) ---
-Property PUBC does not exist
+Property C::$PUBC does not exist
--- (Reflecting on C::pubC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -230,7 +230,7 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$protC
+Cannot access non-public property C::$protC
--- (Reflecting on C::privC) ---
object(ReflectionProperty)#%d (2) {
["name"]=>
@@ -238,14 +238,14 @@ object(ReflectionProperty)#%d (2) {
["class"]=>
string(1) "C"
}
-Cannot access non-public member C::$privC
+Cannot access non-public property C::$privC
--- (Reflecting on X::pubC) ---
-Fully qualified property name X::pubC does not specify a base class of C
+Fully qualified property name X::$pubC does not specify a base class of C
--- (Reflecting on X::protC) ---
-Fully qualified property name X::protC does not specify a base class of C
+Fully qualified property name X::$protC does not specify a base class of C
--- (Reflecting on X::privC) ---
-Fully qualified property name X::privC does not specify a base class of C
+Fully qualified property name X::$privC does not specify a base class of C
--- (Reflecting on X::doesNotExist) ---
-Fully qualified property name X::doesNotExist does not specify a base class of C
+Fully qualified property name X::$doesNotExist does not specify a base class of C
--- (Reflecting on doesNotexist::doesNotExist) ---
-Class doesnotexist does not exist
+Class "doesnotexist" does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
index 2b4cd27a94..8a1951062f 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
@@ -61,5 +61,5 @@ string(17) "changed protected"
string(14) "changed public"
Retrieving non-existent values from A with no default value:
-Class A does not have a property named protectedDoesNotExist
-Class A does not have a property named privateDoesNotExist
+Property A::$protectedDoesNotExist does not exist
+Property A::$privateDoesNotExist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
index e034e08215..3e21780231 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_002.phpt
@@ -41,6 +41,6 @@ try {
--EXPECT--
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
+Property C::$ does not exist
string(3) "def"
ReflectionClass::getStaticPropertyValue(): Argument #1 ($name) must be of type string, array given
diff --git a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
index d912b568e8..38990073a1 100644
--- a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
@@ -147,5 +147,5 @@ Test bad arguments:
ReflectionClass::implementsInterface() expects exactly 1 parameter, 0 given
ReflectionClass::implementsInterface() expects exactly 1 parameter, 2 given
ReflectionClass::implementsInterface(): Argument #1 ($interface) must be of type ReflectionClass|string, null given
-Interface ThisClassDoesNotExist does not exist
+Interface "ThisClassDoesNotExist" does not exist
ReflectionClass::implementsInterface(): Argument #1 ($interface) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
index 6d4ae500a9..fd9193e0a4 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
@@ -40,5 +40,5 @@ Test bad arguments:
ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given
ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given
ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, null given
-Class ThisClassDoesNotExist does not exist
+Class "ThisClassDoesNotExist" does not exist
ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
index bb4f96818a..1d804641f3 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
@@ -9,7 +9,7 @@ var_dump($rc->isSubclassOf('X'));
?>
--EXPECTF--
-Fatal error: Uncaught ReflectionException: Class X does not exist in %s:5
+Fatal error: Uncaught ReflectionException: Class "X" does not exist in %s:%d
Stack trace:
#0 %s(5): ReflectionClass->isSubclassOf('X')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
index 391beced52..b9b2f35388 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
@@ -80,7 +80,7 @@ Stack trace:
#0 %s ReflectionMethod->__construct(true, 'foo')
#1 {main}
Wrong type of argument (string, bool):
-ReflectionException: Method TestClass::1() does not exist in %s
+ReflectionException: Method TestClass::1() does not exist in %s:%d
Stack trace:
#0 %s ReflectionMethod->__construct('TestClass', '1')
#1 {main}
@@ -90,12 +90,12 @@ Stack trace:
#0 %s ReflectionMethod->__construct('TestClass')
#1 {main}
Class and Method in same string, bad method name:
-ReflectionException: Method TestClass::foop::dedoop() does not exist in %s
+ReflectionException: Method TestClass::foop::dedoop() does not exist in %s:%d
Stack trace:
#0 %s ReflectionMethod->__construct('TestClass::foop...')
#1 {main}
Class and Method in same string, bad class name:
-ReflectionException: Class TestCla does not exist in %s
+ReflectionException: Class "TestCla" does not exist in %s:%d
Stack trace:
#0 %s ReflectionMethod->__construct('TestCla::foo')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
index cf0d3bbbaa..3f5dcb3f6c 100644
--- a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
+++ b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
@@ -56,6 +56,6 @@ Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 0 given
Too many arguments:
Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 3 given
-Ok - Class InvalidClassName does not exist
+Ok - Class "InvalidClassName" does not exist
Ok - ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be of type object|string, array given
Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 2 given
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
index 30f769aa3d..a8a927280e 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
@@ -40,5 +40,5 @@ Test bad arguments:
ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given
ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given
ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, null given
-Class ThisClassDoesNotExist does not exist
+Class "ThisClassDoesNotExist" does not exist
ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
index 582bcffe65..71079650fe 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
@@ -9,7 +9,7 @@ var_dump($ro->isSubclassOf('X'));
?>
--EXPECTF--
-Fatal error: Uncaught ReflectionException: Class X does not exist in %s:%d
+Fatal error: Uncaught ReflectionException: Class "X" does not exist in %s:%d
Stack trace:
#0 %s(%d): ReflectionClass->isSubclassOf('X')
#1 {main}
diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
index fd83e30aaa..5fa249a9b5 100644
--- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
+++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
@@ -40,7 +40,7 @@ echo "Done.\n";
?>
--EXPECT--
-Class A does not exist
+Class "A" does not exist
Method C::b() does not exist
Method C::b() does not exist
Ok - ReflectionParameter::__construct() expects exactly 2 parameters, 1 given
diff --git a/ext/reflection/tests/ReflectionProperty_constructor_error.phpt b/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
index a2df954309..cf5fa00396 100644
--- a/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
@@ -35,7 +35,7 @@ catch(Exception $e) {
?>
--EXPECT--
Non-existent class:
-Class NonExistentClass does not exist
+Class "NonExistentClass" does not exist
Wrong property parameter type:
ReflectionProperty::__construct(): Argument #1 ($class) must be of type object|string, int given
diff --git a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
index 40254319cc..49b3c7bd9a 100644
--- a/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
@@ -60,7 +60,7 @@ Static property / too many args:
ReflectionProperty::getValue() expects at most 1 parameter, 2 given
Protected property:
-Cannot access non-public member TestClass::$prot
+Cannot access non-public property TestClass::$prot
Invalid instance:
Given object is not an instance of the class this property was declared in
diff --git a/ext/reflection/tests/ReflectionProperty_isInitialized.phpt b/ext/reflection/tests/ReflectionProperty_isInitialized.phpt
index ac87873c6a..74e25252d1 100644
--- a/ext/reflection/tests/ReflectionProperty_isInitialized.phpt
+++ b/ext/reflection/tests/ReflectionProperty_isInitialized.phpt
@@ -109,7 +109,7 @@ Dynamic properties:
bool(true)
bool(false)
Visibility handling:
-Cannot access non-public member A::$p
+Cannot access non-public property A::$p
bool(false)
Object type:
bool(false)
diff --git a/ext/reflection/tests/ReflectionProperty_setAccessible.phpt b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
index fd82a47198..f0d49a56cb 100644
--- a/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
@@ -116,10 +116,10 @@ var_dump($protectedStatic->getValue());
var_dump($private->getValue($b));
?>
--EXPECT--
-string(45) "Cannot access non-public member A::$protected"
-string(51) "Cannot access non-public member A::$protectedStatic"
-string(43) "Cannot access non-public member A::$private"
-string(49) "Cannot access non-public member A::$privateStatic"
+string(47) "Cannot access non-public property A::$protected"
+string(53) "Cannot access non-public property A::$protectedStatic"
+string(45) "Cannot access non-public property A::$private"
+string(51) "Cannot access non-public property A::$privateStatic"
string(1) "a"
string(1) "b"
string(1) "c"
@@ -128,9 +128,9 @@ string(1) "e"
string(1) "f"
string(1) "g"
string(1) "h"
-string(45) "Cannot access non-public member B::$protected"
-string(51) "Cannot access non-public member B::$protectedStatic"
-string(43) "Cannot access non-public member A::$private"
+string(47) "Cannot access non-public property B::$protected"
+string(53) "Cannot access non-public property B::$protectedStatic"
+string(45) "Cannot access non-public property A::$private"
string(1) "a"
string(1) "f"
string(1) "c"
diff --git a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
index 1f0c2b5f2b..4b29be8f73 100644
--- a/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
@@ -34,7 +34,7 @@ var_dump($instanceWithNoProperties->pub2);
?>
--EXPECT--
Protected property:
-Cannot access non-public member TestClass::$prot
+Cannot access non-public property TestClass::$prot
Instance without property:
NULL
diff --git a/ext/reflection/tests/ReflectionReference_errors.phpt b/ext/reflection/tests/ReflectionReference_errors.phpt
index 0d1d63eb28..6d7ca3ae3d 100644
--- a/ext/reflection/tests/ReflectionReference_errors.phpt
+++ b/ext/reflection/tests/ReflectionReference_errors.phpt
@@ -40,7 +40,7 @@ var_dump(unserialize('O:19:"ReflectionReference":0:{}'));
?>
--EXPECTF--
-Call to private ReflectionReference::__construct() from invalid context
+Call to private ReflectionReference::__construct() from global scope
ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, stdClass given
ReflectionReference::fromArrayElement(): Argument #2 ($key) must be of type string|int, float given
Array key not found
diff --git a/ext/reflection/tests/ReflectionZendExtension_error.phpt b/ext/reflection/tests/ReflectionZendExtension_error.phpt
index cd06b96465..9941d91e2e 100644
--- a/ext/reflection/tests/ReflectionZendExtension_error.phpt
+++ b/ext/reflection/tests/ReflectionZendExtension_error.phpt
@@ -14,4 +14,4 @@ try {
?>
--EXPECT--
-Zend Extension zend_opcache does not exist
+Zend Extension "zend_opcache" does not exist
diff --git a/ext/reflection/tests/bug37816.phpt b/ext/reflection/tests/bug37816.phpt
index eec6f09411..42be0e6ede 100644
--- a/ext/reflection/tests/bug37816.phpt
+++ b/ext/reflection/tests/bug37816.phpt
@@ -23,4 +23,4 @@ catch (Exception $e)
?>
--EXPECT--
-Caught: Cannot access non-public member TestClass::$p
+Caught: Cannot access non-public property TestClass::$p
diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt
index 37f6ae38af..b39ca3481c 100644
--- a/ext/reflection/tests/bug49719.phpt
+++ b/ext/reflection/tests/bug49719.phpt
@@ -40,5 +40,5 @@ var_dump($prop->getValue(new b2));
bool(false)
bool(false)
bool(false)
-string(25) "Property a does not exist"
+string(29) "Property B::$a does not exist"
int(2)
diff --git a/ext/reflection/tests/bug74673.phpt b/ext/reflection/tests/bug74673.phpt
index 321195c16e..a8b9d998ca 100644
--- a/ext/reflection/tests/bug74673.phpt
+++ b/ext/reflection/tests/bug74673.phpt
@@ -15,7 +15,7 @@ $class = new ReflectionClass('A');
echo $class;
?>
--EXPECTF--
-Fatal error: Uncaught Error: Undefined constant 'PHP_SELF' in %s:%d
+Fatal error: Uncaught Error: Undefined constant "PHP_SELF" in %s:%d
Stack trace:
#0 %s(%d): ReflectionClass->__toString()
#1 {main}
diff --git a/ext/reflection/tests/parameters_002.phpt b/ext/reflection/tests/parameters_002.phpt
index e25310a6c7..f27f4ab6fd 100644
--- a/ext/reflection/tests/parameters_002.phpt
+++ b/ext/reflection/tests/parameters_002.phpt
@@ -131,7 +131,7 @@ getName: string(2) "na"
isPassedByReference: bool(false)
Deprecated: Method ReflectionParameter::getClass() is deprecated in %s on line %d
-Class NonExistingClass does not exist
+Class "NonExistingClass" does not exist
getDeclaringClass: NULL
isArray:
Deprecated: Method ReflectionParameter::isArray() is deprecated in %s on line %d
@@ -225,7 +225,7 @@ getName: string(2) "na"
isPassedByReference: bool(false)
Deprecated: Method ReflectionParameter::getClass() is deprecated in %s on line %d
-Class NonExistingClass does not exist
+Class "NonExistingClass" does not exist
getDeclaringClass: test
isArray:
Deprecated: Method ReflectionParameter::isArray() is deprecated in %s on line %d