8000 bug #24735 [VarDumper] fix trailling comma when dumping an exception … · symfony/symfony@3bc7b3a · GitHub
[go: up one dir, main page]
Skip to content

Commit 3bc7b3a

Browse files
nicolas-grekasnicolas-grekas
committed
bug #24735 [VarDumper] fix trailling comma when dumping an exception (Simperfit)
This PR was merged into the 3.3 branch. Discussion ---------- [VarDumper] fix trailling comma when dumping an exception | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yesish | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24581 | License | MIT | Doc PR | O This PR is fixing a behaviour when a exception got every single line with a comma. Commits ------- fc3fe7f [VarDumper] fix trailling comma when dumping an exception
2 parents 3b54b3d + fc3fe7f commit 3bc7b3a

File tree

2 files changed

+37
-4
lines changed

2 files changed

+37
-4
lines changed

‎src/Symfony/Component/VarDumper/Dumper/CliDumper.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\VarDumper\Dumper;
1313

1414
use Symfony\Component\VarDumper\Cloner\Cursor;
15+
use Symfony\Component\VarDumper\Cloner\Stub;
1516

1617
/**
1718
* CliDumper dumps variables for command line output.
@@ -494,10 +495,12 @@ protected function dumpLine($depth, $endOfValue = false)
494495

495496
protected function endValue(Cursor $cursor)
496497
{
497-
if (self::DUMP_TRAILING_COMMA & $this->flags && 0 < $cursor->depth) {
498-
$this->line .= ',';
499-
} elseif (self::DUMP_COMMA_SEPARATOR & $this->flags && 1 < $cursor->hashLength - $cursor->hashIndex) {
500-
$this->line .= ',';
498+
if (Stub::ARRAY_INDEXED === $cursor->hashType || Stub::ARRAY_ASSOC === $cursor->hashType) {
499+
if (self::DUMP_TRAILING_COMMA & $this->flags && 0 < $cursor->depth) {
500+
$this->line .= ',';
501+
} elseif (self::DUMP_COMMA_SEPARATOR & $this->flags && 1 < $cursor->hashLength - $cursor->hashIndex) {
502+
$this->line .= ',';
503+
}
501504
}
502505

503506
$this->dumpLine($cursor->depth, true);

‎src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,36 @@ public function testDumpWithCommaFlag($expected, $flags)
130130
$this->assertSame($expected, $dump);
131131
}
132132

133+
public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
134+
{
135+
$dumper = new CliDumper(null, null, CliDumper::DUMP_TRAILING_COMMA);
136+
$dumper->setColors(false);
137+
$cloner = new VarCloner();
138+
139+
$ex = new \RuntimeException('foo');
140+
141+
$dump = $dumper->dump($cloner->cloneVar($ex)->withRefHandles(false), true);
142+
143+
$this->assertStringMatchesFormat(<<<'EOTXT'
144+
RuntimeException {
145+
#message: "foo"
146+
#code: 0
147+
#file: "%ACliDumperTest.php"
148+
#line: %d
149+
trace: {
150+
%ACliDumperTest.php:%d: {
151+
:
152+
: $ex = new \RuntimeException('foo');
153+
:
154+
}
155+
%A
156+
}
157+
}
158+
159+
EOTXT
160+
, $dump);
161+
}
162+
133163
public function provideDumpWithCommaFlagTests()
134164
{
135165
$expected = <<<'EOTXT'

0 commit comments

Comments
 (0)
0