116 files changed, 487 insertions, 386 deletions

diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt
index 195aeb23e..833fed4aa 100755
--- a/ext/reflection/tests/002.phpt
+++ b/ext/reflection/tests/002.phpt
@@ -50,14 +50,14 @@ var_dump($r->bar);
 ===DONE===
 --EXPECTF--
 ReflectionMethodEx::__construct
-string(18) "ReflectionMethodEx"
-string(7) "getName"
-string(3) "xyz"
+%unicode|string%(26) "ReflectionFunctionAbstract"
+%unicode|string%(7) "getName"
+%unicode|string%(3) "xyz"
 NULL
 Cannot set read-only property ReflectionMethodEx::$class
 Cannot set read-only property ReflectionMethodEx::$name
-string(18) "ReflectionMethodEx"
-string(7) "getName"
-string(3) "bar"
-string(3) "baz"
+%unicode|string%(26) "ReflectionFunctionAbstract"
+%unicode|string%(7) "getName"
+%unicode|string%(3) "bar"
+%unicode|string%(3) "baz"
 ===DONE===
diff --git a/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
index 27b4bc24a..da276e68c 100644
--- a/ext/reflection/tests/reflectionClass_FileInfo_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
@@ -25,7 +25,7 @@ Class C {
 }
 ?>
 --EXPECTF--
-string(%d) "%sreflectionClass_FileInfo_basic.php"
+string(%d) "%sReflectionClass_FileInfo_basic.php"
 int(20)
 int(22)
 bool(false)
diff --git a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
index b42be136c..b42be136c 100644
--- a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_constructor_001.phpt b/ext/reflection/tests/ReflectionClass_constructor_001.phpt
index 1a70fe1f5..1a70fe1f5 100644
--- a/ext/reflection/tests/reflectionClass_constructor_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_constructor_001.phpt
diff --git a/ext/reflection/tests/reflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
index 3685c639d..3685c639d 100644
--- a/ext/reflection/tests/reflectionClass_constructor_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
diff --git a/ext/reflection/tests/reflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
index 8729731f5..8729731f5 100644
--- a/ext/reflection/tests/reflectionClass_export_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
diff --git a/ext/reflection/tests/reflectionClass_export_basic2.phpt b/ext/reflection/tests/ReflectionClass_export_basic2.phpt
index b6644883e..b6644883e 100644
--- a/ext/reflection/tests/reflectionClass_export_basic2.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_basic2.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
index 6e051113d..6e051113d 100644
--- a/ext/reflection/tests/reflectionClass_getConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstant_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstant_error.phpt b/ext/reflection/tests/ReflectionClass_getConstant_error.phpt
index 907d6d8b7..907d6d8b7 100644
--- a/ext/reflection/tests/reflectionClass_getConstant_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstant_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstants_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
index 9abdcc801..9abdcc801 100644
--- a/ext/reflection/tests/reflectionClass_getConstants_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstants_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstants_error.phpt b/ext/reflection/tests/ReflectionClass_getConstants_error.phpt
index 1784d712a..1784d712a 100644
--- a/ext/reflection/tests/reflectionClass_getConstants_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstants_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
index f3881c56d..f3881c56d 100644
--- a/ext/reflection/tests/reflectionClass_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_error.phpt
index 7e8932a5e..7e8932a5e 100644
--- a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstructor_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt b/ext/reflection/tests/ReflectionClass_getExtensionName_basic.phpt
index 310b22e69..310b22e69 100644
--- a/ext/reflection/tests/reflectionClass_getExtensionName_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtensionName_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getExtensionName_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
index 998355cc7..998355cc7 100644
--- a/ext/reflection/tests/reflectionClass_getExtensionName_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
diff --git a/ext/reflection/tests/reflectionClass_getExtension_basic.phpt b/ext/reflection/tests/ReflectionClass_getExtension_basic.phpt
index dbe157acd..dbe157acd 100644
--- a/ext/reflection/tests/reflectionClass_getExtension_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtension_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getExtension_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
index 540950471..540950471 100644
--- a/ext/reflection/tests/reflectionClass_getExtension_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
diff --git a/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt b/ext/reflection/tests/ReflectionClass_getInterfaceNames_basic.phpt
index 6681c9f31..6681c9f31 100644
--- a/ext/reflection/tests/reflectionClass_getInterfaceNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaceNames_basic.phpt
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
index 5821ebad0..2f2d790f6 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
@@ -48,121 +48,121 @@ foreach($classes as $class) {
 --EXPECTF--
 Reflecting on class pubf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(4) "pubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(4) "pubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(4) "pubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subpubf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(7) "subpubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(7) "subpubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(7) "subpubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class protf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(5) "protf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(5) "protf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(5) "protf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subprotf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(8) "subprotf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(8) "subprotf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(8) "subprotf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class privf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(5) "privf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(5) "privf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(5) "privf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for doesntExist(): Method doesntExist does not exist
 Reflecting on class subprivf: 
   --> Check for f(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(8) "subprivf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for s(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(8) "subprivf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for F(): object(ReflectionMethod)#%d (2) {
-  ["name"]=>
-  string(1) "f"
-  ["class"]=>
-  string(8) "subprivf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "f"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
-  --> Check for doesntExist(): Method doesntExist does not exist
\ No newline at end of file
+  --> Check for doesntExist(): Method doesntExist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
index 867d669ad..ce5c980c6 100644
--- a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
@@ -40,101 +40,101 @@ Reflecting on class pubf:
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(4) "pubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(4) "pubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
 }
 Reflecting on class subpubf: 
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(7) "subpubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(7) "subpubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
 }
 Reflecting on class protf: 
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(5) "protf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(5) "protf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
 }
 Reflecting on class subprotf: 
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(8) "subprotf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(8) "subprotf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
 }
 Reflecting on class privf: 
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(5) "privf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(5) "privf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
 }
 Reflecting on class subprivf: 
 array(2) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "f"
