working around differing xdebug var_dump behavior

pear · Nov 26, 2023 · 6656b24 · 6656b24
1 parent bf77c4b
commit 6656b24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/tests/bugs/bug16617.phpt b/tests/bugs/bug16617.phpt
@@ -8,11 +8,12 @@ include 'DB/mssql.php';
 $dbh = new DB_mssql();
 
 $str = "C:\\\r\nX";
-var_dump($str, $dbh->escapeSimple($str));
+echo print_r($str, true), "\n";
+echo print_r($dbh->escapeSimple($str), true), "\n";
 ?>
 --EXPECT--
-string(6) "C:\
-X"
-string(9) "C:\\
+C:\
+X
+C:\\
 
-X"
+X
diff --git a/tests/fetchmodes.inc b/tests/fetchmodes.inc
@@ -60,7 +60,12 @@ for ($i = 1; $i <= 5; $i++) {
     if (is_array($row)) {
         print implode(', ', $row) . "\n";
     } else {
-        var_dump($row);
+	// work around differing xdebug var_dump behavior
+	if (!empty($row)) {
+            print_r($row);
+	} else {
+	    echo "NULL\n";
+	}
     }
 }
 $sth->free();  // keep fbsql happy.