[PHP-CVS] cvs: php-src(PHP_5_2) /ext/reflection php_reflection.c /ext/reflection/tests bug39067.phpt

[Antony Dovgal]

tony2001                Fri Oct  6 17:35:32 2006 UTC

  Added files:                 (Branch: PHP_5_2)
    /php-src/ext/reflection/tests       bug39067.phpt 

  Modified files:              
    /php-src/ext/reflection     php_reflection.c 
  Log:
  MFH: fix #39067 (getDeclaringClass() and private properties)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.27&r2=1.164.2.33.2.28&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.27 
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.28
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.27     Tue Oct  3 
09:59:07 2006
+++ php-src/ext/reflection/php_reflection.c     Fri Oct  6 17:35:32 2006
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_reflection.c,v 1.164.2.33.2.27 2006/10/03 09:59:07 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.28 2006/10/06 17:35:32 tony2001 Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -4029,6 +4029,10 @@
        while (tmp_ce && zend_hash_find(&tmp_ce->properties_info, prop_name, 
prop_name_len + 1, (void **) &tmp_info) == SUCCESS) {
                ce = tmp_ce;
                tmp_ce = tmp_ce->parent;
+               if (tmp_info->flags & ZEND_ACC_PRIVATE) {
+                       /* it's a private property, so it can't be inherited */
+                       break;
+               }
        }
 
        zend_reflection_class_factory(ce, return_value TSRMLS_CC);
@@ -4840,7 +4844,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.27 2006/10/03 09:59:07 dmitry Exp $");
+       php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 
1.164.2.33.2.28 2006/10/06 17:35:32 tony2001 Exp $");
 
        php_info_print_table_end();
 } /* }}} */

http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39067.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug39067.phpt
+++ php-src/ext/reflection/tests/bug39067.phpt
--TEST--
Bug #39067 (getDeclaringClass() and private properties)
--FILE--
<?php

class A {
        private $x;
}

class B extends A {
        private $x;
}

class C extends B {
        private $x;
}

$rc = new ReflectionClass('C');
var_dump($rc->getProperty('x')->getDeclaringClass()->getName());

$rc = new ReflectionClass('B');
var_dump($rc->getProperty('x')->getDeclaringClass()->getName());

$rc = new ReflectionClass('A');
var_dump($rc->getProperty('x')->getDeclaringClass()->getName());

echo "Done\n";
?>
--EXPECTF--     
string(1) "C"
string(1) "B"
string(1) "A"
Done
--UEXPECTF--
unicode(1) "C"
unicode(1) "B"
unicode(1) "A"
Done

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