Improved fix for bug #41633 (self:: doesn't work for constants) to support function...

diff --git a/Zend/tests/bug41633_4.phpt b/Zend/tests/bug41633_4.phpt
new file mode 100755 (executable)
index 0000000..3507f6a
--- /dev/null
+++ b/Zend/tests/bug41633_4.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #41633.4 (self:: doesn't work for constants)
+--FILE--
+<?php
+class Foo {
+       const A = self::B;
+       const B = "ok";
+}
+var_dump(defined("Foo::A"));
+?>
+--EXPECT--
+bool(true)

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index ab0c1c5122df8ba8bd1e9e05a2c0afe9961ba6c4..fba024ac44d12455794679c93ea3adbe0c02b4d5 100644 (file)
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -271,7 +271,7 @@ ZEND_API int zend_get_constant_ex(char *name, uint name_len, zval *result, zend_
                efree(class_name);
 
                if (retval) {
-                       zval_update_constant(ret_constant, (void*)1 TSRMLS_CC);
+                       zval_update_constant_ex(ret_constant, (void*)1, *ce TSRMLS_CC);
                        *result = **ret_constant;
                        zval_copy_ctor(result);
                }