From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 24 Nov 2020 15:42:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70f59b3416992341f9245459f9cd26f363151f1c;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix usage of casted string in ReflectionParameter ctor
---

70f59b3416992341f9245459f9cd26f363151f1c
diff --cc ext/reflection/php_reflection.c
index 114b2c273f,6384e2b410..dfa084caa5
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -2306,11 -2306,11 +2306,11 @@@ ZEND_METHOD(ReflectionParameter, __cons
  					/* nothing to do. don't set is_closure since is the invoke handler,
  					   not the closure itself */
  				} else if ((fptr = zend_hash_find_ptr(&ce->function_table, lcname)) == NULL) {
+ 					zend_throw_exception_ex(reflection_exception_ptr, 0,
+ 						"Method %s::%s() does not exist", ZSTR_VAL(ce->name), ZSTR_VAL(name));
  					zend_string_release(name);
  					zend_string_release(lcname);
- 					zend_throw_exception_ex(reflection_exception_ptr, 0,
- 						"Method %s::%s() does not exist", ZSTR_VAL(ce->name), Z_STRVAL_P(method));
 -					return;
 +					RETURN_THROWS();
  				}
  				zend_string_release(name);
  				zend_string_release(lcname);