Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed bug #821: Variable assignments (beginning with =>) should be in…

…dented one more scope.
  • Loading branch information...
commit 7d648b7fb473a8b9b45ab64d2f93ae403aac12c8 1 parent cf99e3d
Derick Rethans authored June 27, 2012
24  tests/assignment-trace1.phpt
@@ -47,20 +47,20 @@ unlink($tf);
47 47
 ?>
48 48
 --EXPECTF--
49 49
 TRACE START [%d-%d-%d %d:%d:%d]
50  
-                         => $tf = '/tmp/%sxt' %sassignment-trace1.php:2
  50
+                           => $tf = '/tmp/%sxt' %sassignment-trace1.php:2
51 51
 %w%f %w%d     -> test($a = 1, $b = 2, $c = 3) %sassignment-trace1.php:29
52  
-                           => $d = 89 %sassignment-trace1.php:6
53  
-                           => $a += 2 %sassignment-trace1.php:7
54  
-                           => $c /= 7 %sassignment-trace1.php:8
55  
-                           => $b *= 9 %sassignment-trace1.php:9
  52
+                             => $d = 89 %sassignment-trace1.php:6
  53
+                             => $a += 2 %sassignment-trace1.php:7
  54
+                             => $c /= 7 %sassignment-trace1.php:8
  55
+                             => $b *= 9 %sassignment-trace1.php:9
56 56
 %w%f %w%d     -> testClass->__construct() %sassignment-trace1.php:30
57  
-                           => $this->a = 98 %sassignment-trace1.php:20
58  
-                           => $this->b = 4 %sassignment-trace1.php:21
59  
-                           => $this->b -= 8 %sassignment-trace1.php:22
60  
-                           => $this->b *= -0.5 %sassignment-trace1.php:23
61  
-                           => $this->b <<= 1 %sassignment-trace1.php:24
62  
-                           => $this->c = 0.125 %sassignment-trace1.php:25
63  
-                         => $a = class testClass { public $a = 98; private $b = 4; protected $c = 0.125 } %sassignment-trace1.php:30
  57
+                             => $this->a = 98 %sassignment-trace1.php:20
  58
+                             => $this->b = 4 %sassignment-trace1.php:21
  59
+                             => $this->b -= 8 %sassignment-trace1.php:22
  60
+                             => $this->b *= -0.5 %sassignment-trace1.php:23
  61
+                             => $this->b <<= 1 %sassignment-trace1.php:24
  62
+                             => $this->c = 0.125 %sassignment-trace1.php:25
  63
+                           => $a = class testClass { public $a = 98; private $b = 4; protected $c = 0.125 } %sassignment-trace1.php:30
64 64
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace1.php:32
65 65
 %w%f %w%d
66 66
 TRACE END   [%d-%d-%d %d:%d:%d]
28  tests/assignment-trace2.phpt
@@ -46,21 +46,21 @@ Call Stack:
46 46
 %w%f %w%d   2. test(1, 2, 3) %sassignment-trace2.php:21
47 47
 
48 48
 TRACE START [%d-%d-%d %d:%d:%d]
49  
-                         => $tf = '/tmp/%s.xt' %sassignment-trace2.php:2
50  
-                         => $t = array () %sassignment-trace2.php:13
51  
-                         => $t['a'] = 98 %sassignment-trace2.php:14
52  
-                         => $t['b'] = 4 %sassignment-trace2.php:15
53  
-                         => $t['b'] -= 8 %sassignment-trace2.php:16
54  
-                         => $t['b'] *= -0.5 %sassignment-trace2.php:17
55  
-                         => $t['b'] <<= 1 %sassignment-trace2.php:18
56  
-                         => $t['c'] = 0.125 %sassignment-trace2.php:19
  49
+                           => $tf = '/tmp/%s.xt' %sassignment-trace2.php:2
  50
+                           => $t = array () %sassignment-trace2.php:13
  51
+                           => $t['a'] = 98 %sassignment-trace2.php:14
  52
+                           => $t['b'] = 4 %sassignment-trace2.php:15
  53
+                           => $t['b'] -= 8 %sassignment-trace2.php:16
  54
+                           => $t['b'] *= -0.5 %sassignment-trace2.php:17
  55
+                           => $t['b'] <<= 1 %sassignment-trace2.php:18
  56
+                           => $t['c'] = 0.125 %sassignment-trace2.php:19
57 57
 %w%f %w%d     -> test(1, 2, 3) %sassignment-trace2.php:21
