Fix constant inheritance check

nikic · nikic · commit cd2506f766d5 · 2021-07-06T16:41:04.000+02:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1648,7 +1648,7 @@ static bool do_inherit_constant_check(
 		);
 	}
 
-	if (old_constant->ce != parent_constant->ce && (old_constant->ce->ce_flags & ZEND_ACC_INTERFACE)) {
+	if (old_constant->ce != parent_constant->ce && old_constant->ce != ce) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Cannot inherit previously-inherited or override constant %s::%s from interface %s", ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(iface->name));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1648,7 +1648,7 @@ static bool do_inherit_constant_check(`
`1648`	`1648`	`);`
`1649`	`1649`	`}`
`1650`	`1650`
`1651`		`- if (old_constant->ce != parent_constant->ce && (old_constant->ce->ce_flags & ZEND_ACC_INTERFACE)) {`
	`1651`	`+ if (old_constant->ce != parent_constant->ce && old_constant->ce != ce) {`
`1652`	`1652`	`zend_error_noreturn(E_COMPILE_ERROR, "Cannot inherit previously-inherited or override constant %s::%s from interface %s", ZSTR_VAL(ce->name), ZSTR_VAL(name), ZSTR_VAL(iface->name));`
`1653`	`1653`	`}`
`1654`	`1654`