Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_compile.c

diff --cc Zend/zend_compile.c
index 46c057e4f20baeabf370cd3be55713dea653666c,593c19e01519d12f611d1fccd7b250e306f4568e..50bcb3b7ad46910d3e8c06f35ef1b767f2736306
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -5313,11 -4819,11 +5313,11 @@@ void zend_begin_method_decl(zend_op_arr
  static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl) /* {{{ */
  {
        zend_ast *params_ast = decl->child[0];
-       zend_string *name = decl->name, *lcname, *key;
 -      zend_string *unqualified_name, *name, *lcname;
++      zend_string *unqualified_name, *name, *lcname, *key;
        zend_op *opline;
  
-       op_array->function_name = name = zend_prefix_with_ns(name);
- 
+       unqualified_name = decl->name;
+       op_array->function_name = name = zend_prefix_with_ns(unqualified_name);
        lcname = zend_string_tolower(name);
  
        if (FC(imports_function)) {