58  
-                           => $t = array ('a' => 4, 'b' => 9, 'c' => 13) %sassignment-trace2.php:6
59  
-                           => $t['d'] = 89 %sassignment-trace2.php:7
60  
-                           => $t['a'] += NULL %sassignment-trace2.php:8
61  
-                           => $t['a'] += NULL %sassignment-trace2.php:9
62  
-                           => $t['c'] /= 7 %sassignment-trace2.php:10
63  
-                           => $t['b'] *= 9 %sassignment-trace2.php:11
  58
+                             => $t = array ('a' => 4, 'b' => 9, 'c' => 13) %sassignment-trace2.php:6
  59
+                             => $t['d'] = 89 %sassignment-trace2.php:7
  60
+                             => $t['a'] += NULL %sassignment-trace2.php:8
  61
+                             => $t['a'] += NULL %sassignment-trace2.php:9
  62
+                             => $t['c'] /= 7 %sassignment-trace2.php:10
  63
+                             => $t['b'] *= 9 %sassignment-trace2.php:11
64 64
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace2.php:23
65 65
 %w%f %w%d
66 66
 TRACE END   [%d-%d-%d %d:%d:%d]
8  tests/assignment-trace3.phpt
@@ -30,10 +30,10 @@ Call Stack:
30 30
 %w%f %w%d   1. {main}() %sassignment-trace3.php:0
31 31
 
32 32
 TRACE START [%d-%d-%d %d:%d:%d]
33  
-                         => $tf = '%s' %sassignment-trace3.php:2
34  
-                         => $t = array ('a' => 4, 'b' => 9, 'c' => 13) %sassignment-trace3.php:4
35  
-                         => $t['a'] += NULL %sassignment-trace3.php:5
36  
-                         => $t['a'] += NULL %sassignment-trace3.php:6
  33
+                           => $tf = '%s' %sassignment-trace3.php:2
  34
+                           => $t = array ('a' => 4, 'b' => 9, 'c' => 13) %sassignment-trace3.php:4
  35
+                           => $t['a'] += NULL %sassignment-trace3.php:5
  36
+                           => $t['a'] += NULL %sassignment-trace3.php:6
37 37
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace3.php:8
38 38
 %w%f %w%d
39 39
 TRACE END   [%d-%d-%d %d:%d:%d]
8  tests/assignment-trace4.phpt
@@ -30,10 +30,10 @@ Call Stack:
30 30
 %w%f %w%d   1. {main}() %sassignment-trace4.php:0
31 31
 
32 32
 TRACE START [%d-%d-%d %d:%d:%d]
33  
-                         => $tf = '%s' %sassignment-trace4.php:2
34  
-                         => $t = 42 %sassignment-trace4.php:4
35  
-                         => $t += NULL %sassignment-trace4.php:5
36  
-                         => $t += NULL %sassignment-trace4.php:6
  33
+                           => $tf = '%s' %sassignment-trace4.php:2
  34
+                           => $t = 42 %sassignment-trace4.php:4
  35
+                           => $t += NULL %sassignment-trace4.php:5
  36
+                           => $t += NULL %sassignment-trace4.php:6
37 37
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace4.php:8
38 38
 %w%f %w%d
39 39
 TRACE END   [%d-%d-%d %d:%d:%d]
6  tests/assignment-trace5.phpt
@@ -22,9 +22,9 @@ unlink($tf);
22 22
 ?>
23 23
 --EXPECTF--
24 24
 TRACE START [%d-%d-%d %d:%d:%d]
25  
-                         => $tf = '%s' %sassignment-trace5.php:2
26  
-                         => $t = array () %sassignment-trace5.php:4
27  
-                         => $t[] = 42 %sassignment-trace5.php:5
  25
+                           => $tf = '%s' %sassignment-trace5.php:2
  26
+                           => $t = array () %sassignment-trace5.php:4
  27
+                           => $t[] = 42 %sassignment-trace5.php:5
28 28
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace5.php:7
29 29
 %w%f %w%d
30 30
 TRACE END   [%d-%d-%d %d:%d:%d]
20  tests/assignment-trace6.phpt
@@ -40,17 +40,17 @@ unlink($tf);
40 40
 ?>
41 41
 --EXPECTF--
42 42
 TRACE START [%d-%d-%d %d:%d:%d]
43  
-                         => $tf = '%s' %sassignment-trace6.php:2
  43
+                           => $tf = '%s' %sassignment-trace6.php:2
44 44
 %w%f %w%d     -> foo::test() %sassignment-trace6.php:23
