Added: xdebug/trunk/tests/assignment-trace8-php52.phpt
===================================================================
--- xdebug/trunk/tests/assignment-trace8-php52.phpt	                        (rev 0)
+++ xdebug/trunk/tests/assignment-trace8-php52.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -0,0 +1,68 @@
+--TEST--
+Test for tracing multi-dimensional property assignments in user-readable function traces (< PHP 5.3)
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+--INI--
+xdebug.default_enable=1
+xdebug.profiler_enable=0
+xdebug.auto_trace=0
+xdebug.trace_format=0
+xdebug.collect_vars=1
+xdebug.collect_params=4
+xdebug.collect_returns=0
+xdebug.collect_assignments=1
+xdebug.var_display_max_depth=9
+--FILE--
+<?php
+$tf = xdebug_start_trace('/tmp/'. uniqid('xdt', TRUE));
+
+class testClass
+{
+	public $a;
+	static public $b;
+
+	function __construct( $obj )
+	{
+		$obj->a = new StdClass;
+		$obj->a->bar = 52;
+		$obj->a->foo = new StdClass;
+		$obj->a->foo->bar = 52;
+
+		$this->a = new StdClass;
+		$this->a->bar = 52;
+		$this->a->foo = new StdClass;
+		$this->a->foo->bar = 52;
+
+		self::$b = new StdClass;
+		self::$b->bar = 52;
+		self::$b->foo = new StdClass;
+		self::$b->foo->bar = 52;
+	}
+}
+
+$a = new testClass( new StdClass );
+
+xdebug_stop_trace();
+echo file_get_contents($tf);
+unlink($tf);
+?>
+--EXPECTF--
+TRACE START [%d-%d-%d %d:%d:%d]
+                         => $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
+%w%f %w%d     -> xdebug_stop_trace() %sassignment-trace8-php52.php:30
+%w%f %w%d
+TRACE END   [%d-%d-%d %d:%d:%d]

Modified: xdebug/trunk/tests/assignment-trace8.phpt
===================================================================
--- xdebug/trunk/tests/assignment-trace8.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/assignment-trace8.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -1,5 +1,7 @@
 --TEST--
-Test for tracing multi-dimensional property assignments in user-readable function traces
+Test for tracing multi-dimensional property assignments in user-readable function traces (>= PHP 5.3)
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

Added: xdebug/trunk/tests/assignment-trace9-php52.phpt
===================================================================
--- xdebug/trunk/tests/assignment-trace9-php52.phpt	                        (rev 0)
+++ xdebug/trunk/tests/assignment-trace9-php52.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -0,0 +1,68 @@
+--TEST--
+Test for tracing mixed array element and property assignments in user-readable function traces (< PHP 5.3)
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '>=')) echo "skip < PHP 5.3 needed\n"; ?>
+--INI--
+xdebug.default_enable=1
+xdebug.profiler_enable=0
+xdebug.auto_trace=0
+xdebug.trace_format=0
+xdebug.collect_vars=1
+xdebug.collect_params=4
+xdebug.collect_returns=0
+xdebug.collect_assignments=1
+xdebug.var_display_max_depth=9
+--FILE--
+<?php
+$tf = xdebug_start_trace('/tmp/'. uniqid('xdt', TRUE));
+
+class testClass
+{
+	public $a;
+	static public $b;
+
+	function __construct( $obj )
+	{
+		$obj->a = array();
+		$obj->a['bar'] = 52;
+		$obj->a['foo'] = new StdClass;
+		$obj->a['foo']->bar = 52;
+
+		$this->a = array();
+		$this->a['bar'] = 52;
+		$this->a['foo'] = new StdClass;
+		$this->a['foo']->bar = 52;
+
+		self::$b = array();
+		self::$b['bar'] = array();
+		self::$b['foo'] = new StdClass;
+		self::$b['foo']->bar = 52;
+	}
+}
+
+$a = new testClass( new StdClass );
+
+xdebug_stop_trace();
+echo file_get_contents($tf);
+unlink($tf);
+?>
+--EXPECTF--
+TRACE START [%d-%d-%d %d:%d:%d]
+                         => $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
+%w%f %w%d     -> xdebug_stop_trace() %sassignment-trace9-php52.php:30
+%w%f %w%d
+TRACE END   [%d-%d-%d %d:%d:%d]

Modified: xdebug/trunk/tests/assignment-trace9.phpt
===================================================================
--- xdebug/trunk/tests/assignment-trace9.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/assignment-trace9.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -1,5 +1,7 @@
 --TEST--
-Test for tracing mixed array element and property assignments in user-readable function traces
+Test for tracing mixed array element and property assignments in user-readable function traces (>= PHP 5.3)
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.profiler_enable=0

Modified: xdebug/trunk/tests/bug00472.phpt
===================================================================
--- xdebug/trunk/tests/bug00472.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/bug00472.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -2,7 +2,7 @@
 Test for bug #472: Dead Code Analysis for code coverage messed up after goto.
 --SKIPIF--
 <?php if (!extension_loaded("xdebug")) print "skip"; ?>
-<?php if(version_compare(zend_version(), "2.0.0-dev", '<')) echo "skip Zend Engine 2 needed\n"; ?>
+<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 xdebug.auto_trace=0

Modified: xdebug/trunk/tests/bug00476-2.phpt
===================================================================
--- xdebug/trunk/tests/bug00476-2.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/bug00476-2.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -1,5 +1,7 @@
 --TEST--
 Test for bug #476: Exception chanining doesn't work
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 --FILE--

Modified: xdebug/trunk/tests/bug00476.phpt
===================================================================
--- xdebug/trunk/tests/bug00476.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/bug00476.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -1,5 +1,7 @@
 --TEST--
 Test for bug #476: Exception chanining doesn't work
+--SKIPIF--
+<?php if(version_compare(phpversion(), "5.3.0", '<')) echo "skip PHP 5.3 needed\n"; ?>
 --INI--
 xdebug.default_enable=1
 --FILE--

Modified: xdebug/trunk/tests/scream.phpt
===================================================================
--- xdebug/trunk/tests/scream.phpt	2009-12-28 17:31:25 UTC (rev 3166)
+++ xdebug/trunk/tests/scream.phpt	2009-12-28 17:32:30 UTC (rev 3167)
@@ -16,4 +16,4 @@
 echo @strstr(), "\n";
 ?>
 --EXPECTF--
-Warning: strstr() expects at least 2 parameters, 0 given in %sscream.php on line 4
+Warning:%sstrstr()%sin %sscream.php on line 4