Merge branch '5.4' into 6.3

* 5.4: [VarDumper] Fix managing collapse state in CliDumper
symfony · Aug 24, 2023 · 2027be1 · 2027be1
2 parents 77fb4f2 + 684b36f
commit 2027be1
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -134,6 +134,7 @@ public function setDisplayOptions(array $displayOptions)
     public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value)
     {
         $this->dumpKey($cursor);
+        $this->collapseNextHash = $this->expandNextHash = false;
 
         $style = 'const';
         $attr = $cursor->attr;
@@ -197,6 +198,7 @@ public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|n
     public function dumpString(Cursor $cursor, string $str, bool $bin, int $cut)
     {
         $this->dumpKey($cursor);
+        $this->collapseNextHash = $this->expandNextHash = false;
         $attr = $cursor->attr;
 
         if ($bin) {
@@ -290,6 +292,7 @@ public function enterHash(Cursor $cursor, int $type, string|int|null $class, boo
         $this->colors ??= $this->supportsColors();
 
         $this->dumpKey($cursor);
+        $this->expandNextHash = false;
         $attr = $cursor->attr;
 
         if ($this->collapseNextHash) {

diff --git a/Tests/Caster/MysqliCasterTest.php b/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/Tests/Dumper/CliDumperTest.php b/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;
@@ -455,4 +457,42 @@ 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
+        );
+    }
 }