Merge branch 'PHP-7.4'

* PHP-7.4:
  Revert "Fixed bug #78903: Conflict in RTD key for closures results in crash"

diff --cc Zend/zend_compile.c
index ab340981642cae92b51c9eb3c62f9a9f399c80c7,b6a120c94b2328bea8e2d603eaad4310d7018c93..d95009703d286e7be308e78f1f14c1acf7081d9a
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -6079,8 -5874,9 +6079,8 @@@ void zend_begin_method_decl(zend_op_arr
  }
  /* }}} */
  
- static int zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
+ static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
  {
 -      zend_ast *params_ast = decl->child[0];
        zend_string *unqualified_name, *name, *lcname, *key;
        zend_op *opline;