X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FVarDumper%2FDumper.php;fp=vendor%2Fpsy%2Fpsysh%2Fsrc%2FPsy%2FVarDumper%2FDumper.php;h=42c8832cd9d73ea888e9779a4676d8e7ce8649a3;hp=6e166af5679e56dd37d64ebe7caa5b267072597a;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hpb=aea91e65e895364e460983b890e295aa5d5540a5 diff --git a/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php b/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php index 6e166af56..42c8832cd 100644 --- a/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php +++ b/vendor/psy/psysh/src/Psy/VarDumper/Dumper.php @@ -21,10 +21,11 @@ use Symfony\Component\VarDumper\Dumper\CliDumper; class Dumper extends CliDumper { private $formatter; + private $forceArrayIndexes; protected static $onlyControlCharsRx = '/^[\x00-\x1F\x7F]+$/'; - protected static $controlCharsRx = '/([\x00-\x1F\x7F]+)/'; - protected static $controlCharsMap = array( + protected static $controlCharsRx = '/([\x00-\x1F\x7F]+)/'; + protected static $controlCharsMap = array( "\0" => '\0', "\t" => '\t', "\n" => '\n', @@ -34,9 +35,10 @@ class Dumper extends CliDumper "\033" => '\e', ); - public function __construct(OutputFormatter $formatter) + public function __construct(OutputFormatter $formatter, $forceArrayIndexes = false) { $this->formatter = $formatter; + $this->forceArrayIndexes = $forceArrayIndexes; parent::__construct(); $this->setColors(false); } @@ -57,7 +59,7 @@ class Dumper extends CliDumper */ protected function dumpKey(Cursor $cursor) { - if (Cursor::HASH_INDEXED !== $cursor->hashType) { + if ($this->forceArrayIndexes || Cursor::HASH_INDEXED !== $cursor->hashType) { parent::dumpKey($cursor); } }