Added: xdebug/trunk/tests/bug00421.inc
===================================================================
--- xdebug/trunk/tests/bug00421.inc	                        (rev 0)
+++ xdebug/trunk/tests/bug00421.inc	2010-10-26 16:32:57 UTC (rev 3353)
@@ -0,0 +1,22 @@
+<?php
+function iterateXML()
+{
+    $siteXMLString = file_get_contents( FILE, true);
+    $iterator = new SimpleXMLIterator($siteXMLString);
+    $projectsIterator = $iterator->xpath("//page");
+
+    // Iterate through all 3 occurances of <page> elements
+    foreach ($projectsIterator as $pageXML)
+    {
+        // Set a breakpoint somewhere inside this loop.
+        // You won't see any variables in the Local Variables panel until the second
+        // time through the loop. After that, they seem to work fine.
+        $currentPageXML= $pageXML;
+        $name = $currentPageXML["name"];
+        echo $name . '
+';
+    }
+}
+
+iterateXML();
+

Modified: xdebug/trunk/tests/bug00421.phpt
===================================================================
--- xdebug/trunk/tests/bug00421.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00421.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -6,31 +6,8 @@

 $file = dirname(__FILE__) . "/localvariables.xml";

-$data = <<<'NOWDOC'
-<?php
-function iterateXML()
-{
-    $siteXMLString = file_get_contents( FILE, true);
-    $iterator = new SimpleXMLIterator($siteXMLString);
-    $projectsIterator = $iterator->xpath("//page");
+$data = file_get_contents( dirname(__FILE__) . '/bug00421.inc' );

-    // Iterate through all 3 occurances of <page> elements
-    foreach ($projectsIterator as $pageXML)
-    {
-        // Set a breakpoint somewhere inside this loop.
-        // You won't see any variables in the Local Variables panel until the second
-        // time through the loop. After that, they seem to work fine.
-        $currentPageXML= $pageXML;
-        $name = $currentPageXML["name"];
-        echo $name . '
-';
-    }
-}
-
-iterateXML();
-
-NOWDOC;
-
 $commands = array(
 	'step_into',
 	'feature_set -n max_depth -v 2',

Modified: xdebug/trunk/tests/bug00475.phpt
===================================================================
--- xdebug/trunk/tests/bug00475.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00475.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -3,10 +3,10 @@
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
-$data = <<<'NOWDOC'
+$data = <<<NOWDOC
 <?php
-$a = array( "example\0key" => "Value", "example" => "value\0key" );
-var_dump( $a );
+\$a = array( "example\0key" => "Value", "example" => "value\0key" );
+var_dump( \$a );
 NOWDOC;

 $commands = array(

Added: xdebug/trunk/tests/bug00494.inc
===================================================================
--- xdebug/trunk/tests/bug00494.inc	                        (rev 0)
+++ xdebug/trunk/tests/bug00494.inc	2010-10-26 16:32:57 UTC (rev 3353)
@@ -0,0 +1,18 @@
+<?php
+class abc {
+        private $arr;
+        public function abc(){
+                $this->arr = array(
+                        0 => array("some", "values"),
+                        1 => array("some", "more", "values")
+                );
+        }
+}
+
+class def extends abc {
+        private $arr;
+}
+
+$o = new def;
+echo "o: ";
+var_dump($o);

Modified: xdebug/trunk/tests/bug00494.phpt
===================================================================
--- xdebug/trunk/tests/bug00494.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00494.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -3,27 +3,8 @@
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
-$data = <<<'NOWDOC'
-<?php
-class abc {
-        private $arr;
-        public function abc(){
-                $this->arr = array(
-                        0 => array("some", "values"),
-                        1 => array("some", "more", "values")
-                );
-        }
-}
+$data = file_get_contents(dirname(__FILE__) . '/bug00494.inc');

-class def extends abc {
-        private $arr;
-}
-
-$o = new def;
-echo "o: ";
-var_dump($o);
-NOWDOC;
-
 $commands = array(
 	'step_into',
 	'breakpoint_set -t line -n 17',

Added: xdebug/trunk/tests/bug00530.inc
===================================================================
--- xdebug/trunk/tests/bug00530.inc	                        (rev 0)
+++ xdebug/trunk/tests/bug00530.inc	2010-10-26 16:32:57 UTC (rev 3353)
@@ -0,0 +1,21 @@
+<?php
+class MyClass {
+	private $a = "b";
+	private $b = null;
+
+	public function __construct() {
+		$this->b = 'b';
+		$c = 'a' . 'b';
+	}
+	// I hoover in nb over this $a
+	public function test($a) {
+		echo "a ist: " . $a;
+	}
+}
+
+$a = 1;
+$b = 2;
+$c = new MyClass();
+$f = 3;
+$c->test('gogo'); // this call***
+$c->test('gogo');

Modified: xdebug/trunk/tests/bug00530.phpt
===================================================================
--- xdebug/trunk/tests/bug00530.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00530.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -5,30 +5,8 @@
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
-$data = <<<'NOWDOC'
-<?php
-class MyClass {
-	private $a = "b";
-	private $b = null;
+$data = file_get_contents(dirname(__FILE__) . '/bug00530.inc');

-	public function __construct() {
-		$this->b = 'b';
-		$c = 'a' . 'b';
-	}
-	// I hoover in nb over this $a
-	public function test($a) {
-		echo "a ist: " . $a;
-	}
-}
-
-$a = 1;
-$b = 2;
-$c = new MyClass();
-$f = 3;
-$c->test('gogo'); // this call***
-$c->test('gogo');
-NOWDOC;
-
 $commands = array(
 	'step_into',
 	'breakpoint_set -t line -n 12',

Added: xdebug/trunk/tests/bug00538.inc
===================================================================
--- xdebug/trunk/tests/bug00538.inc	                        (rev 0)
+++ xdebug/trunk/tests/bug00538.inc	2010-10-26 16:32:57 UTC (rev 3353)
@@ -0,0 +1,14 @@
+<?php
+    function call($param1, $param2, $param3)
+    {
+        echo $param1;
+        echo $param2;
+        echo $param3;
+
+		var_dump(xdebug_get_function_stack());
+    }
+
+    $test=getcwd();
+	$value = 'candena\\a\nb';
+	echo $value, "\n";
+    call($test, $value, 'caneda \\\a \\\\b \\\\\c|');

Modified: xdebug/trunk/tests/bug00538.phpt
===================================================================
--- xdebug/trunk/tests/bug00538.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00538.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -3,23 +3,8 @@
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
-$data = <<<'NOWDOC'
-<?php
-    function call($param1, $param2, $param3)
-    {
-        echo $param1;
-        echo $param2;
-        echo $param3;
+$data = file_get_contents(dirname(__FILE__) . '/bug00538.inc');

-		var_dump(xdebug_get_function_stack());
-    }
-
-    $test=getcwd();
-	$value = 'candena\\a\nb';
-	echo $value, "\n";
-    call($test, $value, 'caneda \\\a \\\\b \\\\\c|');
-NOWDOC;
-
 $commands = array(
 	'step_into',
 	'breakpoint_set -t line -n 8',

Added: xdebug/trunk/tests/bug00566-2.inc
===================================================================
--- xdebug/trunk/tests/bug00566-2.inc	                        (rev 0)
+++ xdebug/trunk/tests/bug00566-2.inc	2010-10-26 16:32:57 UTC (rev 3353)
@@ -0,0 +1,19 @@
+<?php
+
+function loadMod( $module )
+{
+	strlen( $module );
+	$module .= 's';
+	strlen( $module );
+}
+
+function loadFoo( $test )
+{
+	strlen( $test );
+	$test .= 's';
+	strlen( $test );
+}
+
+loadFoo( 'view' );
+loadMod( 'test' );
+loadMod( 'view' );

Modified: xdebug/trunk/tests/bug00566-2.phpt
===================================================================
--- xdebug/trunk/tests/bug00566-2.phpt	2010-10-26 16:27:04 UTC (rev 3352)
+++ xdebug/trunk/tests/bug00566-2.phpt	2010-10-26 16:32:57 UTC (rev 3353)
@@ -7,28 +7,8 @@
 --FILE--
 <?php
 require 'dbgp/dbgpclient.php';
-$data = <<<'NOWDOC'
-<?php
+$data = file_get_contents(dirname(__FILE__) . '/bug00566-2.inc');

-function loadMod( $module )
-{
-	strlen( $module );
-	$module .= 's';
-	strlen( $module );
-}
-
-function loadFoo( $test )
-{
-	strlen( $test );
-	$test .= 's';
-	strlen( $test );
-}
-
-loadFoo( 'view' );
-loadMod( 'test' );
-loadMod( 'view' );
-NOWDOC;
-
 $commands = array(
 	'step_into',
 	'breakpoint_set -f file:///tmp/xdebug-dbgp-test.php -n 7 -t conditional -- JG1vZHVsZSA9PSB2aWV3cw==',