helly Sat Jan 3 21:06:39 2009 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- MFB Missing namespace changes
# Now all tests PASS again
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.337&r2=1.338&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.337
php-src/ext/reflection/php_reflection.c:1.338
--- php-src/ext/reflection/php_reflection.c:1.337 Sat Jan 3 20:40:22 2009
+++ php-src/ext/reflection/php_reflection.c Sat Jan 3 21:06:38 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.337 2009/01/03 20:40:22 helly Exp $ */
+/* $Id: php_reflection.c,v 1.338 2009/01/03 21:06:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2899,13 +2899,13 @@
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (colon.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && colon.s > Z_STRVAL_PP(name))
{
RETURN_TRUE;
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (colon.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && colon.u > Z_USTRVAL_PP(name))
{
RETURN_TRUE;
}
@@ -2913,53 +2913,53 @@
}
/* }}} */
-/* {{{ proto public string ReflectionFunction::getNamespaceName()
+/* {{{ proto public string ReflectionFunction::getNamespaceName() U
Returns the name of namespace where this function is defined */
ZEND_METHOD(reflection_function, getNamespaceName)
{
zval **name;
- zstr colon;
+ zstr backslash;
METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"),
(void **) &name) == FAILURE) {
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (backslash.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && backslash.s > Z_STRVAL_PP(name))
{
- RETURN_STRINGL(Z_STRVAL_PP(name), colon.s - Z_STRVAL_PP(name) -
1, 1);
+ RETURN_STRINGL(Z_STRVAL_PP(name), backslash.s -
Z_STRVAL_PP(name), 1);
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (backslash.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && backslash.u > Z_USTRVAL_PP(name))
{
- RETURN_UNICODEL(Z_USTRVAL_PP(name), colon.u -
Z_USTRVAL_PP(name) - 1, 1);
+ RETURN_UNICODEL(Z_USTRVAL_PP(name), backslash.u -
Z_USTRVAL_PP(name), 1);
}
RETURN_EMPTY_TEXT();
}
/* }}} */
-/* {{{ proto public string ReflectionFunction::getShortName()
+/* {{{ proto public string ReflectionFunction::getShortName() U
Returns the short name of the function (without namespace part) */
ZEND_METHOD(reflection_function, getShortName)
{
zval **name;
- zstr colon;
+ zstr backslash;
METHOD_NOTSTATIC_NUMPARAMS(reflection_function_abstract_ptr, 0);
if (zend_hash_find(Z_OBJPROP_P(getThis()), "name", sizeof("name"),
(void **) &name) == FAILURE) {
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (backslash.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && backslash.s > Z_STRVAL_PP(name))
{
- RETURN_STRINGL(colon.s + 1, Z_STRLEN_PP(name) - (colon.s -
Z_STRVAL_PP(name) + 1), 1);
+ RETURN_STRINGL(backslash.s + 1, Z_STRLEN_PP(name) -
(backslash.s - Z_STRVAL_PP(name) + 1), 1);
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (backslash.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && backslash.u > Z_USTRVAL_PP(name))
{
- RETURN_UNICODEL(colon.u + 1, Z_USTRLEN_PP(name) - (colon.u -
Z_USTRVAL_PP(name) + 1), 1);
+ RETURN_UNICODEL(backslash.u + 1, Z_USTRLEN_PP(name) -
(backslash.u - Z_USTRVAL_PP(name) + 1), 1);
}
RETURN_ZVAL(*name, 1, 0);
}
@@ -4275,13 +4275,13 @@
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (colon.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && colon.s > Z_STRVAL_PP(name))
{
RETURN_TRUE;
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (colon.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && colon.u > Z_USTRVAL_PP(name))
{
RETURN_TRUE;
}
@@ -4301,15 +4301,15 @@
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (colon.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && colon.s > Z_STRVAL_PP(name))
{
RETURN_STRINGL(Z_STRVAL_PP(name), colon.s - Z_STRVAL_PP(name) -
1, 1);
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (colon.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && colon.u > Z_USTRVAL_PP(name))
{
- RETURN_UNICODEL(Z_USTRVAL_PP(name), colon.u -
Z_USTRVAL_PP(name) - 1, 1);
+ RETURN_UNICODEL(Z_USTRVAL_PP(name), colon.u -
Z_USTRVAL_PP(name), 1);
}
RETURN_EMPTY_TEXT();
}
@@ -4327,13 +4327,13 @@
RETURN_FALSE;
}
if (Z_TYPE_PP(name) == IS_STRING
- && (colon.s = zend_memrchr(Z_STRVAL_PP(name), ':',
Z_STRLEN_PP(name)))
- && colon.s > Z_STRVAL_PP(name) && *(colon.s-1) == ':')
+ && (colon.s = zend_memrchr(Z_STRVAL_PP(name), '\\',
Z_STRLEN_PP(name)))
+ && colon.s > Z_STRVAL_PP(name))
{
RETURN_STRINGL(colon.s + 1, Z_STRLEN_PP(name) - (colon.s -
Z_STRVAL_PP(name) + 1), 1);
} else if (Z_TYPE_PP(name) == IS_UNICODE
- && (colon.u = u_memrchr(Z_USTRVAL_PP(name), ':',
Z_USTRLEN_PP(name)))
- && colon.u > Z_USTRVAL_PP(name) && *(colon.u-1) == ':')
+ && (colon.u = u_memrchr(Z_USTRVAL_PP(name), '\\',
Z_USTRLEN_PP(name)))
+ && colon.u > Z_USTRVAL_PP(name))
{
RETURN_UNICODEL(colon.u + 1, Z_USTRLEN_PP(name) - (colon.u -
Z_USTRVAL_PP(name) + 1), 1);
}
@@ -5560,7 +5560,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Revision: 1.337 $");
+ php_info_print_table_row(2, "Version", "$Revision: 1.338 $");
php_info_print_table_end();
} /* }}} */
@@ -5574,7 +5574,7 @@
NULL,
NULL,
PHP_MINFO(reflection),
- "$Revision: 1.337 $",
+ "$Revision: 1.338 $",
STANDARD_MODULE_PROPERTIES
}; /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
