iliaa Wed Feb 8 00:36:57 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/reflection php_reflection.c
/php-src NEWS
Log:
Fixed bug #36308 (ReflectionProperty::getDocComment() does not reflect
extended class commentary).
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.20&r2=1.164.2.21&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.20
php-src/ext/reflection/php_reflection.c:1.164.2.21
--- php-src/ext/reflection/php_reflection.c:1.164.2.20 Mon Feb 6 20:12:48 2006
+++ php-src/ext/reflection/php_reflection.c Wed Feb 8 00:36:57 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.20 2006/02/06 20:12:48 mike Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.21 2006/02/08 00:36:57 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1070,14 +1070,10 @@
if (!(prop->flags & ZEND_ACC_PRIVATE)) {
/* we have to seach the class hierarchy for this (implicit)
public or protected property */
- zend_class_entry *tmp_ce = ce->parent;
+ zend_class_entry *tmp_ce = ce;
zend_property_info *tmp_info;
- while (tmp_ce && zend_hash_find(&tmp_ce->properties_info,
prop_name, strlen(prop_name) + 1, (void **) &tmp_info) == SUCCESS) {
- if (tmp_info->flags & ZEND_ACC_PRIVATE) {
- /* private in super class => NOT the same
property */
- break;
- }
+ while (tmp_ce && zend_hash_find(&tmp_ce->properties_info,
prop_name, strlen(prop_name) + 1, (void **) &tmp_info) != SUCCESS) {
ce = tmp_ce;
prop = tmp_info;
tmp_ce = tmp_ce->parent;
@@ -4328,7 +4324,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.20 2006/02/06 20:12:48 mike Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.21 2006/02/08 00:36:57 iliaa Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.406&r2=1.2027.2.407&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.406 php-src/NEWS:1.2027.2.407
--- php-src/NEWS:1.2027.2.406 Tue Feb 7 12:49:09 2006
+++ php-src/NEWS Wed Feb 8 00:36:57 2006
@@ -20,6 +20,8 @@
- Added imap_savebody() that allows message body to be written to a file.
(Mike)
- Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE
on error. (Pierre)
+- Fixed bug #36308 (ReflectionProperty::getDocComment() does not reflect
+ extended class commentary). (Ilia)
- Fixed bug #36306 (crc32() differ on 32-bit and 64-bit platforms)
([EMAIL PROTECTED] dot com, Pierre)
- Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
