felipe Mon Apr 27 19:54:35 2009 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 FlexLexer.h flex.skl /php-src/ext/pdo_sqlite/sqlite/src keywordhash.h /php-src/ext/reflection php_reflection.c /php-src/ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMethods_001.phpt ReflectionClass_getProperties_001.phpt ReflectionClass_getProperty_001.phpt ReflectionClass_getProperty_003.phpt ReflectionClass_getProperty_004.phpt ReflectionMethod_getModifiers_basic.phpt Log: - MFH: Fixed bug #47254 (Wrong Reflection for extends class)
http://cvs.php.net/viewvc.cgi/ZendEngine2/FlexLexer.h?r1=1.4&r2=1.4.18.1&diff_format=u Index: ZendEngine2/FlexLexer.h diff -u ZendEngine2/FlexLexer.h:1.4 ZendEngine2/FlexLexer.h:1.4.18.1 --- ZendEngine2/FlexLexer.h:1.4 Mon Jul 3 00:55:36 2000 +++ ZendEngine2/FlexLexer.h Mon Apr 27 19:54:34 2009 @@ -1,4 +1,4 @@ -// $Header: /repository/ZendEngine2/Attic/FlexLexer.h,v 1.4 2000/07/03 00:55:36 sascha Exp $ +// $Header: /repository/ZendEngine2/Attic/FlexLexer.h,v 1.4.18.1 2009/04/27 19:54:34 felipe Exp $ // FlexLexer.h -- define interfaces for lexical analyzer classes generated // by flex http://cvs.php.net/viewvc.cgi/ZendEngine2/flex.skl?r1=1.31&r2=1.31.6.1&diff_format=u Index: ZendEngine2/flex.skl diff -u ZendEngine2/flex.skl:1.31 ZendEngine2/flex.skl:1.31.6.1 --- ZendEngine2/flex.skl:1.31 Mon Aug 11 05:24:41 2003 +++ ZendEngine2/flex.skl Mon Apr 27 19:54:34 2009 @@ -1,7 +1,7 @@ /* A Lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /repository/ZendEngine2/Attic/flex.skl,v 1.31 2003/08/11 05:24:41 fujimoto Exp $ + * $Header: /repository/ZendEngine2/Attic/flex.skl,v 1.31.6.1 2009/04/27 19:54:34 felipe Exp $ * vim:ft=lex: */ http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h?r1=1.2.2.1.2.4&r2=1.2.2.1.2.5&diff_format=u Index: php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h diff -u php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.4 php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.5 --- php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.4 Wed May 16 21:04:46 2007 +++ php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h Mon Apr 27 19:54:34 2009 @@ -2,7 +2,7 @@ ** ** The code in this file has been automatically generated by ** -** $Header: /repository/php-src/ext/pdo_sqlite/sqlite/src/Attic/keywordhash.h,v 1.2.2.1.2.4 2007/05/16 21:04:46 iliaa Exp $ +** $Header: /repository/php-src/ext/pdo_sqlite/sqlite/src/Attic/keywordhash.h,v 1.2.2.1.2.5 2009/04/27 19:54:34 felipe Exp $ ** ** The code in this file implements a function that determines whether ** or not a given identifier is really an SQL keyword. The same thing http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.55&r2=1.164.2.33.2.56&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.55 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.56 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.55 Wed Dec 31 11:17:42 2008 +++ php-src/ext/reflection/php_reflection.c Mon Apr 27 19:54:34 2009 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.55 2008/12/31 11:17:42 sebastian Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.56 2009/04/27 19:54:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1122,7 +1122,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); ZVAL_STRING(name, method->common.function_name, 1); - ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); + ZVAL_STRINGL(classname, method->common.scope->name, method->common.scope->name_length, 1); reflection_instantiate(reflection_method_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); intern->ptr = method; @@ -1164,7 +1164,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); ZVAL_STRING(name, prop_name, 1); - ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); + ZVAL_STRINGL(classname, prop->ce->name, prop->ce->name_length, 1); reflection_instantiate(reflection_property_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); @@ -2249,11 +2249,6 @@ zval_dtor(&ztmp); } - MAKE_STD_ZVAL(classname); - ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); - - zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); - lcname = zend_str_tolower_dup(name_str, name_len); if (zend_hash_find(&ce->function_table, lcname, name_len + 1, (void **) &mptr) == FAILURE) { @@ -2264,6 +2259,11 @@ } efree(lcname); + MAKE_STD_ZVAL(classname); + ZVAL_STRINGL(classname, mptr->common.scope->name, mptr->common.scope->name_length, 1); + + zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); + MAKE_STD_ZVAL(name); ZVAL_STRING(name, mptr->common.function_name, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL); @@ -3866,17 +3866,18 @@ } } - MAKE_STD_ZVAL(classname); - ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); - zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); - + MAKE_STD_ZVAL(classname); MAKE_STD_ZVAL(propname); + if (dynam_prop == 0) { zend_unmangle_property_name(property_info->name, property_info->name_length, &class_name, &prop_name); + ZVAL_STRINGL(classname, property_info->ce->name, property_info->ce->name_length, 1); ZVAL_STRING(propname, prop_name, 1); } else { + ZVAL_STRINGL(classname, ce->name, ce->name_length, 1); ZVAL_STRINGL(propname, name_str, name_len, 1); } + zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL); reference = (property_reference*) emalloc(sizeof(property_reference)); @@ -4947,7 +4948,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.55 2008/12/31 11:17:42 sebastian Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.56 2009/04/27 19:54:34 felipe Exp $"); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/002.phpt?r1=1.1.4.1.2.1&r2=1.1.4.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/002.phpt diff -u php-src/ext/reflection/tests/002.phpt:1.1.4.1.2.1 php-src/ext/reflection/tests/002.phpt:1.1.4.1.2.2 --- php-src/ext/reflection/tests/002.phpt:1.1.4.1.2.1 Sun May 11 04:53:25 2008 +++ php-src/ext/reflection/tests/002.phpt Mon Apr 27 19:54:34 2009 @@ -52,14 +52,14 @@ ===DONE=== --EXPECTF-- ReflectionMethodEx::__construct -string(18) "ReflectionMethodEx" -string(7) "getName" -string(3) "xyz" +%unicode|string%(26) "ReflectionFunctionAbstract" +%unicode|string%(7) "getName" +%unicode|string%(3) "xyz" NULL Cannot set read-only property ReflectionMethodEx::$class Cannot set read-only property ReflectionMethodEx::$name -string(18) "ReflectionMethodEx" -string(7) "getName" -string(3) "bar" -string(3) "baz" +%unicode|string%(26) "ReflectionFunctionAbstract" +%unicode|string%(7) "getName" +%unicode|string%(3) "bar" +%unicode|string%(3) "baz" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt:1.1.2.1 Tue Nov 18 15:35:49 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getMethod_001.phpt Mon Apr 27 19:54:34 2009 @@ -48,121 +48,121 @@ --EXPECTF-- Reflecting on class pubf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(4) "pubf" -} - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(4) "pubf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for doesntExist(): Method doesntExist does not exist Reflecting on class subpubf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(7) "subpubf" -} - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(7) "subpubf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for doesntExist(): Method doesntExist does not exist Reflecting on class protf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "protf" -} - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "protf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for doesntExist(): Method doesntExist does not exist Reflecting on class subprotf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprotf" -} - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprotf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for doesntExist(): Method doesntExist does not exist Reflecting on class privf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "privf" -} - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "privf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } --> Check for doesntExist(): Method doesntExist does not exist Reflecting on class subprivf: --> Check for f(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprivf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" +} + --> Check for s(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" +} + --> Check for F(): object(ReflectionMethod)#%d (2) { + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } - --> Check for s(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprivf" -} - --> Check for F(): object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprivf" -} - --> Check for doesntExist(): Method doesntExist does not exist \ No newline at end of file + --> Check for doesntExist(): Method doesntExist does not exist http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt:1.1.2.1 Tue Nov 18 15:35:48 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getMethods_001.phpt Mon Apr 27 19:54:35 2009 @@ -40,101 +40,101 @@ array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } } Reflecting on class subpubf: array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } } Reflecting on class protf: array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } } Reflecting on class subprotf: array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } } Reflecting on class privf: array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } } Reflecting on class subprivf: array(2) { [0]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "f" - ["class"]=> - string(8) "subprivf" + [%u|b%"name"]=> + %unicode|string%(1) "f" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } [1]=> &object(ReflectionMethod)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprivf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt:1.1.2.1 Tue Nov 18 15:35:48 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getProperties_001.phpt Mon Apr 27 19:54:35 2009 @@ -40,87 +40,87 @@ array(2) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } [1]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } } Reflecting on class subpubf: array(2) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } [1]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } } Reflecting on class protf: array(2) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } [1]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } } Reflecting on class subprotf: array(2) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } [1]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } } Reflecting on class privf: array(2) { [0]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } [1]=> &object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } } Reflecting on class subprivf: array(0) { -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt:1.1.2.1 Tue Nov 18 15:35:49 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getProperty_001.phpt Mon Apr 27 19:54:35 2009 @@ -61,86 +61,86 @@ --EXPECTF-- Reflecting on class pubf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for a: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(4) "pubf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for A: Property A does not exist --> Check for doesntExist: Property doesntExist does not exist Reflecting on class subpubf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for a: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(7) "subpubf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(4) "pubf" } --> Check for A: Property A does not exist --> Check for doesntExist: Property doesntExist does not exist Reflecting on class protf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for a: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(5) "protf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for A: Property A does not exist --> Check for doesntExist: Property doesntExist does not exist Reflecting on class subprotf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for a: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(8) "subprotf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "protf" } --> Check for A: Property A does not exist --> Check for doesntExist: Property doesntExist does not exist Reflecting on class privf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } --> Check for a: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "a" - ["class"]=> - string(5) "privf" + [%u|b%"name"]=> + %unicode|string%(1) "a" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } --> Check for A: Property A does not exist --> Check for doesntExist: Property doesntExist does not exist Reflecting on class subprivf: --> Check for s: object(ReflectionProperty)#%d (2) { - ["name"]=> - string(1) "s" - ["class"]=> - string(8) "subprivf" + [%u|b%"name"]=> + %unicode|string%(1) "s" + [%u|b%"class"]=> + %unicode|string%(5) "privf" } --> Check for a: Property a does not exist --> Check for A: Property A does not exist - --> Check for doesntExist: Property doesntExist does not exist \ No newline at end of file + --> Check for doesntExist: Property doesntExist does not exist http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt:1.1.2.1 Tue Nov 18 15:35:48 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getProperty_003.phpt Mon Apr 27 19:54:35 2009 @@ -97,146 +97,146 @@ --EXPECTF-- --- (Reflecting on pubA) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubA" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubA" + [%u|b%"class"]=> + %unicode|string%(1) "A" } -string(9) "pubA in A" +%unicode|string%(9) "pubA in A" --- (Reflecting on protA) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protA" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protA" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member C::protA --- (Reflecting on privA) --- Property privA does not exist --- (Reflecting on pubB) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubB" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubB" + [%u|b%"class"]=> + %unicode|string%(1) "B" } -string(9) "pubB in B" +%unicode|string%(9) "pubB in B" --- (Reflecting on protB) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protB" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protB" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member C::protB --- (Reflecting on privB) --- Property privB does not exist --- (Reflecting on pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::protC --- (Reflecting on privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::privC --- (Reflecting on doesntExist) --- Property doesntExist does not exist --- (Reflecting on A::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } -string(9) "pubC in A" +%unicode|string%(9) "pubC in A" --- (Reflecting on A::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member A::protC --- (Reflecting on A::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member A::privC --- (Reflecting on B::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } -string(9) "pubC in B" +%unicode|string%(9) "pubC in B" --- (Reflecting on B::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member B::protC --- (Reflecting on B::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member B::privC --- (Reflecting on c::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on c::PUBC) --- Property PUBC does not exist --- (Reflecting on C::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on C::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::protC --- (Reflecting on C::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::privC --- (Reflecting on X::pubC) --- @@ -248,4 +248,4 @@ --- (Reflecting on X::doesntExist) --- Fully qualified property name X::doesntExist does not specify a base class of C --- (Reflecting on doesntexist::doesntExist) --- -Class doesntexist does not exist \ No newline at end of file +Class doesntexist does not exist http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt diff -u php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt:1.1.2.1 Tue Nov 18 15:35:49 2008 +++ php-src/ext/reflection/tests/ReflectionClass_getProperty_004.phpt Mon Apr 27 19:54:35 2009 @@ -97,146 +97,146 @@ --EXPECTF-- --- (Reflecting on pubA) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubA" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubA" + [%u|b%"class"]=> + %unicode|string%(1) "A" } -string(9) "pubA in A" +%unicode|string%(9) "pubA in A" --- (Reflecting on protA) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protA" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protA" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member C::protA --- (Reflecting on privA) --- Property privA does not exist --- (Reflecting on pubB) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubB" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubB" + [%u|b%"class"]=> + %unicode|string%(1) "B" } -string(9) "pubB in B" +%unicode|string%(9) "pubB in B" --- (Reflecting on protB) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protB" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protB" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member C::protB --- (Reflecting on privB) --- Property privB does not exist --- (Reflecting on pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::protC --- (Reflecting on privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::privC --- (Reflecting on doesntExist) --- Property doesntExist does not exist --- (Reflecting on A::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on A::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member A::protC --- (Reflecting on A::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "A" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "A" } Cannot access non-public member A::privC --- (Reflecting on B::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on B::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member B::protC --- (Reflecting on B::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "B" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "B" } Cannot access non-public member B::privC --- (Reflecting on c::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on c::PUBC) --- Property PUBC does not exist --- (Reflecting on C::pubC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(4) "pubC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(4) "pubC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } -string(9) "pubC in C" +%unicode|string%(9) "pubC in C" --- (Reflecting on C::protC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "protC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "protC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::protC --- (Reflecting on C::privC) --- object(ReflectionProperty)#%d (2) { - ["name"]=> - string(5) "privC" - ["class"]=> - string(1) "C" + [%u|b%"name"]=> + %unicode|string%(5) "privC" + [%u|b%"class"]=> + %unicode|string%(1) "C" } Cannot access non-public member C::privC --- (Reflecting on X::pubC) --- @@ -248,4 +248,4 @@ --- (Reflecting on X::doesntExist) --- Fully qualified property name X::doesntExist does not specify a base class of C --- (Reflecting on doesntexist::doesntExist) --- -Class doesntexist does not exist \ No newline at end of file +Class doesntexist does not exist http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt diff -u php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.1.2.1 php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.1.2.2 --- php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt:1.1.2.1 Thu Jan 3 09:06:07 2008 +++ php-src/ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt Mon Apr 27 19:54:35 2009 @@ -156,71 +156,71 @@ int(65792) -Modifiers for method DerivedClass::foo(): +Modifiers for method TestClass::foo(): int(65792) -Modifiers for method DerivedClass::stat(): +Modifiers for method TestClass::stat(): int(257) -Modifiers for method DerivedClass::priv(): +Modifiers for method TestClass::priv(): int(66560) -Modifiers for method DerivedClass::prot(): +Modifiers for method TestClass::prot(): int(66048) -Modifiers for method DerivedClass::fin(): +Modifiers for method TestClass::fin(): int(65796) -Modifiers for method DerivedClass::__destruct(): +Modifiers for method TestClass::__destruct(): int(16640) -Modifiers for method DerivedClass::__call(): +Modifiers for method TestClass::__call(): int(256) -Modifiers for method DerivedClass::__clone(): +Modifiers for method TestClass::__clone(): int(33024) -Modifiers for method DerivedClass::__get(): +Modifiers for method TestClass::__get(): int(256) -Modifiers for method DerivedClass::__set(): +Modifiers for method TestClass::__set(): int(256) -Modifiers for method DerivedClass::__unset(): +Modifiers for method TestClass::__unset(): int(256) -Modifiers for method DerivedClass::__isset(): +Modifiers for method TestClass::__isset(): int(256) -Modifiers for method DerivedClass::__tostring(): +Modifiers for method TestClass::__tostring(): int(256) -Modifiers for method DerivedClass::__sleep(): +Modifiers for method TestClass::__sleep(): int(65792) -Modifiers for method DerivedClass::__wakeup(): +Modifiers for method TestClass::__wakeup(): int(65792) -Modifiers for method DerivedClass::__set_state(): +Modifiers for method TestClass::__set_state(): int(65792) -Modifiers for method DerivedClass::__autoload(): +Modifiers for method TestClass::__autoload(): int(65792)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php