Permalink
Browse files

Merge branch 'xdebug_2_2'

  • Loading branch information...
2 parents 6e2969b + 44b1bfb commit cf871b74cd78c1b631b1a011f8899d66e37c05ac @derickr committed Jul 14, 2012
Showing with 29 additions and 29 deletions.
  1. +14 −14 tests/assignment-trace8-php52.phpt
  2. +14 −14 tests/assignment-trace9-php52.phpt
  3. +1 −1 tests/bug00843.phpt
@@ -48,21 +48,21 @@ unlink($tf);
?>
--EXPECTF--
TRACE START [%d-%d-%d %d:%d:%d]
- => $tf = '/tmp/%s.xt' %sassignment-trace8-php52.php:2
+ => $tf = '/tmp/%s.xt' %sassignment-trace8-php52.php:2
%w%f %w%d -> testClass->__construct($obj = class stdClass { }) %sassignment-trace8-php52.php:28
- => $obj->a = class stdClass { } %sassignment-trace8-php52.php:11
- => $obj->a->bar = 52 %sassignment-trace8-php52.php:12
- => $obj->a->foo = class stdClass { } %sassignment-trace8-php52.php:13
- => $obj->a->foo->bar = 52 %sassignment-trace8-php52.php:14
- => $this->a = class stdClass { } %sassignment-trace8-php52.php:16
- => $this->a->bar = 52 %sassignment-trace8-php52.php:17
- => $this->a->foo = class stdClass { } %sassignment-trace8-php52.php:18
- => $this->a->foo->bar = 52 %sassignment-trace8-php52.php:19
- => self::b = class stdClass { } %sassignment-trace8-php52.php:21
- => self::b->bar = 52 %sassignment-trace8-php52.php:22
- => self::b->foo = class stdClass { } %sassignment-trace8-php52.php:23
- => b->foo->bar = 52 %sassignment-trace8-php52.php:24
- => $a = class testClass { public $a = class stdClass { public $bar = 52; public $foo = class stdClass { public $bar = 52 } } } %sassignment-trace8-php52.php:28
+ => $obj->a = class stdClass { } %sassignment-trace8-php52.php:11
+ => $obj->a->bar = 52 %sassignment-trace8-php52.php:12
+ => $obj->a->foo = class stdClass { } %sassignment-trace8-php52.php:13
+ => $obj->a->foo->bar = 52 %sassignment-trace8-php52.php:14
+ => $this->a = class stdClass { } %sassignment-trace8-php52.php:16
+ => $this->a->bar = 52 %sassignment-trace8-php52.php:17
+ => $this->a->foo = class stdClass { } %sassignment-trace8-php52.php:18
+ => $this->a->foo->bar = 52 %sassignment-trace8-php52.php:19
+ => self::b = class stdClass { } %sassignment-trace8-php52.php:21
+ => self::b->bar = 52 %sassignment-trace8-php52.php:22
+ => self::b->foo = class stdClass { } %sassignment-trace8-php52.php:23
+ => b->foo->bar = 52 %sassignment-trace8-php52.php:24
+ => $a = class testClass { public $a = class stdClass { public $bar = 52; public $foo = class stdClass { public $bar = 52 } } } %sassignment-trace8-php52.php:28
%w%f %w%d -> xdebug_stop_trace() %sassignment-trace8-php52.php:30
%w%f %w%d
TRACE END [%d-%d-%d %d:%d:%d]
@@ -48,21 +48,21 @@ unlink($tf);
?>
--EXPECTF--
TRACE START [%d-%d-%d %d:%d:%d]
- => $tf = '/tmp/%s.xt' %sassignment-trace9-php52.php:2
+ => $tf = '/tmp/%s.xt' %sassignment-trace9-php52.php:2
%w%f %w%d -> testClass->__construct($obj = class stdClass { }) %sassignment-trace9-php52.php:28
- => $obj->a = array () %sassignment-trace9-php52.php:11
- => $obj->a['bar'] = 52 %sassignment-trace9-php52.php:12
- => $obj->a['foo'] = class stdClass { } %sassignment-trace9-php52.php:13
- => $obj->a['foo']->bar = 52 %sassignment-trace9-php52.php:14
- => $this->a = array () %sassignment-trace9-php52.php:16
- => $this->a['bar'] = 52 %sassignment-trace9-php52.php:17
- => $this->a['foo'] = class stdClass { } %sassignment-trace9-php52.php:18
- => $this->a['foo']->bar = 52 %sassignment-trace9-php52.php:19
- => self::b = array () %sassignment-trace9-php52.php:21
- => self::b['bar'] = array () %sassignment-trace9-php52.php:22
- => self::b['foo'] = class stdClass { } %sassignment-trace9-php52.php:23
- => b['foo']->bar = 52 %sassignment-trace9-php52.php:24
- => $a = class testClass { public $a = array ('bar' => 52, 'foo' => class stdClass { public $bar = 52 }) } %sassignment-trace9-php52.php:28
+ => $obj->a = array () %sassignment-trace9-php52.php:11
+ => $obj->a['bar'] = 52 %sassignment-trace9-php52.php:12
+ => $obj->a['foo'] = class stdClass { } %sassignment-trace9-php52.php:13
+ => $obj->a['foo']->bar = 52 %sassignment-trace9-php52.php:14
+ => $this->a = array () %sassignment-trace9-php52.php:16
+ => $this->a['bar'] = 52 %sassignment-trace9-php52.php:17
+ => $this->a['foo'] = class stdClass { } %sassignment-trace9-php52.php:18
+ => $this->a['foo']->bar = 52 %sassignment-trace9-php52.php:19
+ => self::b = array () %sassignment-trace9-php52.php:21
+ => self::b['bar'] = array () %sassignment-trace9-php52.php:22
+ => self::b['foo'] = class stdClass { } %sassignment-trace9-php52.php:23
+ => b['foo']->bar = 52 %sassignment-trace9-php52.php:24
+ => $a = class testClass { public $a = array ('bar' => 52, 'foo' => class stdClass { public $bar = 52 }) } %sassignment-trace9-php52.php:28
%w%f %w%d -> xdebug_stop_trace() %sassignment-trace9-php52.php:30
%w%f %w%d
TRACE END [%d-%d-%d %d:%d:%d]
View
@@ -27,7 +27,7 @@ Version: 2.%s
File format: 2
TRACE START [%d-%d-%d %d:%d:%d]
2 2 1 %d.%d %d
-2 3 0 %d.%d %d setlocale 0 %sbug00843.php 4 2 6 'ro_RO.UTF-8'
+2 3 0 %d.%d %d setlocale 0 %sbug00843.php 4 %d 6 '%s'
2 3 1 %d.%d %d
2 4 0 %d.%d %d xdebug_stop_trace 0 %sbug00843.php 6 0
%d.%d %d

0 comments on commit cf871b7

Please sign in to comment.