45  
-                           => self::foo = array () %sassignment-trace6.php:11
46  
-                           => self::foo[] = 42 %sassignment-trace6.php:12
47  
-                           => self::var = 'var' %sassignment-trace6.php:13
48  
-                           => self::var2 = 'var' %sassignment-trace6.php:14
49  
-                           => $id = 42 %sassignment-trace6.php:15
50  
-                           => self::foo[42] = 44 %sassignment-trace6.php:16
51  
-                           => self::bar['test'] = array () %sassignment-trace6.php:18
52  
-                           => $id = 'test' %sassignment-trace6.php:19
53  
-                           => bar['test'][] = 55 %sassignment-trace6.php:20
  45
+                             => self::foo = array () %sassignment-trace6.php:11
  46
+                             => self::foo[] = 42 %sassignment-trace6.php:12
  47
+                             => self::var = 'var' %sassignment-trace6.php:13
  48
+                             => self::var2 = 'var' %sassignment-trace6.php:14
  49
+                             => $id = 42 %sassignment-trace6.php:15
  50
+                             => self::foo[42] = 44 %sassignment-trace6.php:16
  51
+                             => self::bar['test'] = array () %sassignment-trace6.php:18
  52
+                             => $id = 'test' %sassignment-trace6.php:19
  53
+                             => bar['test'][] = 55 %sassignment-trace6.php:20
54 54
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace6.php:25
55 55
 %w%f %w%d
56 56
 TRACE END   [%d-%d-%d %d:%d:%d]
24  tests/assignment-trace7.phpt
@@ -47,20 +47,20 @@ unlink($tf);
47 47
 ?>
48 48
 --EXPECTF--
49 49
 TRACE START [%d-%d-%d %d:%d:%d]
50  
-                         => $tf = '/tmp/%s.xt' %sassignment-trace7.php:2
  50
+                           => $tf = '/tmp/%s.xt' %sassignment-trace7.php:2
51 51
 %w%f %w%d     -> test($a = 1, $b = 2, $c = 3) %sassignment-trace7.php:29
52  
-                           => $d = 89 %sassignment-trace7.php:6
53  
-                           => $a += 2 %sassignment-trace7.php:7
54  
-                           => $c /= 7 %sassignment-trace7.php:8
55  
-                           => $b *= 9 %sassignment-trace7.php:9
  52
+                             => $d = 89 %sassignment-trace7.php:6
  53
+                             => $a += 2 %sassignment-trace7.php:7
  54
+                             => $c /= 7 %sassignment-trace7.php:8
  55
+                             => $b *= 9 %sassignment-trace7.php:9
56 56
 %w%f %w%d     -> testClass->__construct($obj = class stdClass {  }) %sassignment-trace7.php:30
57  
-                           => $obj->a = 98 %sassignment-trace7.php:20
58  
-                           => $obj->b = 4 %sassignment-trace7.php:21
59  
-                           => $obj->b -= 8 %sassignment-trace7.php:22
60  
-                           => $obj->b *= -0.5 %sassignment-trace7.php:23
61  
-                           => $obj->b <<= 1 %sassignment-trace7.php:24
62  
-                           => $obj->c = 0.125 %sassignment-trace7.php:25
63  
-                         => $a = class testClass { public $a = NULL; private $b = NULL; protected $c = NULL } %sassignment-trace7.php:30
  57
+                             => $obj->a = 98 %sassignment-trace7.php:20
  58
+                             => $obj->b = 4 %sassignment-trace7.php:21
  59
+                             => $obj->b -= 8 %sassignment-trace7.php:22
  60
+                             => $obj->b *= -0.5 %sassignment-trace7.php:23
  61
+                             => $obj->b <<= 1 %sassignment-trace7.php:24
  62
+                             => $obj->c = 0.125 %sassignment-trace7.php:25
  63
+                           => $a = class testClass { public $a = NULL; private $b = NULL; protected $c = NULL } %sassignment-trace7.php:30
64 64
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace7.php:32
65 65
 %w%f %w%d
66 66
 TRACE END   [%d-%d-%d %d:%d:%d]
36  tests/assignment-trace8.phpt
@@ -53,25 +53,25 @@ unlink($tf);
53 53
 ?>
54 54
 --EXPECTF--
55 55
 TRACE START [%d-%d-%d %d:%d:%d]
56  
-                         => $tf = '/tmp/%s.xt' %sassignment-trace8.php:2
  56
