MFH: fix error message (reported by Felipe Nascimento)

diff --git a/Zend/tests/errmsg_038.phpt b/Zend/tests/errmsg_038.phpt
index fdab803ba85e046b109161106ee57acd95c8117a..2927e945fee9eb460b4a96f8f1a2f23e0fdc9bde 100644 (file)
--- a/Zend/tests/errmsg_038.phpt
+++ b/Zend/tests/errmsg_038.phpt
@@ -10,4 +10,4 @@ class test {
 echo "Done\n";
 ?>
 --EXPECTF--    
-Fatal error: Cannot declare property test::$var final, the final modifier is allowed only for methods in %s on line %d
+Fatal error: Cannot declare property test::$var final, the final modifier is allowed only for methods and classes in %s on line %d

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 996304bd346f720e45eef46ea74acd26b9c5b4cb..15ed33ab054c91ab00eddf0626f10a117c5b8862 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3239,7 +3239,7 @@ void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_ty
        }
 
        if (access_type & ZEND_ACC_FINAL) {
-               zend_error(E_COMPILE_ERROR, "Cannot declare property %s::$%s final, the final modifier is allowed only for methods",
+               zend_error(E_COMPILE_ERROR, "Cannot declare property %s::$%s final, the final modifier is allowed only for methods and classes",
                                   CG(active_class_entry)->name, var_name->u.constant.value.str.val);
        }