bjori Fri Nov 14 19:22:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c
Log:
MFH: Interfaces extend other interfaces, not implement
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.39&r2=1.164.2.33.2.45.2.40&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.39
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.40
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.39 Tue Nov
4 15:58:55 2008
+++ php-src/ext/reflection/php_reflection.c Fri Nov 14 19:22:43 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.39 2008/11/04 15:58:55 helly Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.40 2008/11/14 19:22:43 bjori Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -371,7 +371,11 @@
if (ce->num_interfaces) {
zend_uint i;
- string_printf(str, " implements %s", ce->interfaces[0]->name);
+ if (ce->ce_flags & ZEND_ACC_INTERFACE) {
+ string_printf(str, " extends %s",
ce->interfaces[0]->name);
+ } else {
+ string_printf(str, " implements %s",
ce->interfaces[0]->name);
+ }
for (i = 1; i < ce->num_interfaces; ++i) {
string_printf(str, ", %s", ce->interfaces[i]->name);
}
@@ -5293,7 +5297,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.39 2008/11/04 15:58:55 helly Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.40 2008/11/14 19:22:43 bjori Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