+                           => $tf = '/tmp/%s.xt' %sassignment-trace8.php:2
57 57
 %w%f %w%d     -> testClass->__construct($obj = class stdClass {  }) %sassignment-trace8.php:33
58  
-                           => $obj->a = class stdClass {  } %sassignment-trace8.php:11
59  
-                           => $obj->a->bar = 52 %sassignment-trace8.php:12
60  
-                           => $obj->a->foo = class stdClass {  } %sassignment-trace8.php:13
61  
-                           => $obj->a->foo->bar = 52 %sassignment-trace8.php:14
62  
-                           => $this->a = class stdClass {  } %sassignment-trace8.php:16
63  
-                           => $this->a->bar = 52 %sassignment-trace8.php:17
64  
-                           => $this->a->foo = class stdClass {  } %sassignment-trace8.php:18
65  
-                           => $this->a->foo->bar = 52 %sassignment-trace8.php:19
66  
-                           => self::b = class stdClass {  } %sassignment-trace8.php:21
67  
-                           => self::b->bar = 52 %sassignment-trace8.php:22
68  
-                           => self::b->foo = class stdClass {  } %sassignment-trace8.php:23
69  
-                           => b->foo->bar = 52 %sassignment-trace8.php:24
70  
-                           => self::b = class stdClass {  } %sassignment-trace8.php:26
71  
-                           => self::b->bar = 52 %sassignment-trace8.php:27
72  
-                           => self::b->foo = class stdClass {  } %sassignment-trace8.php:28
73  
-                           => b->foo->bar = 52 %sassignment-trace8.php:29
74  
-                         => $a = class testClass { public $a = class stdClass { public $bar = 52; public $foo = class stdClass { public $bar = 52 } } } %sassignment-trace8.php:33
  58
+                             => $obj->a = class stdClass {  } %sassignment-trace8.php:11
  59
+                             => $obj->a->bar = 52 %sassignment-trace8.php:12
  60
+                             => $obj->a->foo = class stdClass {  } %sassignment-trace8.php:13
  61
+                             => $obj->a->foo->bar = 52 %sassignment-trace8.php:14
  62
+                             => $this->a = class stdClass {  } %sassignment-trace8.php:16
  63
+                             => $this->a->bar = 52 %sassignment-trace8.php:17
  64
+                             => $this->a->foo = class stdClass {  } %sassignment-trace8.php:18
  65
+                             => $this->a->foo->bar = 52 %sassignment-trace8.php:19
  66
+                             => self::b = class stdClass {  } %sassignment-trace8.php:21
  67
+                             => self::b->bar = 52 %sassignment-trace8.php:22
  68
+                             => self::b->foo = class stdClass {  } %sassignment-trace8.php:23
  69
+                             => b->foo->bar = 52 %sassignment-trace8.php:24
  70
+                             => self::b = class stdClass {  } %sassignment-trace8.php:26
  71
+                             => self::b->bar = 52 %sassignment-trace8.php:27
  72
+                             => self::b->foo = class stdClass {  } %sassignment-trace8.php:28
  73
+                             => b->foo->bar = 52 %sassignment-trace8.php:29
  74
+                           => $a = class testClass { public $a = class stdClass { public $bar = 52; public $foo = class stdClass { public $bar = 52 } } } %sassignment-trace8.php:33
75 75
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace8.php:35
76 76
 %w%f %w%d
77 77
 TRACE END   [%d-%d-%d %d:%d:%d]
36  tests/assignment-trace9.phpt
@@ -53,25 +53,25 @@ unlink($tf);
53 53
 ?>
54 54
 --EXPECTF--
55 55
 TRACE START [%d-%d-%d %d:%d:%d]
56  
-                         => $tf = '/tmp/%s.xt' %sassignment-trace9.php:2
  56
+                           => $tf = '/tmp/%s.xt' %sassignment-trace9.php:2
57 57
 %w%f %w%d     -> testClass->__construct($obj = class stdClass {  }) %sassignment-trace9.php:33
