Merge branch '6.3' into 6.4

* 6.3:
  Update Pbkdf2PasswordHasher.php
  Bump Symfony version to 6.3.5
  Update VERSION for 6.3.4
  Update CHANGELOG for 6.3.4
  Bump Symfony version to 5.4.29
  Update VERSION for 5.4.28
  Update CONTRIBUTORS for 5.4.28
  Update CHANGELOG for 5.4.28
  Fixed attachment base64 content string in MailerSendApiTransport
  [Security] Prevent creating session in stateless firewalls
  [Serializer] Fix union of enum denormalization
  [Serializer] Fix wrong InvalidArgumentException
  [VarDumper] Fix managing collapse state in CliDumper
  Fix breaking change in AccessTokenAuthenticator

Author: derrabus

Dumper/CliDumper.php

@@ -135,6 +135,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;
@@ -198,6 +199,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) {
@@ -291,6 +293,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) {

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
+        );
+    }
 }