From: Nikita Popov <nikic@php.net>
Date: Wed, 4 May 2016 16:43:55 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfef17ab657a2c9796c5bc9d94c746ca94cf0377;p=php

Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_compile.c
---

bfef17ab657a2c9796c5bc9d94c746ca94cf0377
diff --cc Zend/zend_compile.c
index 46c057e4f2,593c19e015..50bcb3b7ad
--- a/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)) {