-    ["class"]=>
-    string(8) "subprivf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "f"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
   [1]=>
   &object(ReflectionMethod)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(8) "subprivf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
-}
\ No newline at end of file
+}
diff --git a/ext/reflection/tests/reflectionClass_getModifierNames_basic.phpt b/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt
index 91a0a18f1..91a0a18f1 100644
--- a/ext/reflection/tests/reflectionClass_getModifierNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionClass_getModifiers_basic.phpt
index 65f23c935..65f23c935 100644
--- a/ext/reflection/tests/reflectionClass_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getModifiers_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
index 158413f15..158413f15 100644
--- a/ext/reflection/tests/reflectionClass_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_getName_error.phpt b/ext/reflection/tests/ReflectionClass_getName_error.phpt
index 06cc4155b..06cc4155b 100644
--- a/ext/reflection/tests/reflectionClass_getName_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_getName_error1.phpt b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
index 5590137f8..5590137f8 100644
--- a/ext/reflection/tests/reflectionClass_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error1.phpt
diff --git a/ext/reflection/tests/reflectionClass_getNamespaceName.phpt b/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
index 1c46e0656..1c46e0656 100644
--- a/ext/reflection/tests/reflectionClass_getNamespaceName.phpt
+++ b/ext/reflection/tests/ReflectionClass_getNamespaceName.phpt
diff --git a/ext/reflection/tests/reflectionClass_getParentClass.phpt b/ext/reflection/tests/ReflectionClass_getParentClass.phpt
index 46884ca2b..46884ca2b 100644
--- a/ext/reflection/tests/reflectionClass_getParentClass.phpt
+++ b/ext/reflection/tests/ReflectionClass_getParentClass.phpt
diff --git a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
index 5eecc5dee..b4f99ca68 100644
--- a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
@@ -40,87 +40,87 @@ Reflecting on class pubf:
 array(2) {
   [0]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "a"
-    ["class"]=>
-    string(4) "pubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "a"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
   [1]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(4) "pubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
 }
 Reflecting on class subpubf: 
 array(2) {
   [0]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "a"
-    ["class"]=>
-    string(7) "subpubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "a"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
   [1]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(7) "subpubf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(4) "pubf"
   }
 }
 Reflecting on class protf: 
 array(2) {
   [0]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "a"
-    ["class"]=>
-    string(5) "protf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "a"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
   [1]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(5) "protf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
 }
 Reflecting on class subprotf: 
 array(2) {
   [0]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "a"
-    ["class"]=>
-    string(8) "subprotf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "a"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
   [1]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(8) "subprotf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "protf"
   }
 }
 Reflecting on class privf: 
 array(2) {
   [0]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "a"
-    ["class"]=>
-    string(5) "privf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "a"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
   [1]=>
   &object(ReflectionProperty)#%d (2) {
-    ["name"]=>
-    string(1) "s"
-    ["class"]=>
-    string(5) "privf"
+    [%u|b%"name"]=>
+    %unicode|string%(1) "s"
+    [%u|b%"class"]=>
+    %unicode|string%(5) "privf"
   }
 }
 Reflecting on class subprivf: 
 array(0) {
-}
\ No newline at end of file
+}
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
index fa5deaa67..9e174b749 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
@@ -61,86 +61,86 @@ foreach($classes as $class) {
 --EXPECTF--
 Reflecting on class pubf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(4) "pubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "a"
-  ["class"]=>
-  string(4) "pubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subpubf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(7) "subpubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "a"
-  ["class"]=>
-  string(7) "subpubf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"class"]=>
+  %unicode|string%(4) "pubf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class protf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(5) "protf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "a"
-  ["class"]=>
-  string(5) "protf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subprotf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(8) "subprotf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "a"
-  ["class"]=>
-  string(8) "subprotf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "protf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class privf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(5) "privf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for a: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "a"
-  ["class"]=>
-  string(5) "privf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "a"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for A: Property A does not exist
   --> Check for doesntExist: Property doesntExist does not exist
 Reflecting on class subprivf: 
   --> Check for s: object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(1) "s"
-  ["class"]=>
-  string(8) "subprivf"
+  [%u|b%"name"]=>
+  %unicode|string%(1) "s"
+  [%u|b%"class"]=>
+  %unicode|string%(5) "privf"
 }
   --> Check for a: Property a does not exist
   --> Check for A: Property A does not exist