58  
-                           => $obj->a = array () %sassignment-trace9.php:11
59  
-                           => $obj->a['bar'] = 52 %sassignment-trace9.php:12
60  
-                           => $obj->a['foo'] = class stdClass {  } %sassignment-trace9.php:13
61  
-                           => $obj->a['foo']->bar = 52 %sassignment-trace9.php:14
62  
-                           => $this->a = array () %sassignment-trace9.php:16
63  
-                           => $this->a['bar'] = 52 %sassignment-trace9.php:17
64  
-                           => $this->a['foo'] = class stdClass {  } %sassignment-trace9.php:18
65  
-                           => $this->a['foo']->bar = 52 %sassignment-trace9.php:19
66  
-                           => self::b = array () %sassignment-trace9.php:21
67  
-                           => self::b['bar'] = array () %sassignment-trace9.php:22
68  
-                           => self::b['foo'] = class stdClass {  } %sassignment-trace9.php:23
69  
-                           => b['foo']->bar = 52 %sassignment-trace9.php:24
70  
-                           => self::b = array () %sassignment-trace9.php:26
71  
-                           => self::b['bar'] = array () %sassignment-trace9.php:27
72  
-                           => self::b['foo'] = class stdClass {  } %sassignment-trace9.php:28
73  
-                           => b['foo']->bar = 52 %sassignment-trace9.php:29
74  
-                         => $a = class testClass { public $a = array ('bar' => 52, 'foo' => class stdClass { public $bar = 52 }) } %sassignment-trace9.php:33
  58
+                             => $obj->a = array () %sassignment-trace9.php:11
  59
+                             => $obj->a['bar'] = 52 %sassignment-trace9.php:12
  60
+                             => $obj->a['foo'] = class stdClass {  } %sassignment-trace9.php:13
  61
+                             => $obj->a['foo']->bar = 52 %sassignment-trace9.php:14
  62
+                             => $this->a = array () %sassignment-trace9.php:16
  63
+                             => $this->a['bar'] = 52 %sassignment-trace9.php:17
  64
+                             => $this->a['foo'] = class stdClass {  } %sassignment-trace9.php:18
  65
+                             => $this->a['foo']->bar = 52 %sassignment-trace9.php:19
  66
+                             => self::b = array () %sassignment-trace9.php:21
  67
+                             => self::b['bar'] = array () %sassignment-trace9.php:22
  68
+                             => self::b['foo'] = class stdClass {  } %sassignment-trace9.php:23
  69
+                             => b['foo']->bar = 52 %sassignment-trace9.php:24
  70
+                             => self::b = array () %sassignment-trace9.php:26
  71
+                             => self::b['bar'] = array () %sassignment-trace9.php:27
  72
+                             => self::b['foo'] = class stdClass {  } %sassignment-trace9.php:28
  73
+                             => b['foo']->bar = 52 %sassignment-trace9.php:29
  74
+                           => $a = class testClass { public $a = array ('bar' => 52, 'foo' => class stdClass { public $bar = 52 }) } %sassignment-trace9.php:33
75 75
 %w%f %w%d     -> xdebug_stop_trace() %sassignment-trace9.php:35
76 76
 %w%f %w%d
77 77
 TRACE END   [%d-%d-%d %d:%d:%d]
10  tests/bug00501.phpt
@@ -25,11 +25,11 @@ unlink($tf);
25 25
 ?>
26 26
 --EXPECTF--
27 27
 TRACE START [%d-%d-%d %d:%d:%d]
28  
-                         => $tf = '%s' %sbug00501.php:2
29  
-                         => $i = 10 %sbug00501.php:4
30  
-                         => ++$i %sbug00501.php:7
31  
-                         => $i++ %sbug00501.php:8
32  
-                         => $i += 33 %sbug00501.php:8
  28
+                           => $tf = '%s' %sbug00501.php:2
  29
+                           => $i = 10 %sbug00501.php:4
  30
+                           => ++$i %sbug00501.php:7
  31
+                           => $i++ %sbug00501.php:8
  32
+                           => $i += 33 %sbug00501.php:8
33 33
 %w%f %w%d     -> xdebug_stop_trace() %sbug00501.php:10
34 34
 %w%f %w%d
35 35
 TRACE END   [%d-%d-%d %d:%d:%d]
2  tests/bug00690-2.phpt
@@ -22,6 +22,6 @@ DONE
22 22
 TRACE START [%d-%d-%d %d:%d:%d]
23 23
 %w%f %w%d     -> xdebug_get_tracefile_name() %sbug00690-2.php:3
24 24
                            >=> '/tmp/trace.bug690.xt'
25  
-                         => $trace_file = '/tmp/trace.bug690.xt' %sbug00690-2.php:3
  25
+                           => $trace_file = '/tmp/trace.bug690.xt' %sbug00690-2.php:3
26 26
 %w%f %w%d     -> file_get_contents('/tmp/trace.bug690.xt') %sbug00690-2.php:5
27 27
 
8  tests/bug00701.phpt
@@ -23,12 +23,12 @@ unlink($tf);
23 23
 ?>
24 24
 --EXPECTF--
