felipe Sun Jun 1 03:11:38 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/reflection/tests bug45139.phpt
Modified files: /php-src/ext/reflection php_reflection.c Log: - MFB: Fixed bug #45139 (ReflectionProperty returns incorrect declaring class) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.14&r2=1.164.2.33.2.45.2.15&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.14 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.15 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.14 Mon Feb 18 14:30:44 2008 +++ php-src/ext/reflection/php_reflection.c Sun Jun 1 03:11:37 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.14 2008/02/18 14:30:44 dmitry Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.15 2008/06/01 03:11:37 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -4092,7 +4092,7 @@ prop_name_len = strlen(prop_name); ce = tmp_ce = ref->ce; while (tmp_ce && zend_hash_find(&tmp_ce->properties_info, prop_name, prop_name_len + 1, (void **) &tmp_info) == SUCCESS) { - if (tmp_info->flags & ZEND_ACC_PRIVATE) { + if (tmp_info->flags & ZEND_ACC_PRIVATE || tmp_info->flags & ZEND_ACC_SHADOW) { /* it's a private property, so it can't be inherited */ break; } @@ -4944,7 +4944,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.33.2.45.2.14 2008/02/18 14:30:44 dmitry Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.15 2008/06/01 03:11:37 felipe Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug45139.phpt?view=markup&rev=1.1 Index: php-src/ext/reflection/tests/bug45139.phpt +++ php-src/ext/reflection/tests/bug45139.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php