Address review comments

Author: kocsismate

Zend/tests/bug49472.phpt

@@ -24,4 +24,4 @@ new FooBar;
 
 ?>
 --EXPECTF--
-Fatal error: Cannot inherit previously-inherited or override constant c from interface ia in %s on line %d
+Fatal error: Cannot inherit previously-inherited or override constant FooBar::c from interface ia in %s on line %d

Zend/tests/constants/final_constants/final_const10.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Interface constants inherited from other interfaces can be redeclared
+--FILE--
+<?php
+
+interface I1
+{
+    const C = 1;
+}
+
+interface I2
+{
+    const C = 2;
+}
+
+interface I3 extends I1, I2
+{
+    const C = 3;
+}
+
+?>
+--EXPECT--

Zend/tests/constants/final_constants/final_const11.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Class constants cannot be inherited from both a class and an interface
+--FILE--
+<?php
+
+class C
+{
+    const C = 1;
+}
+
+interface I
+{
+    const C = 1;
+}
+
+class C2 extends C implements I
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot inherit previously-inherited or override constant C2::C from interface I in %s on line %d

Zend/tests/constants/final_constants/final_const12.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Interface constants cannot be inherited from other interfaces
+--FILE--
+<?php
+
+interface I1
+{
+    const C = 1;
+}
+
+interface I2
+{
+    const C = 2;
+}
+
+interface I3 extends I1, I2
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot inherit previously-inherited or override constant I3::C from interface I2 in %s on line %d

Zend/tests/constants/final_constants/final_const3.phpt

@@ -10,4 +10,4 @@ class Foo
 
 ?>
 --EXPECTF--
-Fatal error: Private constant Foo::A cannot be final as it is never overridden in %s on line %d
+Fatal error: Private constant Foo::A cannot be final as it is not visible to other classes in %s on line %d

Zend/tests/constants/final_constants/final_const8.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Class constants cannot be inherited from two different interfaces
+--FILE--
+<?php
+
+interface I1
+{
+    const C = 1;
+}
+
+interface I2
+{
+    const C = 1;
+}
+
+class C implements I1, I2
+{
+}
+
+?>
+--EXPECTF--
+Fatal error: Cannot inherit previously-inherited or override constant C::C from interface I2 in %s on line %d

Zend/tests/constants/final_constants/final_const9.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Class constants inherited from interfaces can be redeclared
+--FILE--
+<?php
+
+interface I1
+{
+    const C = 1;
+}
+
+interface I2
+{
+    const C = 2;
+}
+
+class C implements I1, I2
+{
+    const C = 3;
+}
+
+?>
+--EXPECT--

Zend/tests/errmsg_025.phpt

@@ -17,4 +17,4 @@ class test implements test1, test2 {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Cannot inherit previously-inherited or override constant FOO from interface test2 in %s on line %d
+Fatal error: Cannot inherit previously-inherited or override constant test::FOO from interface test2 in %s on line %d

Zend/zend_API.c

@@ -4331,12 +4331,12 @@ ZEND_API void zend_declare_property_stringl(zend_class_entry *ce, const char *na
 }
 /* }}} */
 
-ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, int access_type, zend_string *doc_comment) /* {{{ */
+ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *ce, zend_string *name, zval *value, int flags, zend_string *doc_comment) /* {{{ */
 {
 	zend_class_constant *c;
 
 	if (ce->ce_flags & ZEND_ACC_INTERFACE) {
-		if (!(access_type & ZEND_ACC_PUBLIC)) {
+		if (!(flags & ZEND_ACC_PUBLIC)) {
 			zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface constant %s::%s must be public", ZSTR_VAL(ce->name), ZSTR_VAL(name));
 		}
 	}
@@ -4356,7 +4356,7 @@ ZEND_API zend_class_constant *zend_declare_class_constant_ex(zend_class_entry *c
 		c = zend_arena_alloc(&CG(arena), sizeof(zend_class_constant));
 	}
 	ZVAL_COPY_VALUE(&c->value, value);
-	ZEND_CLASS_CONST_FLAGS(c) = access_type;
+	ZEND_CLASS_CONST_FLAGS(c) = flags;
 	c->doc_comment = doc_comment;
 	c->attributes = NULL;
 	c->ce = ce;

Zend/zend_compile.c

@@ -7306,7 +7306,7 @@ void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_ast *attr
 
 		if (UNEXPECTED((flags & ZEND_ACC_PRIVATE) && (flags & ZEND_ACC_FINAL))) {
 			zend_error_noreturn(
-				E_COMPILE_ERROR, "Private constant %s::%s cannot be final as it is never overridden",
+				E_COMPILE_ERROR, "Private constant %s::%s cannot be final as it is not visible to other classes",
 				ZSTR_VAL(ce->name), ZSTR_VAL(name)
 			);
 		}