iliaa Mon Feb 20 15:27:46 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/reflection php_reflection.c
Log:
Fixed bug #36434 (Improper resolution of declaring class name of an
inherited property).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.420&r2=1.2027.2.421&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.420 php-src/NEWS:1.2027.2.421
--- php-src/NEWS:1.2027.2.420 Sun Feb 19 23:50:46 2006
+++ php-src/NEWS Mon Feb 20 15:27:45 2006
@@ -25,6 +25,8 @@
- Fixed tiger hash algorithm generating wrong results on big endian platforms.
(Mike)
- Fixed bug #36436 (DBA problem with Berkeley DB4). (Marcus)
+- Fixed bug #36434 (Improper resolution of declaring class name of an inherited
+ property). (Ilia)
- Fixed bug #36420 (segfault when access result->num_rows after calling
result->close()). (Ilia)
- Fixed bug #36403 (oci_execute() no longer supports OCI_DESCRIBE_ONLY).
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.23&r2=1.164.2.24&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.23
php-src/ext/reflection/php_reflection.c:1.164.2.24
--- php-src/ext/reflection/php_reflection.c:1.164.2.23 Sat Feb 18 18:14:45 2006
+++ php-src/ext/reflection/php_reflection.c Mon Feb 20 15:27:45 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.23 2006/02/18 18:14:45 helly Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.24 2006/02/20 15:27:45 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3789,11 +3789,19 @@
{
reflection_object *intern;
property_reference *ref;
+ zend_class_entry *tmp_ce, *ce;
+ zend_property_info *tmp_info;
METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ref);
- zend_reflection_class_factory(ref->ce, return_value TSRMLS_CC);
+ ce = tmp_ce = ref->ce;
+ while (tmp_ce && zend_hash_find(&tmp_ce->properties_info,
ref->prop->name, ref->prop->name_length + 1, (void **) &tmp_info) == SUCCESS) {
+ ce = tmp_ce;
+ tmp_ce = tmp_ce->parent;
+ }
+
+ zend_reflection_class_factory(ce, return_value TSRMLS_CC);
}
/* {{{ proto public string ReflectionProperty::getDocComment()
@@ -4321,7 +4329,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.23 2006/02/18 18:14:45 helly Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.24 2006/02/20 15:27:45 iliaa Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
