- New parameter parsing

- Removed METHOD_NOTSTATIC_NUMPARAMS

27 files changed, 105 insertions, 116 deletions

diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
index 6012f08551..7c178ac8ea 100644
--- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_002.phpt
@@ -19,27 +19,26 @@ var_dump($rc->getStaticProperties(array(1,2,3)));
 
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 5
+Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 6
+Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 7
+Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDefaultProperties() in %s on line 8
+Warning: ReflectionClass::getDefaultProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 9
+Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 10
+Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 11
+Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStaticProperties() in %s on line 12
-NULL
\ No newline at end of file
+Warning: ReflectionClass::getStaticProperties() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
index 6668a8b656..5bbd596488 100644
--- a/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDocComment_002.phpt
@@ -13,15 +13,14 @@ var_dump($rc->getDocComment(true));
 var_dump($rc->getDocComment(array(1,2,3)));
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 4
+Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 5
+Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 6
+Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getDocComment() in %s on line 7
+Warning: ReflectionClass::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
index 5f42e4736d..f62d58cd72 100644
--- a/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaces_004.phpt
@@ -14,15 +14,14 @@ var_dump($rc->getInterfaces(true));
 var_dump($rc->getInterfaces(array(1,2,3)));
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 5
+Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 6
+Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 7
+Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getInterfaces() in %s on line 8
+Warning: ReflectionClass::getInterfaces() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt b/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
index a97ae5c5f5..bfbc12ee52 100644
--- a/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getParentClass_001.phpt
@@ -28,11 +28,11 @@ bool(false)
 
 Test bad params:
 
-Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 11
+Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 12
+Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getParentClass() in %s on line 13
-NULL
\ No newline at end of file
+Warning: ReflectionClass::getParentClass() expects exactly 0 parameters, 2 given in %s on line %d
+NULL
diff --git a/ext/reflection/tests/ReflectionClass_modifiers_002.phpt b/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
index 3fa247454f..a3a567ccbb 100644
--- a/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_modifiers_002.phpt
@@ -14,15 +14,14 @@ var_dump($rc->getModifiers(array(1,2,3)));
 
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::isFinal() in %s on line 4
+Warning: ReflectionClass::isFinal() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isInterface() in %s on line 5
+Warning: ReflectionClass::isInterface() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isAbstract() in %s on line 6
+Warning: ReflectionClass::isAbstract() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getModifiers() in %s on line 7
+Warning: ReflectionClass::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
index 76851ea5cc..9a963e41ca 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosure_error.phpt
@@ -23,5 +23,5 @@ $closure = $func->getClosure('bar');
 --EXPECTF--
 *** Testing ReflectionFunction::getClosure() : error conditions ***
 
-Warning: Wrong parameter count for ReflectionFunction::getClosure() in %s on line %d
+Warning: ReflectionFunction::getClosure() expects exactly 0 parameters, 1 given in %s on line %d
 ===DONE===
diff --git a/ext/reflection/tests/ReflectionMethod_006.phpt b/ext/reflection/tests/ReflectionMethod_006.phpt
index 294d708035..7f2eed73b2 100644
--- a/ext/reflection/tests/ReflectionMethod_006.phpt
+++ b/ext/reflection/tests/ReflectionMethod_006.phpt
@@ -35,7 +35,7 @@ var_dump($rm->getName(1));
 
 ?>
 --EXPECTF--
-Warning: ReflectionMethod::__construct() expects %s on line 3
+Warning: ReflectionMethod::__construct() expects exactly 1 parameter, 0 given in %s on line %d
 object(ReflectionMethod)#%d (2) {
   [u"name"]=>
   unicode(0) ""
@@ -43,7 +43,7 @@ object(ReflectionMethod)#%d (2) {
   unicode(0) ""
 }
 
-Warning: ReflectionMethod::__construct() expects %s on line 4
+Warning: ReflectionMethod::__construct() expects exactly 1 parameter, 3 given in %s on line %d
 object(ReflectionMethod)#%d (2) {
   [u"name"]=>
   unicode(0) ""
@@ -51,50 +51,50 @@ object(ReflectionMethod)#%d (2) {
   unicode(0) ""
 }
 
