diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 15:00:24 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 15:00:24 +0400 |
commit | 74e11fb14c983302c84ee88fee40248b6f9b0f9a (patch) | |
tree | 9e350aa56daf80bfb3f00c1db685b7c9d8af5320 /Zend | |
parent | ef8c8eaa9583130029facf2817d2c5c4b01f1c41 (diff) | |
parent | 84630a1109084507bc0c78301db831328229f1cb (diff) | |
download | php-git-74e11fb14c983302c84ee88fee40248b6f9b0f9a.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
Diffstat (limited to 'Zend')
-rw-r--r-- | Zend/tests/bug62343.phpt | 13 | ||||
-rw-r--r-- | Zend/zend_builtin_functions.c | 15 |
2 files changed, 27 insertions, 1 deletions
diff --git a/Zend/tests/bug62343.phpt b/Zend/tests/bug62343.phpt new file mode 100644 index 0000000000..b0208c4ac3 --- /dev/null +++ b/Zend/tests/bug62343.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #62343 (Show class_alias In get_declared_classes()) +--FILE-- +<?php +class a { } +class_alias("a", "b"); +$c = get_declared_classes(); +var_dump(end($c)); +var_dump(prev($c)); +?> +--EXPECT-- +string(1) "b" +string(1) "a" diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 4d950a203b..875918f1ec 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1625,6 +1625,13 @@ ZEND_FUNCTION(restore_exception_handler) } /* }}} */ +static int same_name(const char *key, const char *name, zend_uint name_len) +{ + char *lcname = zend_str_tolower_dup(name, name_len); + int ret = memcmp(lcname, key, name_len) == 0; + efree(lcname); + return ret; +} static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) { @@ -1636,7 +1643,13 @@ static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int nu if ((hash_key->nKeyLength==0 || hash_key->arKey[0]!=0) && (comply_mask == (ce->ce_flags & mask))) { - add_next_index_stringl(array, ce->name, ce->name_length, 1); + if (ce->refcount > 1 && + (ce->name_length != hash_key->nKeyLength - 1 || + !same_name(hash_key->arKey, ce->name, ce->name_length))) { + add_next_index_stringl(array, hash_key->arKey, hash_key->nKeyLength - 1, 1); + } else { + add_next_index_stringl(array, ce->name, ce->name_length, 1); + } } return ZEND_HASH_APPLY_KEEP; } |