From 4feb04bb006fc396dfef571e7f12233b68df758e Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 7 May 2012 13:45:57 +0100
Subject: [PATCH] Fixed bug #827: Enabling Xdebug causes phpt tests to fail
 because of var_dump() formatting issues.

---
 tests/bug00280.phpt                        | 1 +
 tests/bug00298.phpt                        | 2 ++
 tests/bug00328.phpt                        | 1 +
 tests/bug00684.phpt                        | 1 +
 tests/bug00744.phpt                        | 1 +
 tests/vardump-overload-cli.phpt            | 1 +
 tests/xdebug_var_dump_limitations.phpt     | 1 +
 tests/xdebug_var_dump_limitations_cli.phpt | 1 +
 xdebug.c                                   | 5 ++++-
 9 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/bug00280.phpt b/tests/bug00280.phpt
index bedb1dd31..d742e6874 100644
--- a/tests/bug00280.phpt
+++ b/tests/bug00280.phpt
@@ -2,6 +2,7 @@
 Test for bug #280: var_dump don't display key of array as expected
 --INI--
 xdebug.overload_var_dump=1
+xdebug.default_enable=1
 --FILE--
 <?php
 $var = "te\0st";
diff --git a/tests/bug00298.phpt b/tests/bug00298.phpt
index 6260e26b2..8d0a51666 100644
--- a/tests/bug00298.phpt
+++ b/tests/bug00298.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test for bug #298: xdebug_var_dump & multiline strings
+--INI--
+xdebug.default_enable=1
 --FILE--
 <?php
 ini_set('html_errors', '1');
diff --git a/tests/bug00328.phpt b/tests/bug00328.phpt
index 91800a8c0..1564ed674 100644
--- a/tests/bug00328.phpt
+++ b/tests/bug00328.phpt
@@ -2,6 +2,7 @@
 Test for bug #328: Private properties are incorrectly enumerated in case of extended classes
 --INI--
 html_errors=1
+xdebug.default_enable=1
 --FILE--
 <?php
 class Daddy
diff --git a/tests/bug00684.phpt b/tests/bug00684.phpt
index 904c84808..f89626943 100644
--- a/tests/bug00684.phpt
+++ b/tests/bug00684.phpt
@@ -2,6 +2,7 @@
 Test for bug #684: xdebug_var_dump - IE does not support &amp;
 --INI--
 html_errors=1
+xdebug.default_enable=1
 --FILE--
 <?php
 xdebug_var_dump('Testing isn\'t fun');
diff --git a/tests/bug00744.phpt b/tests/bug00744.phpt
index 3c101ef86..fed367233 100644
--- a/tests/bug00744.phpt
+++ b/tests/bug00744.phpt
@@ -3,6 +3,7 @@ Test for bug #744: new lines in a PHP file from Windows are displayed with an ex
 --INI--
 html_errors=1
 xdebug.overload_var_dump=1
+xdebug.default_enable=1
 --FILE--
 <?php
 $my_test_string = 'hello
diff --git a/tests/vardump-overload-cli.phpt b/tests/vardump-overload-cli.phpt
index 426ae68e5..c72919ed0 100644
--- a/tests/vardump-overload-cli.phpt
+++ b/tests/vardump-overload-cli.phpt
@@ -4,6 +4,7 @@ Test for overloaded var_dump() on the CLI
 xdebug.overload_var_dump=1
 html_errors=0
 xdebug.cli_color=0
+xdebug.default_enable=1
 xdebug.var_display_max_data=32
 xdebug.var_display_max_depth=2
 xdebug.var_display_max_children=8
diff --git a/tests/xdebug_var_dump_limitations.phpt b/tests/xdebug_var_dump_limitations.phpt
index c3563f8aa..ee50a65fe 100644
--- a/tests/xdebug_var_dump_limitations.phpt
+++ b/tests/xdebug_var_dump_limitations.phpt
@@ -5,6 +5,7 @@ xdebug.var_display_max_children=-1
 xdebug.var_display_max_data=-1
 xdebug.var_display_max_depth=-1
 html_errors=1
+xdebug.default_enable=1
 --FILE--
 <?php
 $array = array( 1, true, "string" );
diff --git a/tests/xdebug_var_dump_limitations_cli.phpt b/tests/xdebug_var_dump_limitations_cli.phpt
index 9557cfc36..68754f320 100644
--- a/tests/xdebug_var_dump_limitations_cli.phpt
+++ b/tests/xdebug_var_dump_limitations_cli.phpt
@@ -6,6 +6,7 @@ xdebug.var_display_max_data=-1
 xdebug.var_display_max_depth=-1
 xdebug.cli_color=0
 html_errors=0
+xdebug.default_enable=1
 --FILE--
 <?php
 $array = array( 1, true, "string" );
diff --git a/xdebug.c b/xdebug.c
index b15502158..bb788f96c 100644
--- a/xdebug.c
+++ b/xdebug.c
@@ -1599,7 +1599,10 @@ PHP_FUNCTION(xdebug_var_dump)
 	}
 	
 	for (i = 0; i < argc; i++) {
-		if (PG(html_errors)) {
+		if (XG(default_enable) == 0) {
+			xdebug_php_var_dump(args[i], 1 TSRMLS_CC);
+		}
+		else if (PG(html_errors)) {
 			val = xdebug_get_zval_value_fancy(NULL, (zval*) *args[i], &len, 0, NULL TSRMLS_CC);
 			PHPWRITE(val, len);
 			xdfree(val);