Fixed bug #30961 (Wrong linenumber in ReflectionClass getStartLine())

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 76d057c54b4799394b81f2fe1180113999b09b63..494c62a5bdbf5c7587c7bf1c8a9d1f5d27b86439 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2579,8 +2579,8 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
 
        zend_initialize_class_data(new_class_entry, 1 TSRMLS_CC);
        new_class_entry->filename = zend_get_compiled_filename(TSRMLS_C);
-       new_class_entry->line_start = zend_get_compiled_lineno(TSRMLS_C);
-       new_class_entry->ce_flags |= class_token->u.constant.value.lval;
+       new_class_entry->line_start = class_token->u.opline_num;
+       new_class_entry->ce_flags |= class_token->u.EA.type;
 
        if (parent_class_name && parent_class_name->op_type != IS_UNUSED) {
                doing_inheritance = 1;

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index b5cf6ae9fed5e341d11ead73daa57ccd9bbcaa96..69286cfb04f81feec77c3598b8bbc78334567da8 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -302,9 +302,9 @@ unticked_class_declaration_statement:
 
 
 class_entry_type:
-               T_CLASS                 {  $$.u.constant.value.lval = 0; }
-       |       T_ABSTRACT T_CLASS { $$.u.constant.value.lval = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
-       |       T_FINAL T_CLASS { $$.u.constant.value.lval = ZEND_ACC_FINAL_CLASS; }
+               T_CLASS                 { $$.u.opline_num = CG(zend_lineno); $$.u.EA.type = 0; }
+       |       T_ABSTRACT T_CLASS { $$.u.opline_num = CG(zend_lineno); $$.u.EA.type = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
+       |       T_FINAL T_CLASS { $$.u.opline_num = CG(zend_lineno); $$.u.EA.type = ZEND_ACC_FINAL_CLASS; }
 ;
 
 extends_from:
@@ -313,7 +313,7 @@ extends_from:
 ;
 
 interface_entry:
-       T_INTERFACE             { $$.u.constant.value.lval = ZEND_ACC_INTERFACE; }
+       T_INTERFACE             { $$.u.opline_num = CG(zend_lineno); $$.u.EA.type = ZEND_ACC_INTERFACE; }
 ;
 
 interface_extends_list:

diff --git a/ext/reflection/tests/bug30961.phpt b/ext/reflection/tests/bug30961.phpt
new file mode 100755 (executable)
index 0000000..7806747
--- /dev/null
+++ b/ext/reflection/tests/bug30961.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #30961 (Wrong linenumber in ReflectionClass getStartLine())
+--FILE--
+<?
+    class a
+    {
+    }
+
+    class b extends a
+    {
+    }
+
+    $ref1 = new ReflectionClass('a');
+    $ref2 = new ReflectionClass('b');
+    echo $ref1->getStartLine() . "\n";
+    echo $ref2->getStartLine() . "\n";
+?>
+--EXPECT--
+2
+6