Fix __METHOD__ in functions nested into methods

diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt
new file mode 100644 (file)
index 0000000..46d55dd
--- /dev/null
+++ b/Zend/tests/nested_method_and_function.phpt
@@ -0,0 +1,29 @@
+--TEST--
+active_class_entry must be always correct (__METHOD__ should not depend on declaring function ce)
+--FILE--
+<?php
+
+namespace Baz;
+
+class Foo {
+       public static function bar() {
+               function foo() {
+                       var_dump(__FUNCTION__);
+                       var_dump(__METHOD__);
+               }
+
+               foo();
+               
+               var_dump(__FUNCTION__);
+               var_dump(__METHOD__);
+       }
+}
+
+Foo::bar();
+
+?>
+--EXPECT--
+string(7) "Baz\foo"
+string(7) "Baz\foo"
+string(3) "bar"
+string(12) "Baz\Foo::bar"

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 6808eedbc63c7a9a81673a93735ad0a316c4cd9a..4cf2a57f751c33022823057576e9056a6814f051 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4793,6 +4793,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast) /* {{{ */
        zend_bool is_method = decl->kind == ZEND_AST_METHOD;
 
        zend_op_array *orig_op_array = CG(active_op_array);
+       zend_class_entry *orig_ce = CG(active_class_entry);
        zend_op_array *op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
        zend_oparray_context orig_oparray_context;
 
@@ -4817,6 +4818,11 @@ void zend_compile_func_decl(znode *result, zend_ast *ast) /* {{{ */
        }
 
        CG(active_op_array) = op_array;
+
+       if (!is_method) {
+               CG(active_class_entry) = NULL;
+       }
+
        zend_oparray_context_begin(&orig_oparray_context);
 
        if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) {
@@ -4852,6 +4858,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast) /* {{{ */
        /* Pop the loop variable stack separator */
        zend_stack_del_top(&CG(loop_var_stack));
 
+       CG(active_class_entry) = orig_ce;
        CG(active_op_array) = orig_op_array;
 }
 /* }}} */