Fix issue with empty string check and fix tests

Author: ollieread

ext/reflection/php_reflection.c

@@ -2152,20 +2152,22 @@ ZEND_METHOD(ReflectionFunctionAbstract, hasParameter)
         RETURN_FALSE;
     }
 
-    if (ZSTR_LEN(arg_name) != 0) {
-        zend_argument_value_error(1, "must not be an empty string");
-        RETURN_THROWS();
-    }
-
     if (arg_name != NULL) {
+        if (ZSTR_LEN(arg_name) == 0) {
+            zend_argument_value_error(1, "must not be an empty string");
+            RETURN_THROWS();
+        }
+
         if (get_parameter_position(fptr, arg_name, num_args) > -1) {
             RETURN_TRUE;
         }
 
         RETURN_FALSE;
     } else {
+        position -= 1;
+
         if (position < 0) {
-            zend_argument_value_error(1, "must be greater than or equal to 0");
+            zend_argument_value_error(1, "must be greater than or equal to 1");
             RETURN_THROWS();
         }
 
@@ -2202,21 +2204,23 @@ ZEND_METHOD(ReflectionFunctionAbstract, getParameter)
         RETURN_THROWS();
     }
 
-    if (ZSTR_LEN(arg_name) != 0) {
-        zend_argument_value_error(1, "must not be an empty string");
-        RETURN_THROWS();
-    }
-
     if (arg_name != NULL) {
+        if (ZSTR_LEN(arg_name) == 0) {
+            zend_argument_value_error(1, "must not be an empty string");
+            RETURN_THROWS();
+        }
+
         position = get_parameter_position(fptr, arg_name, num_args);
 
         if (position == -1) {
             _DO_THROW("The parameter specified by its name could not be found");
             RETURN_THROWS();
         }
     } else {
+        position -= 1;
+
         if (position < 0) {
-            zend_argument_value_error(1, "must be greater than or equal to 0");
+            zend_argument_value_error(1, "must be greater than or equal to 1");
             RETURN_THROWS();
         }
         if (position >= num_args) {

ext/reflection/tests/ReflectionFunction_getParameter_basic.phpt

@@ -7,12 +7,12 @@ function foo(string $bar) {}
 $function = new ReflectionFunction('sort');
 var_dump($function->getParameter('array'));
 var_dump($function->getParameter('flags'));
-var_dump($function->getParameter(0));
 var_dump($function->getParameter(1));
+var_dump($function->getParameter(2));
 
 $function = new ReflectionFunction('foo');
 var_dump($function->getParameter('bar'));
-var_dump($function->getParameter(0));
+var_dump($function->getParameter(1));
 ?>
 --EXPECT--
 object(ReflectionParameter)#2 (1) {

ext/reflection/tests/ReflectionFunction_getParameter_error.phpt

@@ -38,16 +38,16 @@ try {
 }
 
 try {
-    var_dump($function->getParameter(1));
+    var_dump($function->getParameter(2));
 } catch(ReflectionException $e) {
     print($e->getMessage() . PHP_EOL);
 }
 
 ?>
 --EXPECT--
 The parameter specified by its name could not be found
-ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 1
 The parameter specified by its offset could not be found
 The parameter specified by its name could not be found
-ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 1
 The parameter specified by its offset could not be found

ext/reflection/tests/ReflectionFunction_hasParameter_basic.phpt

@@ -8,15 +8,15 @@ $function = new ReflectionFunction('sort');
 var_dump($function->hasParameter('array'));
 var_dump($function->hasParameter('Array'));
 var_dump($function->hasParameter('string'));
-var_dump($function->hasParameter(0));
 var_dump($function->hasParameter(1));
+var_dump($function->hasParameter(2));
 
 $function = new ReflectionFunction('foo');
 var_dump($function->hasParameter('bar'));
 var_dump($function->hasParameter('Bar'));
 var_dump($function->hasParameter('string'));
-var_dump($function->hasParameter(0));
 var_dump($function->hasParameter(1));
+var_dump($function->hasParameter(2));
 ?>
 --EXPECT--
 bool(true)

ext/reflection/tests/ReflectionFunction_hasParameter_error.phpt

@@ -21,5 +21,5 @@ try {
 }
 ?>
 --EXPECT--
-ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 0
-ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 1
+ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 1

ext/reflection/tests/ReflectionMethod_getParameter_basic.phpt

@@ -8,11 +8,11 @@ class C {
 
 $method = new ReflectionMethod('WeakReference', 'create');
 var_dump($method->getParameter('object'));
-var_dump($method->getParameter(0));
+var_dump($method->getParameter(1));
 
 $method = new ReflectionMethod('C', 'foo');
 var_dump($method->getParameter('bar'));
-var_dump($method->getParameter(0));
+var_dump($method->getParameter(1));
 ?>
 --EXPECT--
 object(ReflectionParameter)#2 (1) {

ext/reflection/tests/ReflectionMethod_getParameter_error.phpt

@@ -41,15 +41,15 @@ try {
 }
 
 try {
-    var_dump($method->getParameter(1));
+    var_dump($method->getParameter(2));
 } catch (ReflectionException $e) {
     print($e->getMessage() . PHP_EOL);
 }
 ?>
 --EXPECT--
 The parameter specified by its name could not be found
-ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 1
 The parameter specified by its offset could not be found
 The parameter specified by its name could not be found
-ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::getParameter(): Argument #1 ($parameter) must be greater than or equal to 1
 The parameter specified by its offset could not be found

ext/reflection/tests/ReflectionMethod_hasParameter_basic.phpt

@@ -10,15 +10,15 @@ $method = new ReflectionMethod('WeakReference', 'create');
 var_dump($method->hasParameter('object'));
 var_dump($method->hasParameter('Object'));
 var_dump($method->hasParameter('string'));
-var_dump($method->hasParameter(0));
 var_dump($method->hasParameter(1));
+var_dump($method->hasParameter(2));
 
 $method = new ReflectionMethod('C', 'foo');
 var_dump($method->hasParameter('bar'));
 var_dump($method->hasParameter('Bar'));
 var_dump($method->hasParameter('string'));
-var_dump($method->hasParameter(0));
 var_dump($method->hasParameter(1));
+var_dump($method->hasParameter(2));
 ?>
 --EXPECT--
 bool(true)

ext/reflection/tests/ReflectionMethod_hasParameter_error.phpt

@@ -23,5 +23,5 @@ try {
 }
 ?>
 --EXPECT--
-ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 0
-ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 0
+ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 1
+ReflectionFunctionAbstract::hasParameter(): Argument #1 ($parameter) must be greater than or equal to 1