Permalink
Browse files

MFH

  • Loading branch information...
1 parent 0261432 commit d3ac98438591d27ad83828b73fa7cd295660a7b7 @tony2001 tony2001 committed Jul 11, 2007
Showing with 62 additions and 26 deletions.
  1. +5 −2 NEWS
  2. +32 −24 ext/reflection/php_reflection.c
  3. +25 −0 ext/reflection/tests/bug41884.phpt
View
@@ -6,7 +6,7 @@ PHP NEWS
- Upgraded PCRE to version 7.2 (Nuno)
- Updated timezone database to version 2007.6. (Derick)
-- Improced openssl_x509_parse() to return extensions in readable form. (Dmitry)
+- Improved openssl_x509_parse() to return extensions in readable form. (Dmitry)
- Improved fix for MOPB-03-2007. (Ilia)
- Corrected fix for CVE-2007-2872. (Ilia)
- Enabled statement cache for non-persistent OCI8 connections.
@@ -32,7 +32,10 @@ PHP NEWS
- Added CURLOPT_PRIVATE & CURLINFO_PRIVATE constants.
(Andrey A. Belashkov, Tony)
-- Fixed crash in OpenSSL extension because of non-strin passphrase. (Dmitry)
+- Implemented FR #41884 (ReflectionClass::getDefaultProperties() does not handle
+ static attributes). (Tony)
+
+- Fixed crash in OpenSSL extension because of non-string passphrase. (Dmitry)
- Fixed var_export() to use the new H modifier so that it can generate
parseable PHP code for floats, independent of the locale. (Derick)
- Fixed regression introduced by the fix for the libgd bug #74. (Pierre)
@@ -2804,41 +2804,49 @@ ZEND_METHOD(reflection_class, getDefaultProperties)
{
reflection_object *intern;
zend_class_entry *ce;
- int count;
+ int count, i;
+ HashTable *ht_list[3];
METHOD_NOTSTATIC_NUMPARAMS(reflection_class_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ce);
array_init(return_value);
zend_update_class_constants(ce TSRMLS_CC);
- count = zend_hash_num_elements(&ce->default_properties);
- if (count > 0) {
- HashPosition pos;
- zval **prop;
+ ht_list[0] = CE_STATIC_MEMBERS(ce);
+ ht_list[1] = &ce->default_properties;
+ ht_list[2] = NULL;
- zend_hash_internal_pointer_reset_ex(&ce->default_properties, &pos);
- while (zend_hash_get_current_data_ex(&ce->default_properties, (void **) &prop, &pos) == SUCCESS) {
- char *key, *class_name, *prop_name;
- uint key_len;
- ulong num_index;
- zval *prop_copy;
+ for (i = 0; ht_list[i] != NULL; i++) {
- zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &num_index, 0, &pos);
- zend_hash_move_forward_ex(&ce->default_properties, &pos);
- zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
- if (class_name && class_name[0] != '*' && strcmp(class_name, ce->name)) {
- /* filter privates from base classes */
- continue;
- }
+ count = zend_hash_num_elements(ht_list[i]);
+ if (count > 0) {
+ HashPosition pos;
+ zval **prop;
+
+ zend_hash_internal_pointer_reset_ex(ht_list[i], &pos);
+ while (zend_hash_get_current_data_ex(ht_list[i], (void **) &prop, &pos) == SUCCESS) {
+ char *key, *class_name, *prop_name;
+ uint key_len;
+ ulong num_index;
+ zval *prop_copy;
+
+ zend_hash_get_current_key_ex(ht_list[i], &key, &key_len, &num_index, 0, &pos);
+ zend_hash_move_forward_ex(ht_list[i], &pos);
+ zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
+ if (class_name && class_name[0] != '*' && strcmp(class_name, ce->name)) {
+ /* filter privates from base classes */
+ continue;
+ }
- /* copy: enforce read only access */
- ALLOC_ZVAL(prop_copy);
- *prop_copy = **prop;
- zval_copy_ctor(prop_copy);
- INIT_PZVAL(prop_copy);
+ /* copy: enforce read only access */
+ ALLOC_ZVAL(prop_copy);
+ *prop_copy = **prop;
+ zval_copy_ctor(prop_copy);
+ INIT_PZVAL(prop_copy);
- add_assoc_zval(return_value, prop_name, prop_copy);
+ add_assoc_zval(return_value, prop_name, prop_copy);
+ }
}
}
}
@@ -0,0 +1,25 @@
+--TEST--
+Bug #41884 (ReflectionClass::getDefaultProperties() does not handle static attributes)
+--FILE--
+<?php
+
+class Foo
+{
+ protected static $fooStatic = 'foo';
+ protected $foo = 'foo';
+}
+
+$class = new ReflectionClass('Foo');
+
+var_dump($class->getDefaultProperties());
+
+echo "Done\n";
+?>
+--EXPECTF--
+array(2) {
+ ["fooStatic"]=>
+ string(3) "foo"
+ ["foo"]=>
+ string(3) "foo"
+}
+Done

0 comments on commit d3ac984

Please sign in to comment.