Address code review comments + fix tests

Author: kocsismate

ext/reflection/php_reflection.c

@@ -2982,7 +2982,7 @@ ZEND_METHOD(ReflectionMethod, __construct)
 
 	zend_object *orig_obj = NULL;
 	zend_class_entry *ce = NULL;
-	zend_string *class_name;
+	zend_string *class_name = NULL;
 	char *method_name;
 	size_t method_name_len;
 	char *lcname;
@@ -2999,12 +2999,12 @@ ZEND_METHOD(ReflectionMethod, __construct)
 		Z_PARAM_STR_OR_NULL(arg2_str)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (arg1_obj && !arg2_str) {
-		zend_argument_value_error(2, "cannot be null when argument #1 ($objectOrMethod) is an object");
-		RETURN_THROWS();
-	}
-
 	if (arg1_obj) {
+		if (!arg2_str) {
+			zend_argument_value_error(2, "cannot be null when argument #1 ($objectOrMethod) is an object");
+			RETURN_THROWS();
+		}
+
 		orig_obj = arg1_obj;
 		ce = arg1_obj->ce;
 		method_name = ZSTR_VAL(arg2_str);
@@ -3023,17 +3023,20 @@ ZEND_METHOD(ReflectionMethod, __construct)
 
 		class_name = zend_string_init(name, tmp_len, 0);
 		method_name = tmp + 2;
-		method_name_len = name - tmp - 2;
+		method_name_len = ZSTR_LEN(arg1_str) - tmp_len - 2;
 	}
 
-	if (!ce && (ce = zend_lookup_class(class_name)) == NULL) {
-		if (!EG(exception)) {
-			zend_throw_exception_ex(reflection_exception_ptr, 0, "Class \"%s\" does not exist", ZSTR_VAL(class_name));
+	if (class_name) {
+		if ((ce = zend_lookup_class(class_name)) == NULL) {
+			if (!EG(exception)) {
+				zend_throw_exception_ex(reflection_exception_ptr, 0, "Class \"%s\" does not exist", ZSTR_VAL(class_name));
+			}
+			zend_string_release(class_name);
+			RETURN_THROWS();
 		}
+
 		zend_string_release(class_name);
-		RETURN_THROWS();
 	}
-	zend_string_release(class_name);
 
 	object = ZEND_THIS;
 	intern = Z_REFLECTION_P(object);

ext/reflection/tests/008.phpt

@@ -34,6 +34,6 @@ string(24) "Class "a" does not exist"
 string(23) "Class "" does not exist"
 string(24) "Class "a" does not exist"
 string(23) "Class "" does not exist"
-string(103) "ReflectionMethod::__construct(): Argument #1 ($objectOrMethod) must be of type object|string, int given"
+string(24) "Class "1" does not exist"
 string(23) "Class "" does not exist"
 Done

ext/reflection/tests/ReflectionMethod_006.phpt

@@ -8,16 +8,16 @@ Steve Seear <[email protected]>
 
 try {
     new ReflectionMethod();
-} catch (TypeError $re) {
+} catch (ArgumentCountError $re) {
     echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
     new ReflectionMethod('a', 'b', 'c');
-} catch (TypeError $re) {
+} catch (ArgumentCountError $re) {
     echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
 ?>
 --EXPECT--
-Ok - ReflectionMethod::__construct() expects exactly 1 argument, 0 given
-Ok - ReflectionMethod::__construct() expects exactly 1 argument, 3 given
+Ok - ReflectionMethod::__construct() expects at least 1 argument, 0 given
+Ok - ReflectionMethod::__construct() expects at most 2 arguments, 3 given

ext/reflection/tests/ReflectionMethod_constructor_error2.phpt

@@ -16,13 +16,13 @@ class TestClass
 try {
     echo "Too few arguments:\n";
     $methodInfo = new ReflectionMethod();
-} catch (TypeError $re) {
+} catch (ArgumentCountError $re) {
     echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 try {
     echo "\nToo many arguments:\n";
     $methodInfo = new ReflectionMethod("TestClass", "foo", true);
-} catch (TypeError $re) {
+} catch (ArgumentCountError $re) {
     echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
@@ -38,7 +38,7 @@ try {
 try {
     //invalid 1st param
     $methodInfo = new ReflectionMethod([], "foo");
-} catch (ReflectionException $re) {
+} catch (TypeError $re) {
     echo "Ok - ".$re->getMessage().PHP_EOL;
 }
 
@@ -52,10 +52,10 @@ try{
 ?>
 --EXPECT--
 Too few arguments:
-Ok - ReflectionMethod::__construct() expects exactly 1 argument, 0 given
+Ok - ReflectionMethod::__construct() expects at least 1 argument, 0 given
 
 Too many arguments:
-Ok - ReflectionMethod::__construct() expects exactly 1 argument, 3 given
+Ok - ReflectionMethod::__construct() expects at most 2 arguments, 3 given
 Ok - Class "InvalidClassName" does not exist
 Ok - ReflectionMethod::__construct(): Argument #1 ($objectOrMethod) must be of type object|string, array given
-Ok - ReflectionMethod::__construct() expects exactly 1 argument, 2 given
+Ok - ReflectionMethod::__construct(): Argument #2 ($method) must be of type ?string, array given