[xdebug-dev] xdebug xdebug/php_xdebug.h xdebug/xdebug.c xdebug/tests/get_declared_vars.phpt - Added the xdebug.collect_vars setting to tell Xdebug to collect

Date: Tue Sep 5 16:46:20 CEST 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Added the xdebug.collect_vars setting to tell Xdebug to collect
  information about which variables are used in a scope. Now you don't need
  to show variables with xdebug.show_local_vars anymore for
  xdebug_get_declared_vars() to work.

Modified files:
           xdebug/php_xdebug.h (version: 1.113)
           xdebug/xdebug.c (version: 1.337)
           xdebug/tests/get_declared_vars.phpt (version: 1.4)

[FILE: /xdebug/php_xdebug.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xdebug/php_xdebug.h:1.112 Mon Sep 04 19:20:18 2006 GMT
+++ xdebug/php_xdebug.h Tue Sep 05 12:46:20 2006 GMT
@@ -123,6 +123,7 @@
         zend_bool collect_includes;
         zend_bool collect_params;
         zend_bool collect_return;
+ zend_bool collect_vars;
         zend_bool extended_info;
         zend_bool show_ex_trace;
         zend_bool show_local_vars;

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- xdebug/xdebug.c:1.336 Tue Sep 05 11:05:08 2006 GMT
+++ xdebug/xdebug.c Tue Sep 05 12:46:20 2006 GMT
@@ -269,6 +269,7 @@
         STD_PHP_INI_BOOLEAN("xdebug.collect_includes","1", PHP_INI_ALL, OnUpdateBool, collect_includes, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.collect_params", "0", PHP_INI_ALL, OnUpdateBool, collect_params, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.collect_return", "0", PHP_INI_ALL, OnUpdateBool, collect_return, zend_xdebug_globals, xdebug_globals)
+ STD_PHP_INI_BOOLEAN("xdebug.collect_vars", "0", PHP_INI_ALL, OnUpdateBool, collect_vars, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.default_enable", "1", PHP_INI_ALL, OnUpdateBool, default_enable, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_BOOLEAN("xdebug.extended_info", "1", PHP_INI_SYSTEM, OnUpdateBool, extended_info, zend_xdebug_globals, xdebug_globals)
         STD_PHP_INI_ENTRY("xdebug.manual_url", "http://www.php.net", PHP_INI_ALL, OnUpdateString, manual_url, zend_xdebug_globals, xdebug_globals)
@@ -1331,7 +1332,7 @@
 
         fse->symbol_table = EG(active_symbol_table);
 
- if (XG(remote_enabled) || XG(show_local_vars)) {
+ if (XG(remote_enabled) || XG(collect_vars) || XG(show_local_vars)) {
                 /* Because include/require is treated as a stack level, we have to add used
                  * variables in include/required files to all the stack levels above, until
                  * we hit a function or the to level stack. This is so that the variables

[FILE: /xdebug/tests/get_declared_vars.phpt]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdebug/tests/get_declared_vars.phpt:1.3 Fri Jun 30 05:44:04 2006 GMT
+++ xdebug/tests/get_declared_vars.phpt Tue Sep 05 12:46:20 2006 GMT
@@ -9,7 +9,8 @@
 xdebug.auto_profile=0
 xdebug.profiler_enable=0
 xdebug.dump_globals=0
-xdebug.show_local_vars=1
+xdebug.collect_vars=1
+xdebug.show_local_vars=0
 --FILE--
 <?php
         function a($a,$b) {
Received on Tue Sep 05 2006 - 16:46:24 BST