com php-src: Fixed support for constants inherited from interfaces: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Mon, 16 Jun 2014 21:15:51 +0000 |
| Subject: | com php-src: Fixed support for constants inherited from interfaces: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78926@lists.php.net to get a copy of this message | ||
Commit: a8e63d2b566841f915f9f61c22f76af4857b258a
Author: Dmitry Stogov <dmitry@zend.com> Tue, 17 Jun 2014 01:15:51 +0400
Parents: 909acec2319d8343a6e14665e6c5731e6839af6d
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8e63d2b566841f915f9f61c22f76af4857b258a
Log:
Fixed support for constants inherited from interfaces
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f950af6..b48cf0d 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3897,6 +3897,9 @@ static void do_inherit_iface_constant(zend_string *name, zval *zv,
zend_class_en
if (do_inherit_constant_check(&ce->constants_table, zv, name, iface)) {
ZVAL_MAKE_REF(zv);
Z_ADDREF_P(zv);
+ if (Z_CONSTANT_P(Z_REFVAL_P(zv))) {
+ ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
+ }
zend_hash_update(&ce->constants_table, name, zv);
}
}