D9934.diff
No OneTemporary
Actions

Size

1000 B

Referenced Files

None

Subscribers

None

D9934.diff
View Options

	diff --git a/src/utils/__tests__/PhutilUtilsTestCase.php b/src/utils/__tests__/PhutilUtilsTestCase.php
	--- a/src/utils/__tests__/PhutilUtilsTestCase.php
	+++ b/src/utils/__tests__/PhutilUtilsTestCase.php
	@@ -569,6 +569,7 @@
	$this->assertEqual(
	'array()',
	phutil_var_export(array()));
	+
	$this->assertEqual(
	implode("\n", array(
	'array(',
	@@ -578,6 +579,7 @@
	')',
	)),
	phutil_var_export(array(1, 2, 3)));
	+
	$this->assertEqual(
	implode("\n", array(
	'array(',
	diff --git a/src/utils/utils.php b/src/utils/utils.php
	--- a/src/utils/utils.php
	+++ b/src/utils/utils.php
	@@ -1081,10 +1081,9 @@
	*/
	function phutil_var_export($var) {
	$regex = array(
	- '/\s+$/m' => '',
	- "/=>\n\s+/" => '=> ',
	+ "/=>\s*\n\s+/" => '=> ',
	"/array\s$\n\s$/" => 'array()',
	- '/array \(/' => 'array(',
	+ '/array\s+\(/' => 'array(',
	);

	$var = var_export($var, true);