Improve error messages of ext/reflection

kocsismate · kocsismate · commit d7b73de8c929 · 2020-03-23T17:23:45.000+01:00
Closes GH-5277
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -2211,7 +2211,7 @@ ZEND_METHOD(reflection_parameter, __construct)
 			break;
 
 		default:
-			_DO_THROW("The parameter class is expected to be either a string, an array(class, method) or a callable object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be either a string, an array(class, method) or a callable object, %s given", zend_zval_type_name(reference));
 			RETURN_THROWS();
 	}
 
@@ -2876,8 +2876,7 @@ ZEND_METHOD(reflection_method, __construct)
 		}
 
 		if ((tmp = strstr(name_str, "::")) == NULL) {
-			zend_throw_exception_ex(reflection_exception_ptr, 0,
-				"Invalid method name %s", name_str);
+			zend_argument_error(reflection_exception_ptr, 1, "must be a valid method name");
 			RETURN_THROWS();
 		}
 		classname = &ztmp;
@@ -2918,7 +2917,7 @@ ZEND_METHOD(reflection_method, __construct)
 			if (classname == &ztmp) {
 				zval_ptr_dtor_str(&ztmp);
 			}
-			_DO_THROW("The parameter class is expected to be either a string or an object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be of type object|string, %s given", zend_zval_type_name(classname));
 			RETURN_THROWS();
 	}
 
@@ -3457,7 +3456,7 @@ ZEND_METHOD(reflection_class_constant, __construct)
 			break;
 
 		default:
-			_DO_THROW("The parameter class is expected to be either a string or an object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be of type object|string, %s given", zend_zval_type_name(classname));
 			RETURN_THROWS();
 	}
 
@@ -4924,8 +4923,7 @@ ZEND_METHOD(reflection_class, isSubclassOf)
 			}
 			/* no break */
 		default:
-			zend_throw_exception_ex(reflection_exception_ptr, 0,
-					"Parameter one must either be a string or a ReflectionClass object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be of type ReflectionClass|string, %s given", zend_zval_type_name(class_name));
 			RETURN_THROWS();
 	}
 
@@ -4967,8 +4965,7 @@ ZEND_METHOD(reflection_class, implementsInterface)
 			}
 			/* no break */
 		default:
-			zend_throw_exception_ex(reflection_exception_ptr, 0,
-					"Parameter one must either be a string or a ReflectionClass object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be of type ReflectionClass|string, %s given", zend_zval_type_name(interface));
 			RETURN_THROWS();
 	}
 
@@ -5155,7 +5152,7 @@ ZEND_METHOD(reflection_property, __construct)
 			break;
 
 		default:
-			_DO_THROW("The parameter class is expected to be either a string or an object");
+			zend_argument_error(reflection_exception_ptr, 1, "must be of type object|string, %s given", zend_zval_type_name(classname));
 			RETURN_THROWS();
 	}
 
@@ -6144,7 +6141,7 @@ ZEND_METHOD(reflection_reference, fromArrayElement)
 	} else if (Z_TYPE_P(key) == IS_STRING) {
 		item = zend_symtable_find(ht, Z_STR_P(key));
 	} else {
-		zend_type_error("Key must be array or string");
+		zend_argument_type_error(2, "must be of type string|int, %s given", zend_zval_type_name(key));
 		RETURN_THROWS();
 	}
 
diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt
@@ -27,13 +27,13 @@ foreach ($a as $key=>$val) {
 echo "Done\n";
 ?>
 --EXPECT--
-string(20) "Invalid method name "
-string(21) "Invalid method name 1"
+string(91) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name"
+string(91) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name"
 string(21) "Class  does not exist"
 string(22) "Class a does not exist"
 string(21) "Class  does not exist"
 string(22) "Class a does not exist"
 string(21) "Class  does not exist"
-string(66) "The parameter class is expected to be either a string or an object"
+string(104) "ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be of type object|string, int given"
 string(21) "Class  does not exist"
 Done
diff --git a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
@@ -65,7 +65,7 @@ try {
     echo $e->getMessage() . "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Does A implement A? 
    - Using object argument: A is not an interface
    - Using string argument: A is not an interface
@@ -146,6 +146,6 @@ Does I2 implement I2?
 Test bad arguments:
 ReflectionClass::implementsInterface() expects exactly 1 parameter, 0 given
 ReflectionClass::implementsInterface() expects exactly 1 parameter, 2 given
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::implementsInterface(): Argument #1 ($interface) must be of type ReflectionClass|string, null given
 Interface ThisClassDoesNotExist does not exist
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::implementsInterface(): Argument #1 ($interface) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_002.phpt
@@ -39,6 +39,6 @@ try {
 Test bad arguments:
 ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given
 ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, null given
 Class ThisClassDoesNotExist does not exist
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
@@ -65,17 +65,17 @@ try {
 ?>
 --EXPECTF--
 Wrong type of argument (bool):
-ReflectionException: Invalid method name 1 in %s
+ReflectionException: ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name in %s:%d
 Stack trace:
 #0 %s ReflectionMethod->__construct('1')
 #1 {main}
 Wrong type of argument (int):
-ReflectionException: Invalid method name 3 in %s
+ReflectionException: ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name in %s:%d
 Stack trace:
 #0 %s ReflectionMethod->__construct('3')
 #1 {main}
 Wrong type of argument (bool, string):
-ReflectionException: The parameter class is expected to be either a string or an object in %s
+ReflectionException: ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be of type object|string, bool given in %s:%d
 Stack trace:
 #0 %s ReflectionMethod->__construct(true, 'foo')
 #1 {main}
@@ -85,7 +85,7 @@ Stack trace:
 #0 %s ReflectionMethod->__construct('TestClass', '1')
 #1 {main}
 No method given:
-ReflectionException: Invalid method name TestClass in %s
+ReflectionException: ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be a valid method name in %s:%d
 Stack trace:
 #0 %s ReflectionMethod->__construct('TestClass')
 #1 {main}
diff --git a/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt b/ext/reflection/tests/ReflectionMethod_constructor_error2.phpt
@@ -57,5 +57,5 @@ Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 0 given
 Too many arguments:
 Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 3 given
 Ok - Class InvalidClassName does not exist
-Ok - The parameter class is expected to be either a string or an object
+Ok - ReflectionMethod::__construct(): Argument #1 ($class_or_method) must be of type object|string, array given
 Ok - ReflectionMethod::__construct() expects exactly 1 parameter, 2 given
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf.002.phpt
@@ -39,6 +39,6 @@ try {
 Test bad arguments:
 ReflectionClass::isSubclassOf() expects exactly 1 parameter, 0 given
 ReflectionClass::isSubclassOf() expects exactly 1 parameter, 2 given
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, null given
 Class ThisClassDoesNotExist does not exist
-Parameter one must either be a string or a ReflectionClass object
+ReflectionClass::isSubclassOf(): Argument #1 ($class) must be of type ReflectionClass|string, int given
diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
@@ -44,5 +44,5 @@ Class A does not exist
 Method C::b() does not exist
 Method C::b() does not exist
 Ok - ReflectionParameter::__construct() expects exactly 2 parameters, 1 given
-Ok - The parameter class is expected to be either a string, an array(class, method) or a callable object
+Ok - ReflectionParameter::__construct(): Argument #1 ($function) must be either a string, an array(class, method) or a callable object, int given
 Done.
diff --git a/ext/reflection/tests/ReflectionProperty_constructor_error.phpt b/ext/reflection/tests/ReflectionProperty_constructor_error.phpt
@@ -38,7 +38,7 @@ Non-existent class:
 Class NonExistentClass does not exist
 
 Wrong property parameter type:
-The parameter class is expected to be either a string or an object
+ReflectionProperty::__construct(): Argument #1 ($class) must be of type object|string, int given
 
 Non-existent property:
 Property TestClass::$nonExistentProperty does not exist
diff --git a/ext/reflection/tests/ReflectionReference_errors.phpt b/ext/reflection/tests/ReflectionReference_errors.phpt
@@ -42,7 +42,7 @@ var_dump(unserialize('O:19:"ReflectionReference":0:{}'));
 --EXPECTF--
 Call to private ReflectionReference::__construct() from invalid context
 ReflectionReference::fromArrayElement(): Argument #1 ($array) must be of type array, object given
-Key must be array or string
+ReflectionReference::fromArrayElement(): Argument #2 ($key) must be of type string|int, float given
 Array key not found
 Serialization of 'ReflectionReference' is not allowed
 

Original file line number	Diff line number	Diff line change
`@@ -2211,7 +2211,7 @@ ZEND_METHOD(reflection_parameter, __construct)`
`2211`	`2211`	`break;`
`2212`	`2212`
`2213`	`2213`	`default:`
`2214`		`- _DO_THROW("The parameter class is expected to be either a string, an array(class, method) or a callable object");`
	`2214`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be either a string, an array(class, method) or a callable object, %s given", zend_zval_type_name(reference));`
`2215`	`2215`	`RETURN_THROWS();`
`2216`	`2216`	`}`
`2217`	`2217`
`@@ -2876,8 +2876,7 @@ ZEND_METHOD(reflection_method, __construct)`
`2876`	`2876`	`}`
`2877`	`2877`
`2878`	`2878`	`if ((tmp = strstr(name_str, "::")) == NULL) {`
`2879`		`- zend_throw_exception_ex(reflection_exception_ptr, 0,`
`2880`		`- "Invalid method name %s", name_str);`
	`2879`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be a valid method name");`
`2881`	`2880`	`RETURN_THROWS();`
`2882`	`2881`	`}`
`2883`	`2882`	`classname = &ztmp;`
`@@ -2918,7 +2917,7 @@ ZEND_METHOD(reflection_method, __construct)`
`2918`	`2917`	`if (classname == &ztmp) {`
`2919`	`2918`	`zval_ptr_dtor_str(&ztmp);`
`2920`	`2919`	`}`
`2921`		`- _DO_THROW("The parameter class is expected to be either a string or an object");`
	`2920`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be of type object\|string, %s given", zend_zval_type_name(classname));`
`2922`	`2921`	`RETURN_THROWS();`
`2923`	`2922`	`}`
`2924`	`2923`
`@@ -3457,7 +3456,7 @@ ZEND_METHOD(reflection_class_constant, __construct)`
`3457`	`3456`	`break;`
`3458`	`3457`
`3459`	`3458`	`default:`
`3460`		`- _DO_THROW("The parameter class is expected to be either a string or an object");`
	`3459`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be of type object\|string, %s given", zend_zval_type_name(classname));`
`3461`	`3460`	`RETURN_THROWS();`
`3462`	`3461`	`}`
`3463`	`3462`
`@@ -4924,8 +4923,7 @@ ZEND_METHOD(reflection_class, isSubclassOf)`
`4924`	`4923`	`}`
`4925`	`4924`	`/* no break */`
`4926`	`4925`	`default:`
`4927`		`- zend_throw_exception_ex(reflection_exception_ptr, 0,`
`4928`		`- "Parameter one must either be a string or a ReflectionClass object");`
	`4926`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be of type ReflectionClass\|string, %s given", zend_zval_type_name(class_name));`
`4929`	`4927`	`RETURN_THROWS();`
`4930`	`4928`	`}`
`4931`	`4929`
`@@ -4967,8 +4965,7 @@ ZEND_METHOD(reflection_class, implementsInterface)`
`4967`	`4965`	`}`
`4968`	`4966`	`/* no break */`
`4969`	`4967`	`default:`
`4970`		`- zend_throw_exception_ex(reflection_exception_ptr, 0,`
`4971`		`- "Parameter one must either be a string or a ReflectionClass object");`
	`4968`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be of type ReflectionClass\|string, %s given", zend_zval_type_name(interface));`
`4972`	`4969`	`RETURN_THROWS();`
`4973`	`4970`	`}`
`4974`	`4971`
`@@ -5155,7 +5152,7 @@ ZEND_METHOD(reflection_property, __construct)`
`5155`	`5152`	`break;`
`5156`	`5153`
`5157`	`5154`	`default:`
`5158`		`- _DO_THROW("The parameter class is expected to be either a string or an object");`
	`5155`	`+ zend_argument_error(reflection_exception_ptr, 1, "must be of type object\|string, %s given", zend_zval_type_name(classname));`
`5159`	`5156`	`RETURN_THROWS();`
`5160`	`5157`	`}`
`5161`	`5158`
`@@ -6144,7 +6141,7 @@ ZEND_METHOD(reflection_reference, fromArrayElement)`
`6144`	`6141`	`} else if (Z_TYPE_P(key) == IS_STRING) {`
`6145`	`6142`	`item = zend_symtable_find(ht, Z_STR_P(key));`
`6146`	`6143`	`} else {`
`6147`		`- zend_type_error("Key must be array or string");`
	`6144`	`+ zend_argument_type_error(2, "must be of type string\|int, %s given", zend_zval_type_name(key));`
`6148`	`6145`	`RETURN_THROWS();`
`6149`	`6146`	`}`
`6150`	`6147`