felipe Sun Jun 1 03:08:59 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests bug45139.phpt
Modified files:
/php-src NEWS
/php-src/ext/reflection php_reflection.c
Log:
- Fixed bug #45139 (ReflectionProperty returns incorrect declaring class)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1161&r2=1.2027.2.547.2.1162&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1161 php-src/NEWS:1.2027.2.547.2.1162
--- php-src/NEWS:1.2027.2.547.2.1161 Thu May 29 11:41:50 2008
+++ php-src/NEWS Sun Jun 1 03:08:58 2008
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2008, PHP 5.2.7
+- Fixed bug #45139 (ReflectionProperty returns incorrect declaring class).
(Felipe)
- When dumping entire document to file via asXml() don't lose the encoding.
(Ilia)
- Fixed a crash inside PDO when trying instantiate PDORow manually (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.50&r2=1.164.2.33.2.51&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.50
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.51
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.50 Thu Mar 13
15:56:21 2008
+++ php-src/ext/reflection/php_reflection.c Sun Jun 1 03:08:59 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.50 2008/03/13 15:56:21 iliaa Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.51 2008/06/01 03:08:59 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4081,7 +4081,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;
}
@@ -4908,7 +4908,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.50 2008/03/13 15:56:21 iliaa Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.51 2008/06/01 03:08:59 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
