bjori Sun Sep 10 13:25:48 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/reflection php_reflection.c
Log:
Make ReflectionFunctionAbstract abstract
- Move ReflectionFunctionAbstract::__construct to ReflectionFunction
- Move ReflectionFunctionAbstract::__toString to ReflectionFuncion
- Delcare ReflectionFunctionAbstract::__toString abstract
- fix couple of typos
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.21&r2=1.164.2.33.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.33.2.21
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.22
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.21 Thu Aug 31
16:15:24 2006
+++ php-src/ext/reflection/php_reflection.c Sun Sep 10 13:25:47 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.21 2006/08/31 16:15:24 tony2001 Exp $
*/
+/* $Id: php_reflection.c,v 1.164.2.33.2.22 2006/09/10 13:25:47 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1107,7 +1107,7 @@
zend_unmangle_property_name(prop->name, prop->name_length, &class_name,
&prop_name);
if (!(prop->flags & ZEND_ACC_PRIVATE)) {
- /* we have to seach the class hierarchy for this (implicit)
public or protected property */
+ /* we have to search the class hierarchy for this (implicit)
public or protected property */
zend_class_entry *tmp_ce = ce;
zend_property_info *tmp_info;
@@ -3741,7 +3741,7 @@
}
if (!(property_info->flags & ZEND_ACC_PRIVATE)) {
- /* we have to seach the class hierarchy for this (implicit)
public or protected property */
+ /* we have to search the class hierarchy for this (implicit)
public or protected property */
zend_class_entry *tmp_ce = ce;
zend_property_info *tmp_info;
@@ -4351,8 +4351,7 @@
static zend_function_entry reflection_function_abstract_functions[] = {
ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
- ZEND_ME(reflection_function, __construct,
arginfo_reflection_function___construct, 0)
- ZEND_ME(reflection_function, __toString, NULL, 0)
+ PHP_ABSTRACT_ME(reflection_function, __toString, NULL)
ZEND_ME(reflection_function, isInternal, NULL, 0)
ZEND_ME(reflection_function, isUserDefined, NULL, 0)
ZEND_ME(reflection_function, getName, NULL, 0)
@@ -4374,6 +4373,8 @@
};
static zend_function_entry reflection_function_functions[] = {
+ ZEND_ME(reflection_function, __construct,
arginfo_reflection_function___construct, 0)
+ ZEND_ME(reflection_function, __toString, NULL, 0)
ZEND_ME(reflection_function, export,
arginfo_reflection_function_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
ZEND_ME(reflection_function, isDisabled, NULL, 0)
ZEND_ME(reflection_function, invoke,
arginfo_reflection_function_invoke, 0)
@@ -4462,7 +4463,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0)
- ZEND_ARG_INFO(0, $filter)
+ ZEND_ARG_INFO(0, filter)
ZEND_END_ARG_INFO()
static
@@ -4798,7 +4799,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.21 2006/08/31 16:15:24 tony2001 Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.22 2006/09/10 13:25:47 bjori Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
