Fixed a few test cases.

derickr · Jul 14, 2012 · 44b1bfb · 44b1bfb
1 parent e95eb3e
commit 44b1bfb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/tests/assignment-trace8-php52.phpt b/tests/assignment-trace8-php52.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]
diff --git a/tests/assignment-trace9-php52.phpt b/tests/assignment-trace9-php52.phpt
@@ -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]
diff --git a/tests/bug00843.phpt b/tests/bug00843.phpt
@@ -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