-  --> Check for doesntExist: Property doesntExist does not exist
\ No newline at end of file
+  --> Check for doesntExist: Property doesntExist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
index dddd2260f..515d9860b 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
@@ -97,146 +97,146 @@ showInfo("doesntexist::doesntExist");
 --EXPECTF--
 --- (Reflecting on pubA) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubA"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubA"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
-string(9) "pubA in A"
+%unicode|string%(9) "pubA in A"
 --- (Reflecting on protA) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protA"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protA"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member C::protA
 --- (Reflecting on privA) ---
 Property privA does not exist
 --- (Reflecting on pubB) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubB"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubB"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
-string(9) "pubB in B"
+%unicode|string%(9) "pubB in B"
 --- (Reflecting on protB) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protB"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protB"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member C::protB
 --- (Reflecting on privB) ---
 Property privB does not exist
 --- (Reflecting on pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on doesntExist) ---
 Property doesntExist does not exist
 --- (Reflecting on A::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
-string(9) "pubC in A"
+%unicode|string%(9) "pubC in A"
 --- (Reflecting on A::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member A::protC
 --- (Reflecting on A::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member A::privC
 --- (Reflecting on B::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
-string(9) "pubC in B"
+%unicode|string%(9) "pubC in B"
 --- (Reflecting on B::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member B::protC
 --- (Reflecting on B::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member B::privC
 --- (Reflecting on c::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on c::PUBC) ---
 Property PUBC does not exist
 --- (Reflecting on C::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on C::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on C::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on X::pubC) ---
@@ -248,4 +248,4 @@ Fully qualified property name X::privC does not specify a base class of C
 --- (Reflecting on X::doesntExist) ---
 Fully qualified property name X::doesntExist does not specify a base class of C
 --- (Reflecting on doesntexist::doesntExist) ---
-Class doesntexist does not exist
\ No newline at end of file
+Class doesntexist does not exist
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
index 791f5e1fa..1070d57ce 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
@@ -97,146 +97,146 @@ showInfo("doesntexist::doesntExist");
 --EXPECTF--
 --- (Reflecting on pubA) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubA"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubA"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
-string(9) "pubA in A"
+%unicode|string%(9) "pubA in A"
 --- (Reflecting on protA) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protA"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protA"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member C::protA
 --- (Reflecting on privA) ---
 Property privA does not exist
 --- (Reflecting on pubB) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubB"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubB"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
-string(9) "pubB in B"
+%unicode|string%(9) "pubB in B"
 --- (Reflecting on protB) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protB"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protB"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member C::protB
 --- (Reflecting on privB) ---
 Property privB does not exist
 --- (Reflecting on pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on doesntExist) ---
 Property doesntExist does not exist
 --- (Reflecting on A::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on A::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member A::protC
 --- (Reflecting on A::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "A"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "A"
 }
 Cannot access non-public member A::privC
 --- (Reflecting on B::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on B::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member B::protC
 --- (Reflecting on B::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "B"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "B"
 }
 Cannot access non-public member B::privC
 --- (Reflecting on c::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on c::PUBC) ---
 Property PUBC does not exist
 --- (Reflecting on C::pubC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(4) "pubC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(4) "pubC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
-string(9) "pubC in C"
+%unicode|string%(9) "pubC in C"
 --- (Reflecting on C::protC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "protC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "protC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::protC
 --- (Reflecting on C::privC) ---
 object(ReflectionProperty)#%d (2) {
-  ["name"]=>
-  string(5) "privC"
-  ["class"]=>
-  string(1) "C"
+  [%u|b%"name"]=>
+  %unicode|string%(5) "privC"
+  [%u|b%"class"]=>
+  %unicode|string%(1) "C"
 }
 Cannot access non-public member C::privC
 --- (Reflecting on X::pubC) ---
@@ -248,4 +248,4 @@ Fully qualified property name X::privC does not specify a base class of C
 --- (Reflecting on X::doesntExist) ---
 Fully qualified property name X::doesntExist does not specify a base class of C
 --- (Reflecting on doesntexist::doesntExist) ---
-Class doesntexist does not exist
\ No newline at end of file
+Class doesntexist does not exist
diff --git a/ext/reflection/tests/reflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
index 0ff2523d6..0ff2523d6 100644
--- a/ext/reflection/tests/reflectionClass_hasConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
index fa4ee482b..fa4ee482b 100644
--- a/ext/reflection/tests/reflectionClass_hasMethod_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
index d6dda7c2a..d6dda7c2a 100644
--- a/ext/reflection/tests/reflectionClass_hasProperty_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isAbstract_basic.phpt b/ext/reflection/tests/ReflectionClass_isAbstract_basic.phpt
index a7d19829a..a7d19829a 100644
--- a/ext/reflection/tests/reflectionClass_isAbstract_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isAbstract_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isFinal_basic.phpt b/ext/reflection/tests/ReflectionClass_isFinal_basic.phpt
index 57e577ad5..57e577ad5 100644
--- a/ext/reflection/tests/reflectionClass_isFinal_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isFinal_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
index 2da09449f..2da09449f 100644
--- a/ext/reflection/tests/reflectionClass_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInstance_error.phpt b/ext/reflection/tests/ReflectionClass_isInstance_error.phpt
index 2c4f49b7d..2c4f49b7d 100644
--- a/ext/reflection/tests/reflectionClass_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstance_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
index 6ebcfa99a..6ebcfa99a 100644
--- a/ext/reflection/tests/reflectionClass_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
index 52be23912..52be23912 100644
--- a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
index 1cf3e613e..1cf3e613e 100644
--- a/ext/reflection/tests/reflectionClass_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInterface_basic.phpt b/ext/reflection/tests/ReflectionClass_isInterface_basic.phpt
index 66c9ae7d0..66c9ae7d0 100644
--- a/ext/reflection/tests/reflectionClass_isInterface_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInterface_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
index 2eaacb67f..2eaacb67f 100644
--- a/ext/reflection/tests/reflectionClass_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isInternal_error.phpt b/ext/reflection/tests/ReflectionClass_isInternal_error.phpt
index ef69a4c39..ef69a4c39 100644
--- a/ext/reflection/tests/reflectionClass_isInternal_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInternal_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_isIterateable_basic.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_basic.phpt
index 8b65b9a0b..8b65b9a0b 100644
--- a/ext/reflection/tests/reflectionClass_isIterateable_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isIterateable_variation1.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_variation1.phpt
index f6d0d5346..f6d0d5346 100644
--- a/ext/reflection/tests/reflectionClass_isIterateable_variation1.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_variation1.phpt
diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
index 94fcf00ec..94fcf00ec 100644
--- a/ext/reflection/tests/reflectionClass_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_error.phpt
index 7d929fafd..7d929fafd 100644
--- a/ext/reflection/tests/reflectionClass_isSubclassOf_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_error.phpt
diff --git a/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
index 2fabd023e..2fabd023e 100644
--- a/ext/reflection/tests/reflectionClass_isSubclassOf_error1.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
index af43fcefa..af43fcefa 100644
--- a/ext/reflection/tests/reflectionClass_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_error.phpt
index ac8888417..ac8888417 100644
--- a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_isUserDefined_error.phpt
diff --git a/ext/reflection/tests/reflectionExtension_constructor_basic.phpt b/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt
index 72c8ac6bd..72c8ac6bd 100644
--- a/ext/reflection/tests/reflectionExtension_constructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
index 9eae206c5..9eae206c5 100644
--- a/ext/reflection/tests/reflectionExtension_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt
diff --git a/ext/reflection/tests/reflectionExtension_export_basic.phpt b/ext/reflection/tests/ReflectionExtension_export_basic.phpt
index 3fa7a66af..3fa7a66af 100644
--- a/ext/reflection/tests/reflectionExtension_export_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_export_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getClassNames_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
index 465e868cf..465e868cf 100644
--- a/ext/reflection/tests/reflectionExtension_getClassNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getClassNames_variation1.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt
index cd5dc0b28..cd5dc0b28 100644
--- a/ext/reflection/tests/reflectionExtension_getClassNames_variation1.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getClasses_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
index f46c057c6..f46c057c6 100644
--- a/ext/reflection/tests/reflectionExtension_getClasses_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt b/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt
index 8b5293a48..8b5293a48 100644
--- a/ext/reflection/tests/reflectionExtension_getDependencies_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getDependencies_variation2.phpt b/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt
index 5b0ade5da..5b0ade5da 100644
--- a/ext/reflection/tests/reflectionExtension_getDependencies_variation2.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getName_basic.phpt b/ext/reflection/tests/ReflectionExtension_getName_basic.phpt
index 9dae1f3a6..9dae1f3a6 100644
--- a/ext/reflection/tests/reflectionExtension_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getName_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_getVersion_basic.phpt b/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt
index 19dee8271..19dee8271 100644
--- a/ext/reflection/tests/reflectionExtension_getVersion_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt
diff --git a/ext/reflection/tests/reflectionExtension_info_basic.phpt b/ext/reflection/tests/ReflectionExtension_info_basic.phpt
index 48f6a6509..48f6a6509 100644
--- a/ext/reflection/tests/reflectionExtension_info_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_info_basic.phpt
diff --git a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
index 790444384..02c7b9fa3 100644
--- a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
@@ -154,71 +154,71 @@ Modifiers for method TestClass::__autoload():
 int(65792)
 
 
-Modifiers for method DerivedClass::foo():
+Modifiers for method TestClass::foo():
 int(65792)
 
 
-Modifiers for method DerivedClass::stat():
+Modifiers for method TestClass::stat():
 int(257)
 
 
-Modifiers for method DerivedClass::priv():
+Modifiers for method TestClass::priv():
 int(66560)
 
 
-Modifiers for method DerivedClass::prot():
+Modifiers for method TestClass::prot():
 int(66048)
 
 
-Modifiers for method DerivedClass::fin():
+Modifiers for method TestClass::fin():
 int(65796)
 
 
-Modifiers for method DerivedClass::__destruct():
+Modifiers for method TestClass::__destruct():
 int(16640)
 
 
-Modifiers for method DerivedClass::__call():
+Modifiers for method TestClass::__call():
 int(256)
 
 
-Modifiers for method DerivedClass::__clone():
+Modifiers for method TestClass::__clone():
 int(33024)
 
 
-Modifiers for method DerivedClass::__get():
+Modifiers for method TestClass::__get():
 int(256)
 
 
-Modifiers for method DerivedClass::__set():
+Modifiers for method TestClass::__set():
 int(256)
 
 
-Modifiers for method DerivedClass::__unset():
+Modifiers for method TestClass::__unset():
 int(256)
 
 
-Modifiers for method DerivedClass::__isset():
+Modifiers for method TestClass::__isset():
 int(256)
 
 
-Modifiers for method DerivedClass::__tostring():
+Modifiers for method TestClass::__tostring():
 int(256)
 
 
-Modifiers for method DerivedClass::__sleep():
+Modifiers for method TestClass::__sleep():
 int(65792)
 
 
-Modifiers for method DerivedClass::__wakeup():
+Modifiers for method TestClass::__wakeup():
 int(65792)
 
 
-Modifiers for method DerivedClass::__set_state():
+Modifiers for method TestClass::__set_state():
 int(65792)
 
 
-Modifiers for method DerivedClass::__autoload():
+Modifiers for method TestClass::__autoload():
 int(65792)
 
 
diff --git a/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
index a1334f4d6..00214dcdc 100644
--- a/ext/reflection/tests/reflectionObject_FileInfo_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
@@ -17,7 +17,7 @@ Class C {
 }
 ?>
 --EXPECTF--
-string(%d) "%sreflectionObject_FileInfo_basic.php"
+string(%d) "%sReflectionObject_FileInfo_basic.php"
 int(12)
 int(14)
 bool(false)
diff --git a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
index d30e67717..d30e67717 100644
--- a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
diff --git a/ext/reflection/tests/reflectionObject___toString_basic1.phpt b/ext/reflection/tests/ReflectionObject___toString_basic1.phpt
index fefa220c9..fefa220c9 100644
--- a/ext/reflection/tests/reflectionObject___toString_basic1.phpt
+++ b/ext/reflection/tests/ReflectionObject___toString_basic1.phpt
diff --git a/ext/reflection/tests/reflectionObject___toString_basic2.phpt b/ext/reflection/tests/ReflectionObject___toString_basic2.phpt
index 332386afd..332386afd 100644
--- a/ext/reflection/tests/reflectionObject___toString_basic2.phpt
+++ b/ext/reflection/tests/ReflectionObject___toString_basic2.phpt
diff --git a/ext/reflection/tests/reflectionObject_constructor_basic.phpt b/ext/reflection/tests/ReflectionObject_constructor_basic.phpt
index 8f4a9082c..8f4a9082c 100644
--- a/ext/reflection/tests/reflectionObject_constructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_constructor_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_constructor_error.phpt b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
index baa6129ed..baa6129ed 100644
--- a/ext/reflection/tests/reflectionObject_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_constructor_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_export_basic1.phpt b/ext/reflection/tests/ReflectionObject_export_basic1.phpt
index f7dfef867..f7dfef867 100644
--- a/ext/reflection/tests/reflectionObject_export_basic1.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic1.phpt
diff --git a/ext/reflection/tests/reflectionObject_export_basic2.phpt b/ext/reflection/tests/ReflectionObject_export_basic2.phpt
index 277f06eaf..277f06eaf 100644
--- a/ext/reflection/tests/reflectionObject_export_basic2.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic2.phpt
diff --git a/ext/reflection/tests/reflectionObject_export_basic3.phpt b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
index 7c1da34c9..7c1da34c9 100644
--- a/ext/reflection/tests/reflectionObject_export_basic3.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstant_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
index 3d151bc7d..3d151bc7d 100644
--- a/ext/reflection/tests/reflectionObject_getConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstant_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstant_error.phpt b/ext/reflection/tests/ReflectionObject_getConstant_error.phpt
index 3f12f3a1e..3f12f3a1e 100644
--- a/ext/reflection/tests/reflectionObject_getConstant_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstant_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
index 6479ec90e..6479ec90e 100644
--- a/ext/reflection/tests/reflectionObject_getConstants_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstants_error.phpt b/ext/reflection/tests/ReflectionObject_getConstants_error.phpt
index d3b90805e..d3b90805e 100644
--- a/ext/reflection/tests/reflectionObject_getConstants_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstants_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
index a784f6d9e..a784f6d9e 100644
--- a/ext/reflection/tests/reflectionObject_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_error.phpt
index 2f52de2ed..2f52de2ed 100644
--- a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstructor_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_getName_basic.phpt b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
index db0cbfb08..db0cbfb08 100644
--- a/ext/reflection/tests/reflectionObject_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_getName_error.phpt b/ext/reflection/tests/ReflectionObject_getName_error.phpt
index ff8e279e9..ff8e279e9 100644
--- a/ext/reflection/tests/reflectionObject_getName_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index 26c342d7f..26c342d7f 100644
--- a/ext/reflection/tests/reflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
index ef605aad8..ef605aad8 100644
--- a/ext/reflection/tests/reflectionObject_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInstance_error.phpt b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
index 692c2f849..692c2f849 100644
--- a/ext/reflection/tests/reflectionObject_isInstance_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
index 4b8a6ec22..4b8a6ec22 100644
--- a/ext/reflection/tests/reflectionObject_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
index f993367b2..f993367b2 100644
--- a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
index ac7199c09..ac7199c09 100644
--- a/ext/reflection/tests/reflectionObject_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
index 066bca70e..066bca70e 100644
--- a/ext/reflection/tests/reflectionObject_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_isInternal_error.phpt b/ext/reflection/tests/ReflectionObject_isInternal_error.phpt
index 996add6cd..996add6cd 100644
--- a/ext/reflection/tests/reflectionObject_isInternal_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInternal_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
index e89066a7e..e89066a7e 100644
--- a/ext/reflection/tests/reflectionObject_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
index 9387b7dcb..9387b7dcb 100644
--- a/ext/reflection/tests/reflectionObject_isSubclassOf_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
index 4cb08fcb6..4cb08fcb6 100644
--- a/ext/reflection/tests/reflectionObject_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_error.phpt
index 06be47ae6..06be47ae6 100644
--- a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isUserDefined_error.phpt
diff --git a/ext/reflection/tests/reflectionParameter_export_basic.phpt b/ext/reflection/tests/ReflectionParameter_export_basic.phpt
index 74428ccd2..74428ccd2 100644
--- a/ext/reflection/tests/reflectionParameter_export_basic.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_basic.phpt
diff --git a/ext/reflection/tests/reflectionParameter_export_error.phpt b/ext/reflection/tests/ReflectionParameter_export_error.phpt
index 31acfe12a..31acfe12a 100644
--- a/ext/reflection/tests/reflectionParameter_export_error.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error.phpt
diff --git a/ext/reflection/tests/reflectionParameter_export_error2.phpt b/ext/reflection/tests/ReflectionParameter_export_error2.phpt
index 8bdbc6ad8..8bdbc6ad8 100644
--- a/ext/reflection/tests/reflectionParameter_export_error2.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error2.phpt
diff --git a/ext/reflection/tests/reflectionParameter_export_error3.phpt b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
index 293785328..293785328 100644
--- a/ext/reflection/tests/reflectionParameter_export_error3.phpt
+++ b/ext/reflection/tests/ReflectionParameter_export_error3.phpt
diff --git a/ext/reflection/tests/reflectionParameter_getDeclaringFunction_basic.phpt b/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt
index 59e15a705..59e15a705 100644
--- a/ext/reflection/tests/reflectionParameter_getDeclaringFunction_basic.phpt
+++ b/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt
diff --git a/ext/reflection/tests/reflectionParameter_getPosition_basic.phpt b/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt
index 2807bdf66..2807bdf66 100644
--- a/ext/reflection/tests/reflectionParameter_getPosition_basic.phpt
+++ b/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt
diff --git a/ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
index 3118c17be..3118c17be 100644
--- a/ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt
+++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
diff --git a/ext/reflection/tests/reflectionParameter_toString_basic.phpt b/ext/reflection/tests/ReflectionParameter_toString_basic.phpt
index 268ced15e..268ced15e 100644
--- a/ext/reflection/tests/reflectionParameter_toString_basic.phpt
+++ b/ext/reflection/tests/ReflectionParameter_toString_basic.phpt
diff --git a/ext/reflection/tests/reflectionProperty_basic1.phpt b/ext/reflection/tests/ReflectionProperty_basic1.phpt
index 63f954201..63f954201 100644
--- a/ext/reflection/tests/reflectionProperty_basic1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_basic1.phpt
diff --git a/ext/reflection/tests/reflectionProperty_basic2.phpt b/ext/reflection/tests/ReflectionProperty_basic2.phpt
index b7b21333d..b7b21333d 100644
--- a/ext/reflection/tests/reflectionProperty_basic2.phpt
+++ b/ext/reflection/tests/ReflectionProperty_basic2.phpt
diff --git a/ext/reflection/tests/reflectionProperty_constructor_error.phpt b/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
index 38a34681d..38a34681d 100644
--- a/ext/reflection/tests/reflectionProperty_constructor_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
diff --git a/ext/reflection/tests/reflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
index d61480377..d61480377 100644
--- a/ext/reflection/tests/reflectionProperty_constructor_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
diff --git a/ext/reflection/tests/reflectionProperty_error.phpt b/ext/reflection/tests/ReflectionProperty_error.phpt
index 56de6e1f2..56de6e1f2 100644
--- a/ext/reflection/tests/reflectionProperty_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_error.phpt
diff --git a/ext/reflection/tests/reflectionProperty_export_basic.phpt b/ext/reflection/tests/ReflectionProperty_export_basic.phpt
index e77a3b714..e77a3b714 100644
--- a/ext/reflection/tests/reflectionProperty_export_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_export_basic.phpt
diff --git a/ext/reflection/tests/reflectionProperty_export_error.phpt b/ext/reflection/tests/ReflectionProperty_export_error.phpt
index ab09ed01f..ab09ed01f 100644
--- a/ext/reflection/tests/reflectionProperty_export_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_export_error.phpt
diff --git a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
index bf525e1c4..bf525e1c4 100644
--- a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
diff --git a/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
index 2c4815a35..2c4815a35 100644
--- a/ext/reflection/tests/reflectionProperty_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDocComment_basic.phpt
diff --git a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt b/ext/reflection/tests/ReflectionProperty_getDocComment_error.phpt
index dae7be2fb..dae7be2fb 100644
--- a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDocComment_error.phpt
diff --git a/ext/reflection/tests/reflectionProperty_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
index 0d1b6bd13..0d1b6bd13 100644
--- a/ext/reflection/tests/reflectionProperty_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getModifiers_basic.phpt
diff --git a/ext/reflection/tests/reflectionProperty_getValue_error.phpt b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
index c2152e9f8..c2152e9f8 100644
--- a/ext/reflection/tests/reflectionProperty_getValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getValue_error.phpt
diff --git a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
index 22ee117cc..22ee117cc 100644
--- a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
diff --git a/ext/reflection/tests/reflectionProperty_setAccessible.phpt b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
index 927a8a861..cc184c192 100644
--- a/ext/reflection/tests/reflectionProperty_setAccessible.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setAccessible.phpt
@@ -9,6 +9,8 @@ class A {
     private static $privateStatic = 'd';
 }
 
+class B extends A {}
+
 $a               = new A;
 $protected       = new ReflectionProperty($a, 'protected');
 $protectedStatic = new ReflectionProperty('A', 'protectedStatic');
@@ -66,6 +68,52 @@ var_dump($protected->getValue($a));
 var_dump($protectedStatic->getValue());
 var_dump($private->getValue($a));
 var_dump($privateStatic->getValue());
+
+$a               = new A;
+$b               = new B;
+$protected       = new ReflectionProperty($b, 'protected');
+$protectedStatic = new ReflectionProperty('B', 'protectedStatic');
+$private         = new ReflectionProperty($a, 'private');
+
+try {
+    var_dump($protected->getValue($b));
+}
+
+catch (ReflectionException $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    var_dump($protectedStatic->getValue());
+}
+
+catch (ReflectionException $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    var_dump($private->getValue($b));
+}
+
+catch (ReflectionException $e) {
+    var_dump($e->getMessage());
+}
+
+$protected->setAccessible(TRUE);
+$protectedStatic->setAccessible(TRUE);
+$private->setAccessible(TRUE);
+
+var_dump($protected->getValue($b));
+var_dump($protectedStatic->getValue());
+var_dump($private->getValue($b));
+
+$protected->setValue($b, 'e');
+$protectedStatic->setValue('f');
+$private->setValue($b, 'g');
+
+var_dump($protected->getValue($b));
+var_dump($protectedStatic->getValue());
+var_dump($private->getValue($b));
 ?>
 --EXPECT--
 string(44) "Cannot access non-public member A::protected"
@@ -80,3 +128,12 @@ string(1) "e"
 string(1) "f"
 string(1) "g"
 string(1) "h"
+string(44) "Cannot access non-public member B::protected"
+string(50) "Cannot access non-public member B::protectedStatic"
+string(42) "Cannot access non-public member A::private"
+string(1) "a"
+string(1) "f"
+string(1) "c"
+string(1) "e"
+string(1) "f"
+string(1) "g"
diff --git a/ext/reflection/tests/reflectionProperty_setValue_error.phpt b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
index 7161c5352..7161c5352 100644
--- a/ext/reflection/tests/reflectionProperty_setValue_error.phpt
+++ b/ext/reflection/tests/ReflectionProperty_setValue_error.phpt
diff --git a/ext/reflection/tests/bug48336.phpt b/ext/reflection/tests/bug48336.phpt
new file mode 100644
index 000000000..ee90675f0
--- /dev/null
+++ b/ext/reflection/tests/bug48336.phpt
@@ -0,0 +1,44 @@
+--TEST--
+Bug #48286 (ReflectionProperty::getDeclaringClass() does not work with redeclared properties)
+--FILE--
+<?php
+class A {
+}
+
+class B extends A {
+  static protected $prop;
+}
+
+class C extends B {
+  static protected $prop;
+}
+
+class D extends C {
+}
+
+class E extends D {
+}
+
+class F extends E {
+  static protected $prop;
+}
+
+$class = 'A';
+for($class = 'A'; $class <= 'F'; $class ++) {
+  print($class.' => ');
+  try {
+    $rp = new ReflectionProperty($class, 'prop');
+    print($rp->getDeclaringClass()->getName());
+  } catch(Exception $e) {
+    print('N/A');
+  }
+  print("\n");
+}
+?>
+--EXPECT--
+A => N/A
+B => B
+C => C
+D => C
+E => C
+F => F