- Fix tests

- Update README.PARAMETER_PARSING_API

7 files changed, 26 insertions, 26 deletions

diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt
index 1a55334060..d8bbad3d45 100755
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -56,7 +56,7 @@ AutoGen::__get
 Test::__set
 AutoGen::__get
 object(Test)#%d (1) {
-  ["x:protected"]=>
+  ["x":protected]=>
   array(1) {
     ["baz"]=>
     string(5) "Check"
diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt
index 32573f5a4d..f77dd7bfc5 100755
--- a/tests/classes/array_access_009.phpt
+++ b/tests/classes/array_access_009.phpt
@@ -130,7 +130,7 @@ string(9) "FooBarBaz"
 ===ArrayOverloading===
 ArrayProxy::__construct(0)
 object(ArrayProxy)#1 (2) {
-  ["object:private"]=>
+  ["object":"ArrayProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     array(1) {
@@ -141,7 +141,7 @@ object(ArrayProxy)#1 (2) {
       }
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayProxy":private]=>
   int(0)
 }
 ArrayProxy::__construct(0)
@@ -167,7 +167,7 @@ ArrayProxy::__construct(0)
 ArrayProxy::offsetUnset(0, name)
 ArrayProxy::__construct(0)
 object(ArrayProxy)#1 (2) {
-  ["object:private"]=>
+  ["object":"ArrayProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     array(1) {
@@ -176,7 +176,7 @@ object(ArrayProxy)#1 (2) {
       }
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayProxy":private]=>
   int(0)
 }
 ArrayProxy::__construct(0)
diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt
index 05a169b2f0..f655217953 100755
--- a/tests/classes/array_access_010.phpt
+++ b/tests/classes/array_access_010.phpt
@@ -104,7 +104,7 @@ string(9) "FooBarBaz"
 ===ArrayOverloading===
 ArrayReferenceProxy::__construct(Array)
 object(ArrayReferenceProxy)#1 (2) {
-  ["object:private"]=>
+  ["object":"ArrayReferenceProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     array(1) {
@@ -115,7 +115,7 @@ object(ArrayReferenceProxy)#1 (2) {
       }
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayReferenceProxy":private]=>
   &array(1) {
     ["name"]=>
     string(3) "Foo"
@@ -144,7 +144,7 @@ ArrayReferenceProxy::__construct(Array)
 ArrayReferenceProxy::offsetUnset(Array, name)
 ArrayReferenceProxy::__construct(Array)
 object(ArrayReferenceProxy)#1 (2) {
-  ["object:private"]=>
+  ["object":"ArrayReferenceProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     array(1) {
@@ -153,7 +153,7 @@ object(ArrayReferenceProxy)#1 (2) {
       }
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayReferenceProxy":private]=>
   &array(0) {
   }
 }
diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt
index 20d39568ba..1242edb8af 100755
--- a/tests/classes/array_access_011.phpt
+++ b/tests/classes/array_access_011.phpt
@@ -113,7 +113,7 @@ string(9) "FooBarBaz"
 ===ArrayOverloading===
 ArrayAccessReferenceProxy::__construct(0)
 object(ArrayAccessReferenceProxy)#1 (3) {
-  ["object:private"]=>
+  ["object":"ArrayAccessReferenceProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     &array(1) {
@@ -124,7 +124,7 @@ object(ArrayAccessReferenceProxy)#1 (3) {
       }
     }
   }
-  ["oarray:private"]=>
+  ["oarray":"ArrayAccessReferenceProxy":private]=>
   &array(1) {
     [0]=>
     array(1) {
@@ -132,7 +132,7 @@ object(ArrayAccessReferenceProxy)#1 (3) {
       string(3) "Foo"
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayAccessReferenceProxy":private]=>
   int(0)
 }
 ArrayAccessReferenceProxy::__construct(0)
@@ -158,7 +158,7 @@ ArrayAccessReferenceProxy::__construct(0)
 ArrayAccessReferenceProxy::offsetUnset(0, name)
 ArrayAccessReferenceProxy::__construct(0)
 object(ArrayAccessReferenceProxy)#1 (3) {
-  ["object:private"]=>
+  ["object":"ArrayAccessReferenceProxy":private]=>
   object(Peoples)#2 (1) {
     ["person"]=>
     &array(1) {
@@ -167,13 +167,13 @@ object(ArrayAccessReferenceProxy)#1 (3) {
       }
     }
   }
-  ["oarray:private"]=>
+  ["oarray":"ArrayAccessReferenceProxy":private]=>
   &array(1) {
     [0]=>
     array(0) {
     }
   }
-  ["element:private"]=>
+  ["element":"ArrayAccessReferenceProxy":private]=>
   int(0)
 }
 ArrayAccessReferenceProxy::__construct(0)
diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt
index ca13990c93..c83a7ae031 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -18,8 +18,8 @@ Bug #27504 (call_user_func_array allows calling of private/protected methods)
 	$foo->bar('3');
 ?>
 --EXPECTF--
-Called function foo:bar(%d)
+Called function foo:bar(1)
 
-Warning: call_user_func_array(): First argument is expected to be a valid callback, 'foo::bar' was given in %sbug27504.php on line %d
+Warning: call_user_func_array() expects parameter 1 to be valid callback, array given in %s on line %d
 
 Fatal error: Call to private method foo::bar() from context '' in %s on line %d
diff --git a/tests/classes/clone_003.phpt b/tests/classes/clone_003.phpt
index 658810825c..9a251c506f 100755
--- a/tests/classes/clone_003.phpt
+++ b/tests/classes/clone_003.phpt
@@ -43,7 +43,7 @@ test Object
     [p4] => A
     [p5] => test:5
     [p2] => base:2
-    [p6:private] => base:6
+    [p6:base:private] => base:6
 )
 Clown
 test Object
@@ -53,6 +53,6 @@ test Object
     [p4] => A
     [p5] => clone:5
     [p2] => base:2
-    [p6:private] => base:6
+    [p6:base:private] => base:6
 )
 Done
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index 1832ea0c43..a8ef9ab920 100755
--- a/tests/classes/private_members.phpt
+++ b/tests/classes/private_members.phpt
@@ -60,44 +60,44 @@ base::test
 derived Object
 (
     [member] => derived::member (default)
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 derived::test
 derived Object
 (
     [member] => derived::member (default)
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 base::__construct(end)
 base::test
 derived Object
 (
     [member] => derived::member (default)
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 base::test
 derived Object
 (
     [member] => derived::member (default)
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 derived::test
 derived Object
 (
     [member] => derived::member (default)
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 derived::__construct(end)
 base::test
 derived Object
 (
     [member] => derived::member
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 derived::test
 derived Object
 (
     [member] => derived::member
-    [member:private] => base::member
+    [member:base:private] => base::member
 )
 Done