[VarDumper] Fix managing collapse state in CliDumper

nicolas-grekas · nicolas-grekas · commit 128b6d2d97d4 · 2023-08-24T15:06:19.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -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;
@@ -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) {
@@ -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) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/MysqliCasterTest.php
@@ -30,7 +30,6 @@ public function testNotConnected()
 
         $xCast = <<<EODUMP
 mysqli_driver {%A
-  +reconnect: false
   +report_mode: 3
 }
 EODUMP;

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ public function setDisplayOptions(array $displayOptions)`
`128`	`128`	`public function dumpScalar(Cursor $cursor, string $type, $value)`
`129`	`129`	`{`
`130`	`130`	`$this->dumpKey($cursor);`
	`131`	`+ $this->collapseNextHash = $this->expandNextHash = false;`
`131`	`132`
`132`	`133`	`$style = 'const';`
`133`	`134`	`$attr = $cursor->attr;`
`@@ -191,6 +192,7 @@ public function dumpScalar(Cursor $cursor, string $type, $value)`
`191`	`192`	`public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)`
`192`	`193`	`{`
`193`	`194`	`$this->dumpKey($cursor);`
	`195`	`+ $this->collapseNextHash = $this->expandNextHash = false;`
`194`	`196`	`$attr = $cursor->attr;`
`195`	`197`
`196`	`198`	`if ($bin) {`
`@@ -286,6 +288,7 @@ public function enterHash(Cursor $cursor, int $type, $class, bool $hasChild)`
`286`	`288`	`}`
`287`	`289`
`288`	`290`	`$this->dumpKey($cursor);`
	`291`	`+ $this->expandNextHash = false`
`289`	`292`	`$attr = $cursor->attr;`
`290`	`293`
`291`	`294`	`if ($this->collapseNextHash) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public function testNotConnected()`
`30`	`30`
`31`	`31`	`$xCast = <<<EODUMP`
`32`	`32`	`mysqli_driver {%A`
`33`		`- +reconnect: false`
`34`	`33`	`+report_mode: 3`
`35`	`34`	`}`
`36`	`35`	`EODUMP;`