iliaa           Mon Feb 13 14:49:27 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/reflection     php_reflection.c 
    /php-src    NEWS 
  Log:
  Fixed bug #36337 (ReflectionProperty fails to return correct visibility).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.21&r2=1.164.2.22&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.21 
php-src/ext/reflection/php_reflection.c:1.164.2.22
--- php-src/ext/reflection/php_reflection.c:1.164.2.21  Wed Feb  8 00:36:57 2006
+++ php-src/ext/reflection/php_reflection.c     Mon Feb 13 14:49:26 2006
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.21 2006/02/08 00:36:57 iliaa Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.22 2006/02/13 14:49:26 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3560,14 +3560,10 @@
        
        if (!(property_info->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, 
name_str, name_len + 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, 
name_str, name_len + 1, (void **) &tmp_info) != SUCCESS) {
                        ce = tmp_ce;
                        property_info = tmp_info;
                        tmp_ce = tmp_ce->parent;
@@ -4324,7 +4320,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.21 2006/02/08 00:36:57 iliaa Exp $");
+       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.22 2006/02/13 14:49:26 iliaa Exp $");
 
        php_info_print_table_end();
 } /* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.412&r2=1.2027.2.413&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.412 php-src/NEWS:1.2027.2.413
--- php-src/NEWS:1.2027.2.412   Mon Feb 13 12:18:16 2006
+++ php-src/NEWS        Mon Feb 13 14:49:26 2006
@@ -24,6 +24,8 @@
 - Fixed bug #36359 (splFileObject::fwrite() doesn't write when no data length 
   specified). (Tony)
 - Fixed bug #36351 (parse_url() does not parse numeric paths properly). (Ilia)
+- Fixed bug #36337 (ReflectionProperty fails to return correct visibility). 
+  (Ilia)
 - Fixed bug #36334 (Added missing documentation about realpath cache INI 
   settings). (Ilia)
 - Fixed bug #36308 (ReflectionProperty::getDocComment() does not reflect 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to