D9936.id23866.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9936.id23866.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
	@@ -577,9 +577,9 @@
	$this->assertEqual(
	implode("\n", array(
	'array(',
	- ' 0 => 1,',
	- ' 1 => 2,',
	- ' 2 => 3,',
	+ ' 1,',
	+ ' 2,',
	+ ' 3,',
	')',
	)),
	phutil_var_export(array(1, 2, 3)));
	@@ -594,7 +594,7 @@
	$this->assertEqual(
	implode("\n", array(
	'array(',
	- ' 0 => stdClass::__set_state(array(',
	+ ' stdClass::__set_state(array(',
	' )),',
	')',
	)),
	diff --git a/src/utils/utils.php b/src/utils/utils.php
	--- a/src/utils/utils.php
	+++ b/src/utils/utils.php
	@@ -1090,6 +1090,9 @@
	return 'array()';
	}

	+ // Don't show keys for non-associative arrays.
	+ $show_keys = (array_keys($var) !== range(0, count($var) - 1));
	+
	$output = array();
	$output[] = 'array(';

	@@ -1100,8 +1103,7 @@

	$output[] = implode('', array(
	str_repeat(' ', $indent),
	- var_export($key, true),
	- ' => ',
	+ $show_keys ? var_export($key, true).' => ' : '',
	str_replace(
	"\n",
	"\n".str_repeat(' ', $indent), phutil_var_export($value)),