Mercurial > hg > cmmr2012-drupal-site
diff vendor/symfony/var-dumper/Dumper/CliDumper.php @ 4:a9cd425dd02b
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:11:55 +0000 |
parents | c75dbcec494b |
children |
line wrap: on
line diff
--- a/vendor/symfony/var-dumper/Dumper/CliDumper.php Thu Feb 28 11:14:44 2019 +0000 +++ b/vendor/symfony/var-dumper/Dumper/CliDumper.php Thu Feb 28 13:11:55 2019 +0000 @@ -26,7 +26,7 @@ protected $colors; protected $maxStringWidth = 0; - protected $styles = array( + protected $styles = [ // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics 'default' => '38;5;208', 'num' => '1;38;5;38', @@ -40,17 +40,17 @@ 'meta' => '38;5;170', 'key' => '38;5;113', 'index' => '38;5;38', - ); + ]; protected static $controlCharsRx = '/[\x00-\x1F\x7F]+/'; - protected static $controlCharsMap = array( + protected static $controlCharsMap = [ "\t" => '\t', "\n" => '\n', "\v" => '\v', "\f" => '\f', "\r" => '\r', "\033" => '\e', - ); + ]; protected $collapseNextHash = false; protected $expandNextHash = false; @@ -62,9 +62,9 @@ { parent::__construct($output, $charset, $flags); - if ('\\' === DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) { + if ('\\' === \DIRECTORY_SEPARATOR && !$this->isWindowsTrueColor()) { // Use only the base 16 xterm colors when using ANSICON or standard Windows 10 CLI - $this->setStyles(array( + $this->setStyles([ 'default' => '31', 'num' => '1;34', 'const' => '1;31', @@ -74,7 +74,7 @@ 'meta' => '35', 'key' => '32', 'index' => '34', - )); + ]); } } @@ -152,7 +152,7 @@ break; default: - $attr += array('value' => $this->utf8Encode($value)); + $attr += ['value' => $this->utf8Encode($value)]; $value = $this->utf8Encode($type); break; } @@ -177,16 +177,16 @@ $this->line .= '""'; $this->endValue($cursor); } else { - $attr += array( + $attr += [ 'length' => 0 <= $cut ? mb_strlen($str, 'UTF-8') + $cut : 0, 'binary' => $bin, - ); + ]; $str = explode("\n", $str); if (isset($str[1]) && !isset($str[2]) && !isset($str[1][0])) { unset($str[1]); $str[0] .= "\n"; } - $m = count($str) - 1; + $m = \count($str) - 1; $i = $lineCut = 0; if (self::DUMP_STRING_LENGTH & $this->flags) { @@ -272,9 +272,9 @@ } if ($cursor->softRefCount || 0 < $cursor->softRefHandle) { - $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), array('count' => $cursor->softRefCount)); + $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), ['count' => $cursor->softRefCount]); } elseif ($cursor->hardRefTo && !$cursor->refIndex && $class) { - $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, array('count' => $cursor->hardRefCount)); + $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, ['count' => $cursor->hardRefCount]); } elseif (!$hasChild && Cursor::HASH_RESOURCE === $type) { $prefix = substr($prefix, 0, -1); } @@ -327,7 +327,7 @@ if ($cursor->hashKeyIsBinary) { $key = $this->utf8Encode($key); } - $attr = array('binary' => $cursor->hashKeyIsBinary); + $attr = ['binary' => $cursor->hashKeyIsBinary]; $bin = $cursor->hashKeyIsBinary ? 'b' : ''; $style = 'key'; switch ($cursor->hashType) { @@ -339,7 +339,7 @@ $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).'" => '; @@ -364,7 +364,7 @@ $style = 'meta'; if (isset($key[0][1])) { parse_str(substr($key[0], 1), $attr); - $attr += array('binary' => $cursor->hashKeyIsBinary); + $attr += ['binary' => $cursor->hashKeyIsBinary]; } break; case '*': @@ -389,13 +389,13 @@ $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->line .= '-'.$bin.'"'.$this->style('private', $key, ['class' => '']).'": '; } break; } if ($cursor->hardRefTo) { - $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), array('count' => $cursor->hardRefCount)).' '; + $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), ['count' => $cursor->hardRefCount]).' '; } } } @@ -409,7 +409,7 @@ * * @return string The value with style decoration */ - protected function style($style, $value, $attr = array()) + protected function style($style, $value, $attr = []) { if (null === $this->colors) { $this->colors = $this->supportsColors(); @@ -417,8 +417,8 @@ 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 ('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']); @@ -439,7 +439,7 @@ $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; @@ -447,12 +447,12 @@ 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"; } @@ -474,7 +474,7 @@ } 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]) { @@ -495,7 +495,7 @@ } } - $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null); + $h = stream_get_meta_data($this->outputStream) + ['wrapper_type' => null]; $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream; return static::$defaultColors = $this->hasColorSupport($h); @@ -537,23 +537,27 @@ */ private function hasColorSupport($stream) { - if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) { + if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) { return false; } - if (DIRECTORY_SEPARATOR === '\\') { - return (function_exists('sapi_windows_vt100_support') + 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')) { + if (\function_exists('stream_isatty')) { return @stream_isatty($stream); } - if (function_exists('posix_isatty')) { + if (\function_exists('posix_isatty')) { return @posix_isatty($stream); } @@ -575,9 +579,10 @@ { $result = 183 <= getenv('ANSICON_VER') || 'ON' === getenv('ConEmuANSI') - || 'xterm' === getenv('TERM'); + || 'xterm' === getenv('TERM') + || 'Hyper' === getenv('TERM_PROGRAM'); - if (!$result && PHP_VERSION_ID >= 70200) { + if (!$result && \PHP_VERSION_ID >= 70200) { $version = sprintf( '%s.%s.%s', PHP_WINDOWS_VERSION_MAJOR,