25 25
 TRACE START [%d-%d-%d %d:%d:%d]
26  
-                         => $tf = '/tmp/xdt%s.xt' %sbug00701.php:2
27  
-                         => $class = 'class' %sbug00701.php:4
28  
-                         => $method = 'methodName' %sbug00701.php:5
  26
+                           => $tf = '/tmp/xdt%s.xt' %sbug00701.php:2
  27
+                           => $class = 'class' %sbug00701.php:4
  28
+                           => $method = 'methodName' %sbug00701.php:5
29 29
 %w%f %w%d     -> ucfirst('class') %sbug00701.php:6
30 30
                            >=> 'Class'
31  
-                         => $action_ids[???]['methodName'] = 'methodName' %sbug00701.php:6
  31
+                           => $action_ids[???]['methodName'] = 'methodName' %sbug00701.php:6
32 32
 %w%f %w%d     -> xdebug_stop_trace() %sbug00701.php:8
33 33
 %w%f %w%d
34 34
 TRACE END   [%d-%d-%d %d:%d:%d]
12  tests/bug00756.phpt
@@ -44,19 +44,19 @@ echo "DONE\n";
44 44
 ?>
45 45
 --EXPECTF--
46 46
 TRACE START [%d-%d-%d %d:%d:%d]
47  
-                         => $tf = '/tmp/xdt%s.%s.xt' %sbug00756.php:18
  47
+                           => $tf = '/tmp/xdt%s.%s.xt' %sbug00756.php:18
48 48
 %w%f %w%d     -> xdebug_get_tracefile_name() %sbug00756.php:19
49 49
                            >=> '/tmp/xdt%s.%s.xt'
50  
-                         => $trace_file = '/tmp/xdt%s.%s.xt' %sbug00756.php:19
  50
+                           => $trace_file = '/tmp/xdt%s.%s.xt' %sbug00756.php:19
51 51
 %w%f %w%d     -> foo::bar() %sbug00756.php:21
52  
-                           => self::bar++ %sbug00756.php:9
  52
+                             => self::bar++ %sbug00756.php:9
53 53
                            >=> NULL
54 54
 %w%f %w%d     -> foo->foo() %sbug00756.php:22
55  
-                           => $this->foo++ %sbug00756.php:14
  55
+                             => $this->foo++ %sbug00756.php:14
56 56
                            >=> NULL
57  
-                         => $f = class foo { public $foo = 1 } %sbug00756.php:22
  57
+                           => $f = class foo { public $foo = 1 } %sbug00756.php:22
58 58
 %w%f %w%d     -> foo->foo() %sbug00756.php:23
59  
-                           => $this->foo++ %sbug00756.php:14
  59
+                             => $this->foo++ %sbug00756.php:14
60 60
                            >=> NULL
61 61
 %w%f %w%d     -> file_get_contents('/tmp/xdt%s.%s.xt') %sbug00756.php:25
62 62
 DONE
4  tests/closure-trace.phpt
@@ -31,9 +31,9 @@ unlink($tf);
31 31
 ?>
32 32
 --EXPECTF--
33 33
 TRACE START [%d-%d-%d %d:%d:%d]
34  
-                         => $tf = '/tmp/%s.xt' %sclosure-trace.php:2
  34
+                           => $tf = '/tmp/%s.xt' %sclosure-trace.php:2
35 35
 %w%f %w%d     -> test1() %sclosure-trace.php:13
36  
-                           => $f = class Closure {  } %sclosure-trace.php:8
  36
+                             => $f = class Closure {  } %sclosure-trace.php:8
37 37
 %w%f %w%d       -> {closure:%sclosure-trace.php:6-8}($a = 5, $b = 25) %sclosure-trace.php:10
38 38
 %w%f %w%d         -> strlen(125) %sclosure-trace.php:7
39 39
                                >=> 3
2  xdebug_tracing.c
@@ -70,7 +70,7 @@ char* xdebug_return_trace_assignment(function_stack_entry *i, char *varname, zva
70 70
 	if (XG(show_mem_delta)) {
71 71
 		xdebug_str_addl(&str, "        ", 8, 0);
72 72
 	}
73  
-	for (j = 0; j < i->level; j++) {
  73
+	for (j = 0; j <= i->level; j++) {
74 74
 		xdebug_str_addl(&str, "  ", 2, 0);
75 75
 	}
76 76
 	xdebug_str_addl(&str, "   => ", 6, 0);

0 notes on commit 7d648b7

Please sign in to comment.
Something went wrong with that request. Please try again.