-Warning: Wrong parameter count for ReflectionMethod::isFinal() in %s on line 12
+Warning: ReflectionMethod::isFinal() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isAbstract() in %s on line 13
+Warning: ReflectionMethod::isAbstract() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isPrivate() in %s on line 14
+Warning: ReflectionMethod::isPrivate() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isProtected() in %s on line 15
+Warning: ReflectionMethod::isProtected() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isPublic() in %s on line 16
+Warning: ReflectionMethod::isPublic() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isStatic() in %s on line 17
+Warning: ReflectionMethod::isStatic() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isConstructor() in %s on line 18
+Warning: ReflectionMethod::isConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::isDestructor() in %s on line 19
+Warning: ReflectionMethod::isDestructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionMethod::getModifiers() in %s on line 20
+Warning: ReflectionMethod::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::isInternal() in %s on line 21
+Warning: ReflectionFunctionAbstract::isInternal() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::isUserDefined() in %s on line 22
+Warning: ReflectionFunctionAbstract::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getFileName() in %s on line 23
+Warning: ReflectionFunctionAbstract::getFileName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getStartLine() in %s on line 24
+Warning: ReflectionFunctionAbstract::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getEndLine() in %s on line 25
+Warning: ReflectionFunctionAbstract::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getStaticVariables() in %s on line 26
+Warning: ReflectionFunctionAbstract::getStaticVariables() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getName() in %s on line 27
-NULL
\ No newline at end of file
+Warning: ReflectionFunctionAbstract::getName() expects exactly 0 parameters, 1 given in %s on line %d
+NULL
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
index b3e4d9e30f..02de25bab0 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_error.phpt
@@ -8,10 +8,8 @@ var_dump($rc->getDocComment(null));
 var_dump($rc->getDocComment('X'));
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getDocComment() in %s on line %d
+Warning: ReflectionFunctionAbstract::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionFunctionAbstract::getDocComment() in %s on line %d
+Warning: ReflectionFunctionAbstract::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
-
diff --git a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
index 3e6ddc6b2c..790444384d 100644
--- a/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt
@@ -236,7 +236,7 @@ int(65794)
 
 Wrong number of params:
 
-Warning: Wrong parameter count for ReflectionMethod::getModifiers() in %s on line %d
+Warning: ReflectionMethod::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d
 
 ReflectionMethod::getModifiers() modifiers:
 int(256)
diff --git a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
index d60d0406bc..f8d3ca8c11 100644
--- a/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
+++ b/ext/reflection/tests/reflectionClass_FileInfo_error.phpt
@@ -14,24 +14,24 @@ foreach ($methods as $method) {
 }
 ?>
 --EXPECTF--
-unicode(%d) "%s"
+unicode(%s) "%s"
 
-Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9
+Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10
+Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
 int(2)
 
-Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9
+Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10
+Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
 int(2)
 
-Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9
+Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10
+Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionClass_getConstants_error.phpt b/ext/reflection/tests/reflectionClass_getConstants_error.phpt
index 73c407d656..1784d712a4 100644
--- a/ext/reflection/tests/reflectionClass_getConstants_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getConstants_error.phpt
@@ -15,10 +15,10 @@ $rc->getConstants('A', 'B');
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d
 
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 9
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d
 
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 10
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d
 
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 11
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 2 given in %s on line %d
diff --git a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt b/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
index 8892b1d6b0..7e8932a5ed 100644
--- a/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getConstructor_error.phpt
@@ -10,15 +10,14 @@ var_dump($rc->getConstructor(true));
 var_dump($rc->getConstructor(array(1,2,3)));
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 4
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 5
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 6
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionClass_getName_error.phpt b/ext/reflection/tests/reflectionClass_getName_error.phpt
index 6f5699c931..06cc4155be 100644
--- a/ext/reflection/tests/reflectionClass_getName_error.phpt
+++ b/ext/reflection/tests/reflectionClass_getName_error.phpt
@@ -9,9 +9,8 @@ var_dump($r1->getName('X'));
 var_dump($r1->getName('X', true));
 ?> 
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 5
+Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 6
+Warning: ReflectionClass::getName() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
- 
diff --git a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
index cc31a2f42c..52be239121 100644
--- a/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isInstantiable_error.phpt
@@ -12,8 +12,8 @@ var_dump($reflectionClass->IsInstantiable(0, null));
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 7
+Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 8
+Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionClass_isInternal_error.phpt b/ext/reflection/tests/reflectionClass_isInternal_error.phpt
index b1117e8304..ef69a4c393 100644
--- a/ext/reflection/tests/reflectionClass_isInternal_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isInternal_error.phpt
@@ -7,8 +7,8 @@ var_dump($r1->isInternal('X'));
 var_dump($r1->isInternal('X', true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 3
+Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4
+Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
index 077e4d6a6d..ac88884179 100644
--- a/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
+++ b/ext/reflection/tests/reflectionClass_isUserDefined_error.phpt
@@ -7,8 +7,8 @@ var_dump($r1->isUserDefined('X'));
 var_dump($r1->isUserDefined('X', true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 3
+Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4
+Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
index e932c8ad54..c6007b88fe 100644
--- a/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
+++ b/ext/reflection/tests/reflectionObject_FileInfo_error.phpt
@@ -16,22 +16,22 @@ foreach ($methods as $method) {
 --EXPECTF--
 unicode(%d) "%s"
 
-Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 9
+Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getFileName() in %s on line 10
+Warning: ReflectionClass::getFileName() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
 int(2)
 
-Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 9
+Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getStartLine() in %s on line 10
+Warning: ReflectionClass::getStartLine() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
 int(2)
 
-Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 9
+Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getEndLine() in %s on line 10
+Warning: ReflectionClass::getEndLine() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_getConstants_error.phpt b/ext/reflection/tests/reflectionObject_getConstants_error.phpt
index 81ec9ed2ed..d3b90805eb 100644
--- a/ext/reflection/tests/reflectionObject_getConstants_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getConstants_error.phpt
@@ -12,7 +12,6 @@ $rc->getConstants(true);
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 7
-
-Warning: Wrong parameter count for ReflectionClass::getConstants() in %s on line 8
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d
 
+Warning: ReflectionClass::getConstants() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
index 5cabc2ed10..2f52de2ed8 100644
--- a/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getConstructor_error.phpt
@@ -10,15 +10,14 @@ var_dump($rc->getConstructor(true));
 var_dump($rc->getConstructor(array(1,2,3)));
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 4
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 5
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 6
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getConstructor() in %s on line 7
+Warning: ReflectionClass::getConstructor() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_getName_error.phpt b/ext/reflection/tests/reflectionObject_getName_error.phpt
index eb64244c15..ff8e279e9b 100644
--- a/ext/reflection/tests/reflectionObject_getName_error.phpt
+++ b/ext/reflection/tests/reflectionObject_getName_error.phpt
@@ -13,11 +13,11 @@ var_dump($r3->getName('x','y'));
 var_dump($r3->getName(0));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 8
+Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 9
+Warning: ReflectionClass::getName() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::getName() in %s on line 10
+Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
index 8f418ac0e6..f993367b2d 100644
--- a/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isInstantiable_error.phpt
@@ -15,8 +15,8 @@ var_dump($reflectionObject->IsInstantiable(0, null));
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 10
+Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isInstantiable() in %s on line 11
+Warning: ReflectionClass::isInstantiable() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_isInternal_error.phpt b/ext/reflection/tests/reflectionObject_isInternal_error.phpt
index c22d748072..996add6cd4 100644
--- a/ext/reflection/tests/reflectionObject_isInternal_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isInternal_error.phpt
@@ -8,8 +8,8 @@ var_dump($r1->isInternal('X'));
 var_dump($r1->isInternal('X', true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 4
+Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isInternal() in %s on line 5
+Warning: ReflectionClass::isInternal() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
index 70533cf3d6..06be47ae67 100644
--- a/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
+++ b/ext/reflection/tests/reflectionObject_isUserDefined_error.phpt
@@ -8,8 +8,8 @@ var_dump($r1->isUserDefined('X'));
 var_dump($r1->isUserDefined('X', true));
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 4
+Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionClass::isUserDefined() in %s on line 5
+Warning: ReflectionClass::isUserDefined() expects exactly 0 parameters, 2 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionProperty_error.phpt b/ext/reflection/tests/reflectionProperty_error.phpt
index b7822ea796..b04badaa54 100644
--- a/ext/reflection/tests/reflectionProperty_error.phpt
+++ b/ext/reflection/tests/reflectionProperty_error.phpt
@@ -45,23 +45,23 @@ object(ReflectionProperty)#%d (2) {
   unicode(0) ""
 }
 
-Warning: Wrong parameter count for ReflectionProperty::getName() in %s on line %d
+Warning: ReflectionProperty::getName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::isPrivate() in %s on line %d
+Warning: ReflectionProperty::isPrivate() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::isProtected() in %s on line %d
+Warning: ReflectionProperty::isProtected() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::isPublic() in %s on line %d
+Warning: ReflectionProperty::isPublic() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::isStatic() in %s on line %d
+Warning: ReflectionProperty::isStatic() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::getModifiers() in %s on line %d
+Warning: ReflectionProperty::getModifiers() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d
+Warning: ReflectionProperty::isDefault() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
index bfc88a3174..0cc174ed9b 100644
--- a/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
+++ b/ext/reflection/tests/reflectionProperty_getDeclaringClass_variation1.phpt
@@ -24,4 +24,4 @@ object(ReflectionClass)#%d (1) {
 }
 Wrong number of params:
 
-Warning: Wrong parameter count for ReflectionProperty::getDeclaringClass() in %s on line %d
+Warning: ReflectionProperty::getDeclaringClass() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt b/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
index 12a62173c3..dae7be2fb9 100644
--- a/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
+++ b/ext/reflection/tests/reflectionProperty_getDocComment_error.phpt
@@ -15,15 +15,14 @@ var_dump($rc->getDocComment(array(1, 2, 3)));
 
 ?>
 --EXPECTF--
-
-Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d
+Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d
+Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d
+Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for ReflectionProperty::getDocComment() in %s on line %d
+Warning: ReflectionProperty::getDocComment() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
index 99f7c8bbc6..22ee117cc8 100644
--- a/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
+++ b/ext/reflection/tests/reflectionProperty_isDefault_basic.phpt
@@ -60,4 +60,4 @@ bool(true)
 **********************************
 Wrong number of params:
 
-Warning: Wrong parameter count for ReflectionProperty::isDefault() in %s on line %d
+Warning: ReflectionProperty::isDefault() expects exactly 0 parameters, 1 given in %s on line %d