Skip to content

[VarDumper] Fix managing collapse state in CliDumper #51473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2023
Merged

[VarDumper] Fix managing collapse state in CliDumper #51473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Symfony/Component/VarDumper/Dumper/CliDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ public function setDisplayOptions(array $displayOptions)
public function dumpScalar(Cursor $cursor, string $type, $value)
{
$this->dumpKey($cursor);
$this->collapseNextHash = $this->expandNextHash = false;

$style = 'const';
$attr = $cursor->attr;
Expand Down Expand Up @@ -191,6 +192,7 @@ public function dumpScalar(Cursor $cursor, string $type, $value)
public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
{
$this->dumpKey($cursor);
$this->collapseNextHash = $this->expandNextHash = false;
$attr = $cursor->attr;

if ($bin) {
Expand Down Expand Up @@ -286,6 +288,7 @@ public function enterHash(Cursor $cursor, int $type, $class, bool $hasChild)
}

$this->dumpKey($cursor);
$this->expandNextHash = false;
$attr = $cursor->attr;

if ($this->collapseNextHash) {
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public function testNotConnected()

$xCast = <<<EODUMP
mysqli_driver {%A
+reconnect: false
+report_mode: 3
}
EODUMP;
Expand Down
40 changes: 40 additions & 0 deletions src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

use PHPUnit\Framework\TestCase;
use Symfony\Component\VarDumper\Caster\CutStub;
use Symfony\Component\VarDumper\Cloner\Data;
use Symfony\Component\VarDumper\Cloner\Stub;
use Symfony\Component\VarDumper\Cloner\VarCloner;
use Symfony\Component\VarDumper\Dumper\AbstractDumper;
use Symfony\Component\VarDumper\Dumper\CliDumper;
Expand Down Expand Up @@ -549,6 +551,44 @@ public function testDumpArrayWithColor($value, $flags, $expectedOut)
$this->assertSame($expectedOut, $out);
}

public function testCollapse()
{
$stub = new Stub();
$stub->type = Stub::TYPE_OBJECT;
$stub->class = 'stdClass';
$stub->position = 1;

$data = new Data([
[
$stub,
],
[
"\0~collapse=1\0foo" => 123,
"\0+\0bar" => [1 => 2],
],
[
'bar' => 123,
]
]);

$dumper = new CliDumper();
$dump = $dumper->dump($data, true);

$this->assertSame(
<<<'EOTXT'
{
foo: 123
+"bar": array:1 [
"bar" => 123
]
}

EOTXT
,
$dump
);
}

private function getSpecialVars()
{
foreach (array_keys($GLOBALS) as $var) {
Expand Down