namespace Symfony\Component\VarDumper\Dumper;
use Symfony\Component\VarDumper\Cloner\Cursor;
+use Symfony\Component\VarDumper\Cloner\Stub;
/**
* CliDumper dumps variables for command line output.
"\033" => '\e',
);
+ protected $collapseNextHash = false;
+ protected $expandNextHash = false;
+
/**
* {@inheritdoc}
*/
- public function __construct($output = null, $charset = null)
+ public function __construct($output = null, $charset = null, $flags = 0)
{
- parent::__construct($output, $charset);
+ parent::__construct($output, $charset, $flags);
- if ('\\' === DIRECTORY_SEPARATOR && 'ON' !== @getenv('ConEmuANSI') && 'xterm' !== @getenv('TERM')) {
+ if ('\\' === \DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) {
// Use only the base 16 xterm colors when using ANSICON or standard Windows 10 CLI
$this->setStyles(array(
'default' => '31',
$this->dumpKey($cursor);
$style = 'const';
- $attr = array();
+ $attr = $cursor->attr;
switch ($type) {
+ case 'default':
+ $style = 'default';
+ break;
+
case 'integer':
$style = 'num';
break;
$style = 'num';
switch (true) {
- case INF === $value: $value = 'INF'; break;
+ case INF === $value: $value = 'INF'; break;
case -INF === $value: $value = '-INF'; break;
- case is_nan($value): $value = 'NAN'; break;
+ case is_nan($value): $value = 'NAN'; break;
default:
$value = (string) $value;
if (false === strpos($value, $this->decimalPoint)) {
break;
default:
- $attr['value'] = isset($value[0]) && !preg_match('//u', $value) ? $this->utf8Encode($value) : $value;
- $value = isset($type[0]) && !preg_match('//u', $type) ? $this->utf8Encode($type) : $type;
+ $attr += array('value' => $this->utf8Encode($value));
+ $value = $this->utf8Encode($type);
break;
}
$this->line .= $this->style($style, $value, $attr);
- $this->dumpLine($cursor->depth, true);
+ $this->endValue($cursor);
}
/**
public function dumpString(Cursor $cursor, $str, $bin, $cut)
{
$this->dumpKey($cursor);
+ $attr = $cursor->attr;
if ($bin) {
$str = $this->utf8Encode($str);
}
if ('' === $str) {
$this->line .= '""';
- $this->dumpLine($cursor->depth, true);
+ $this->endValue($cursor);
} else {
- $attr = array(
+ $attr += array(
'length' => 0 <= $cut ? mb_strlen($str, 'UTF-8') + $cut : 0,
'binary' => $bin,
);
unset($str[1]);
$str[0] .= "\n";
}
- $m = count($str) - 1;
+ $m = \count($str) - 1;
$i = $lineCut = 0;
+ if (self::DUMP_STRING_LENGTH & $this->flags) {
+ $this->line .= '('.$attr['length'].') ';
+ }
if ($bin) {
$this->line .= 'b';
}
$lineCut = 0;
}
- $this->dumpLine($cursor->depth, $i > $m);
+ if ($i > $m) {
+ $this->endValue($cursor);
+ } else {
+ $this->dumpLine($cursor->depth);
+ }
}
}
}
{
$this->dumpKey($cursor);
- if (!preg_match('//u', $class)) {
- $class = $this->utf8Encode($class);
+ if ($this->collapseNextHash) {
+ $cursor->skipChildren = true;
+ $this->collapseNextHash = $hasChild = false;
}
+
+ $class = $this->utf8Encode($class);
if (Cursor::HASH_OBJECT === $type) {
$prefix = $class && 'stdClass' !== $class ? $this->style('note', $class).' {' : '{';
} elseif (Cursor::HASH_RESOURCE === $type) {
$prefix = $this->style('note', $class.' resource').($hasChild ? ' {' : ' ');
} else {
- $prefix = $class ? $this->style('note', 'array:'.$class).' [' : '[';
+ $prefix = $class && !(self::DUMP_LIGHT_ARRAY & $this->flags) ? $this->style('note', 'array:'.$class).' [' : '[';
}
if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
{
$this->dumpEllipsis($cursor, $hasChild, $cut);
$this->line .= Cursor::HASH_OBJECT === $type ? '}' : (Cursor::HASH_RESOURCE !== $type ? ']' : ($hasChild ? '}' : ''));
- $this->dumpLine($cursor->depth, true);
+ $this->endValue($cursor);
}
/**
switch ($cursor->hashType) {
default:
case Cursor::HASH_INDEXED:
+ if (self::DUMP_LIGHT_ARRAY & $this->flags) {
+ break;
+ }
$style = 'index';
+ // no break
case Cursor::HASH_ASSOC:
- if (is_int($key)) {
+ if (\is_int($key)) {
$this->line .= $this->style($style, $key).' => ';
} else {
$this->line .= $bin.'"'.$this->style($style, $key).'" => ';
case Cursor::HASH_RESOURCE:
$key = "\0~\0".$key;
- // No break;
+ // no break
case Cursor::HASH_OBJECT:
if (!isset($key[0]) || "\0" !== $key[0]) {
$this->line .= '+'.$bin.$this->style('public', $key).': ';
} elseif (0 < strpos($key, "\0", 1)) {
$key = explode("\0", substr($key, 1), 2);
- switch ($key[0]) {
+ switch ($key[0][0]) {
case '+': // User inserted keys
$attr['dynamic'] = true;
$this->line .= '+'.$bin.'"'.$this->style('public', $key[1], $attr).'": ';
break 2;
case '~':
$style = 'meta';
+ if (isset($key[0][1])) {
+ parse_str(substr($key[0], 1), $attr);
+ $attr += array('binary' => $cursor->hashKeyIsBinary);
+ }
break;
case '*':
$style = 'protected';
break;
}
- $this->line .= $bin.$this->style($style, $key[1], $attr).': ';
+ if (isset($attr['collapse'])) {
+ if ($attr['collapse']) {
+ $this->collapseNextHash = true;
+ } else {
+ $this->expandNextHash = true;
+ }
+ }
+
+ $this->line .= $bin.$this->style($style, $key[1], $attr).(isset($attr['separator']) ? $attr['separator'] : ': ');
} else {
// This case should not happen
$this->line .= '-'.$bin.'"'.$this->style('private', $key, array('class' => '')).'": ';
$this->colors = $this->supportsColors();
}
+ if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
+ $prefix = substr($value, 0, -$attr['ellipsis']);
+ if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) {
+ $prefix = '.'.substr($prefix, \strlen($_SERVER[$pwd]));
+ }
+ if (!empty($attr['ellipsis-tail'])) {
+ $prefix .= substr($value, -$attr['ellipsis'], $attr['ellipsis-tail']);
+ $value = substr($value, -$attr['ellipsis'] + $attr['ellipsis-tail']);
+ } else {
+ $value = substr($value, -$attr['ellipsis']);
+ }
+
+ return $this->style('default', $prefix).$this->style($style, $value);
+ }
+
$style = $this->styles[$style];
$map = static::$controlCharsMap;
$s = $startCchr;
$c = $c[$i = 0];
do {
- $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+ $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', \ord($c[$i]));
} while (isset($c[++$i]));
return $s.$endCchr;
if ($this->colors) {
if ($cchrCount && "\033" === $value[0]) {
- $value = substr($value, strlen($startCchr));
+ $value = substr($value, \strlen($startCchr));
} else {
$value = "\033[{$style}m".$value;
}
- if ($cchrCount && $endCchr === substr($value, -strlen($endCchr))) {
- $value = substr($value, 0, -strlen($endCchr));
+ if ($cchrCount && $endCchr === substr($value, -\strlen($endCchr))) {
+ $value = substr($value, 0, -\strlen($endCchr));
} else {
$value .= "\033[{$this->styles['default']}m";
}
protected function supportsColors()
{
if ($this->outputStream !== static::$defaultOutput) {
- return @(is_resource($this->outputStream) && function_exists('posix_isatty') && posix_isatty($this->outputStream));
+ return $this->hasColorSupport($this->outputStream);
}
if (null !== static::$defaultColors) {
return static::$defaultColors;
}
if (isset($_SERVER['argv'][1])) {
$colors = $_SERVER['argv'];
- $i = count($colors);
+ $i = \count($colors);
while (--$i > 0) {
if (isset($colors[$i][5])) {
switch ($colors[$i]) {
}
}
- if ('\\' === DIRECTORY_SEPARATOR) {
- static::$defaultColors = @(
- '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
- || false !== getenv('ANSICON')
- || 'ON' === getenv('ConEmuANSI')
- || 'xterm' === getenv('TERM')
- );
- } elseif (function_exists('posix_isatty')) {
- $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
- $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
- static::$defaultColors = @posix_isatty($h);
- } else {
- static::$defaultColors = false;
- }
+ $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
+ $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
- return static::$defaultColors;
+ return static::$defaultColors = $this->hasColorSupport($h);
}
/**
}
parent::dumpLine($depth);
}
+
+ protected function endValue(Cursor $cursor)
+ {
+ if (Stub::ARRAY_INDEXED === $cursor->hashType || Stub::ARRAY_ASSOC === $cursor->hashType) {
+ if (self::DUMP_TRAILING_COMMA & $this->flags && 0 < $cursor->depth) {
+ $this->line .= ',';
+ } elseif (self::DUMP_COMMA_SEPARATOR & $this->flags && 1 < $cursor->hashLength - $cursor->hashIndex) {
+ $this->line .= ',';
+ }
+ }
+
+ $this->dumpLine($cursor->depth, true);
+ }
+
+ /**
+ * Returns true if the stream supports colorization.
+ *
+ * Reference: Composer\XdebugHandler\Process::supportsColor
+ * https://github.com/composer/xdebug-handler
+ *
+ * @param mixed $stream A CLI output stream
+ *
+ * @return bool
+ */
+ private function hasColorSupport($stream)
+ {
+ if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) {
+ return false;
+ }
+
+ if ('Hyper' === getenv('TERM_PROGRAM')) {
+ return true;
+ }
+
+ if (\DIRECTORY_SEPARATOR === '\\') {
+ return (\function_exists('sapi_windows_vt100_support')
+ && @sapi_windows_vt100_support($stream))
+ || false !== getenv('ANSICON')
+ || 'ON' === getenv('ConEmuANSI')
+ || 'xterm' === getenv('TERM');
+ }
+
+ if (\function_exists('stream_isatty')) {
+ return @stream_isatty($stream);
+ }
+
+ if (\function_exists('posix_isatty')) {
+ return @posix_isatty($stream);
+ }
+
+ $stat = @fstat($stream);
+ // Check if formatted mode is S_IFCHR
+ return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+ }
+
+ /**
+ * Returns true if the Windows terminal supports true color.
+ *
+ * Note that this does not check an output stream, but relies on environment
+ * variables from known implementations, or a PHP and Windows version that
+ * supports true color.
+ *
+ * @return bool
+ */
+ private function isWindowsTrueColor()
+ {
+ $result = 183 <= getenv('ANSICON_VER')
+ || 'ON' === getenv('ConEmuANSI')
+ || 'xterm' === getenv('TERM')
+ || 'Hyper' === getenv('TERM_PROGRAM');
+
+ if (!$result && \PHP_VERSION_ID >= 70200) {
+ $version = sprintf(
+ '%s.%s.%s',
+ PHP_WINDOWS_VERSION_MAJOR,
+ PHP_WINDOWS_VERSION_MINOR,
+ PHP_WINDOWS_VERSION_BUILD
+ );
+ $result = $version >= '10.0.15063';
+ }
+
+ return $result;
+ }
}
projects / yaffs-website / blobdiff