Differentiate inferred and explicit staticness in reflection function dump

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -904,6 +904,9 @@ static void _function_string(smart_str *str, zend_function *fptr, zend_class_ent
 	if (fptr->common.fn_flags & ZEND_ACC_CTOR) {
 		smart_str_appends(str, ", ctor");
 	}
+	if ((fptr->common.fn_flags & ZEND_ACC_STATIC) && (fptr->common.fn_flags2 & ZEND_ACC2_INFERRED_STATIC)) {
+		smart_str_appends(str, ", inferred static");
+	}
 	smart_str_appends(str, "> ");
 
 	if (fptr->common.fn_flags & ZEND_ACC_ABSTRACT) {
@@ -912,7 +915,9 @@ static void _function_string(smart_str *str, zend_function *fptr, zend_class_ent
 	if (fptr->common.fn_flags & ZEND_ACC_FINAL) {
 		smart_str_appends(str, "final ");
 	}
-	if (fptr->common.fn_flags & ZEND_ACC_STATIC) {
+	if ((fptr->common.fn_flags & ZEND_ACC_STATIC)
+	 /* Don't show static twice for static-inferred functions. */
+	 && !(fptr->common.fn_flags2 & ZEND_ACC2_INFERRED_STATIC)) {
 		smart_str_appends(str, "static ");
 	}
 

ext/reflection/tests/ReflectionFunction__toString_bound_variables.phpt

@@ -19,10 +19,10 @@ echo (string) $rf;
 
 ?>
 --EXPECTF--
-Closure [ <user> static function {closure:%s:%d} ] {
+Closure [ <user, inferred static> function {closure:%s:%d} ] {
   @@ %sReflectionFunction__toString_bound_variables.php 3 - 3
 }
-Closure [ <user> static function {closure:%s:%d} ] {
+Closure [ <user, inferred static> function {closure:%s:%d} ] {
   @@ %sReflectionFunction__toString_bound_variables.php 9 - 12
 
   - Bound Variables [2] {