felipe Mon Aug 11 13:35:49 2008 UTC
Removed files:
/pecl/sdo/SCA/Bindings/atom AtomDas.php Atom1.0.xsd
ServiceRequestHandler.php
SCA_AtomServer.php RequestTester.php
.cvsignore xml.xsd
SCA_ServiceWrapperAtom.php
xhtml1-strict.xsd Proxy.php
Modified files:
/pecl/sdo/SCA/Bindings/atom binding
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests 024.phpt
Log:
- Fixed wrong check for dynamic properties
http://cvs.php.net/viewvc.cgi/pecl/sdo/SCA/Bindings/atom/binding?r1=&r2=&diff_format=u
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.312&r2=1.313&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.312
php-src/ext/reflection/php_reflection.c:1.313
--- php-src/ext/reflection/php_reflection.c:1.312 Mon Aug 11 12:45:37 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 13:35:48 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.312 2008/08/11 12:45:37 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.313 2008/08/11 13:35:48 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -509,9 +509,8 @@
ulong index;
if ((prop_type =
zend_hash_get_current_key_ex(properties, &prop_name, &prop_name_size, &index,
0, &pos)) == (UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING)) {
- if (prop_name_size &&
(UG(unicode)?prop_name.u[0]:prop_name.s[0])) {
- /* skip all private and protected
properties */
- if
(zend_u_hash_exists(&ce->properties_info, prop_type, prop_name,
prop_name_size)) {
+ if (prop_name_size &&
(UG(unicode)?prop_name.u[0]:prop_name.s[0])) { /* skip all private and
protected properties */
+ if
(!zend_u_hash_exists(&ce->properties_info, prop_type, prop_name,
prop_name_size)) {
count++;
_property_string(&dyn, NULL,
prop_name, sub_indent.string TSRMLS_CC);
}
@@ -5377,7 +5376,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.312
2008/08/11 12:45:37 felipe Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.313
2008/08/11 13:35:48 felipe Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/024.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/reflection/tests/024.phpt
diff -u php-src/ext/reflection/tests/024.phpt:1.2
php-src/ext/reflection/tests/024.phpt:1.3
--- php-src/ext/reflection/tests/024.phpt:1.2 Thu Apr 12 12:43:54 2007
+++ php-src/ext/reflection/tests/024.phpt Mon Aug 11 13:35:49 2008
@@ -9,7 +9,12 @@
protected $p2 = 2;
public $p3 = 3;
}
-$obj = new ReflectionObject(new C1());
+
+$x = new C1();
+$x->z = 4;
+$x->p3 = 5;
+
+$obj = new ReflectionObject($x);
echo $obj;
?>
--EXPECTF--
@@ -32,7 +37,7 @@
}
- Dynamic properties [1] {
- Property [ <dynamic> public $p3 ]
+ Property [ <dynamic> public $z ]
}
- Methods [0] {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
