iliaa Wed Feb 8 00:37:31 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
MFB51: 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.202&r2=1.203&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.202
php-src/ext/reflection/php_reflection.c:1.203
--- php-src/ext/reflection/php_reflection.c:1.202 Mon Feb 6 20:11:56 2006
+++ php-src/ext/reflection/php_reflection.c Wed Feb 8 00:37:31 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.202 2006/02/06 20:11:56 mike Exp $ */
+/* $Id: php_reflection.c,v 1.203 2006/02/08 00:37:31 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1076,14 +1076,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;
@@ -4346,7 +4342,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.202
2006/02/06 20:11:56 mike Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.203
2006/02/08 00:37:31 iliaa Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
