[xdebug-dev] svn: /xdebug/trunk/ tests/bug00089.phpt tests/bug00280.phpt tests/xdebug_var_dump.phpt xdebug_var.c

derick Fri, 07 Jan 2011 23:52:11 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3384&root=xdebug

Log:
- Fixed latest feature, and update tests for it too.

Changed paths:
    U xdebug/trunk/tests/bug00089.phpt
    U xdebug/trunk/tests/bug00280.phpt
    U xdebug/trunk/tests/xdebug_var_dump.phpt
    U xdebug/trunk/xdebug_var.c

Modified: xdebug/trunk/tests/bug00089.phpt
===================================================================
--- xdebug/trunk/tests/bug00089.phpt 2011-01-07 15:35:18 UTC (rev 3383)
+++ xdebug/trunk/tests/bug00089.phpt 2011-01-07 23:52:11 UTC (rev 3384)
@@ -17,10 +17,10 @@
 ?>
 --EXPECT--
 <pre class='xdebug-var-dump' dir='ltr'>
-<b>array</b>
+<b>array</b> <i>(size=3)</i>
   0 <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>4</font>
   1 <font color='#888a85'>=&gt;</font>
- <b>array</b>
+ <b>array</b> <i>(size=3)</i>
       0 <font color='#888a85'>=&gt;</font> <small>string</small> <font color='#cc0000'>''</font> <i>(length=0)</i>
       1 <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>2</font>
       2 <font color='#888a85'>=&gt;</font> <small>string</small> <font color='#cc0000'>'node'</font> <i>(length=4)</i>

Modified: xdebug/trunk/tests/bug00280.phpt
===================================================================
--- xdebug/trunk/tests/bug00280.phpt 2011-01-07 15:35:18 UTC (rev 3383)
+++ xdebug/trunk/tests/bug00280.phpt 2011-01-07 23:52:11 UTC (rev 3384)
@@ -14,6 +14,6 @@
 ?>
 --EXPECT--
 <pre class='xdebug-var-dump' dir='ltr'>
-<b>array</b>
+<b>array</b> <i>(size=1)</i>
   'te&#0;st' <font color='#888a85'>=&gt;</font> <small>string</small> <font color='#cc0000'>'te&#0;st'</font> <i>(length=5)</i>
 </pre>

Modified: xdebug/trunk/tests/xdebug_var_dump.phpt
===================================================================
--- xdebug/trunk/tests/xdebug_var_dump.phpt 2011-01-07 15:35:18 UTC (rev 3383)
+++ xdebug/trunk/tests/xdebug_var_dump.phpt 2011-01-07 23:52:11 UTC (rev 3384)
@@ -42,7 +42,7 @@
   <i>private</i> 'self' <font color='#888a85'>=&gt;</font>
     <i>&</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
   <i>protected</i> 'tm' <font color='#888a85'>=&gt;</font>
- <b>array</b>
+ <b>array</b> <i>(size=11)</i>
       'seconds' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>6</font>
       'minutes' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>25</font>
       'hours' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>22</font>

Modified: xdebug/trunk/xdebug_var.c
===================================================================
--- xdebug/trunk/xdebug_var.c 2011-01-07 15:35:18 UTC (rev 3383)
+++ xdebug/trunk/xdebug_var.c 2011-01-07 23:52:11 UTC (rev 3384)
@@ -1232,7 +1232,7 @@
                         myht = Z_ARRVAL_PP(struc);
                         xdebug_str_add(str, xdebug_sprintf("\n%*s", (level - 1) * 4, ""), 1);
                         if (myht->nApplyCount < 1) {
- xdebug_str_add(str, xdebug_sprintf("<b>array</b> <i>(size=%d)</li>\n", myht->nNumOfElements), 1);
+ xdebug_str_add(str, xdebug_sprintf("<b>array</b> <i>(size=%d)</i>\n", myht->nNumOfElements), 1);
                                 if (level <= options->max_depth) {
                                         if (myht->nNumOfElements) {
                                                 options->runtime[level].current_element_nr = 0;
Received on Fri Jan 07 2011 - 23:52:11 GMT