andrey          Thu May 20 13:46:20 2004 EDT

  Modified files:              
    /php-src/ext/standard       var.c 
  Log:
  var_dump() now shows private and protected member variables.
  Not BC is that since now the public variables are explicitly shown as public
  Example :
  
  class a{ protected $a=1; private $b=2;var $c=3;} $a=new a(); var_dump($a);
  
  object(a)#1 (3) {
    ["a:protected"]=>
    int(1)
    ["b:private"]=>
    int(2)
    ["c:public"]=>
    int(3)
  }
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.187&r2=1.188&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.187 php-src/ext/standard/var.c:1.188
--- php-src/ext/standard/var.c:1.187    Thu Mar 18 11:54:36 2004
+++ php-src/ext/standard/var.c  Thu May 20 13:46:20 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.187 2004/03/18 16:54:36 dmitry Exp $ */
+/* $Id: var.c,v 1.188 2004/05/20 17:46:20 andrey Exp $ */
 
 
 /* {{{ includes 
@@ -64,11 +64,42 @@
        return 0;
 }
 
+static int php_object_property_dump(zval **zv, int num_args, va_list args, 
zend_hash_key *hash_key)
+{
+       int level;
+       char *prop_name, *class_name;
+       TSRMLS_FETCH();
+
+       level = va_arg(args, int);
+
+       if (hash_key->nKeyLength ==0 ) { /* numeric key */
+               php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
+       } else { /* string key */
+               zend_unmangle_property_name(hash_key->arKey, &class_name, &prop_name);
+               if (class_name) {
+                       php_printf("%*c[\"%s", level + 1, ' ', prop_name);
+                       if (class_name[0]=='*') {
+                               ZEND_PUTS(":protected");
+                       } else {
+                               ZEND_PUTS(":private");
+                       }
+               } else {
+                       php_printf("%*c[\"%s", level + 1, ' ', hash_key->arKey);
+                       ZEND_PUTS(":public");
+               }
+               ZEND_PUTS("\"]=>\n");
+       }
+       php_var_dump(zv, level + 2 TSRMLS_CC);
+       return 0;
+}
+
+
 PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC)
 {
        HashTable *myht = NULL;
        char *class_name;
        zend_uint class_name_len;
+       int (*php_element_dump_func)(zval**, int, va_list, zend_hash_key*);
 
        if (level > 1) {
                php_printf("%*c", level - 1, ' ');
@@ -99,6 +130,7 @@
                        return;
                }
                php_printf("%sarray(%d) {\n", COMMON, zend_hash_num_elements(myht));
+               php_element_dump_func = php_array_element_dump;
                goto head_done;
        case IS_OBJECT:
                myht = Z_OBJPROP_PP(struc);
@@ -110,9 +142,10 @@
                Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, 
&class_name_len, 0 TSRMLS_CC);
                php_printf("%sobject(%s)#%d (%d) {\n", COMMON, class_name, 
Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0);
                efree(class_name);
+               php_element_dump_func = php_object_property_dump;
 head_done:
                if (myht) {
-                       zend_hash_apply_with_arguments(myht, (apply_func_args_t) 
php_array_element_dump, 1, level, (Z_TYPE_PP(struc) == IS_ARRAY ? 0 : 1));
+                       zend_hash_apply_with_arguments(myht, (apply_func_args_t) 
php_element_dump_func, 1, level, (Z_TYPE_PP(struc) == IS_ARRAY ? 0 : 1));
                }
                if (level > 1) {
                        php_printf("%*c", level-1, ' ');

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to