bug #51473 [VarDumper] Fix managing collapse state in CliDumper (nicolas-grekas)

fabpot · fabpot · commit 5ab06a1586fd · 2023-08-24T16:47:30.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [VarDumper] Fix managing collapse state in CliDumper | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 452bd0c [VarDumper] Fix managing collapse state in CliDumper
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;
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -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;
@@ -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) {

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;`