[VarDumper][DebugBundle] Fix dump labels compatibility

fancyweb · fancyweb · commit 05d5dca3f70d · 2023-05-16T18:38:59.000+02:00
diff --git a/src/Symfony/Bundle/DebugBundle/DebugBundle.php b/src/Symfony/Bundle/DebugBundle/DebugBundle.php
@@ -35,14 +35,19 @@ public function boot()
             // The dump data collector is used by default, so dump output is sent to
             // the WDT. In a CLI context, if dump is used too soon, the data collector
             // will buffer it, and release it at the end of the script.
-            VarDumper::setHandler(function ($var) use ($container) {
+            VarDumper::setHandler(function ($var, string $label = null) use ($container) {
                 $dumper = $container->get('data_collector.dump');
                 $cloner = $container->get('var_dumper.cloner');
-                $handler = function ($var) use ($dumper, $cloner) {
-                    $dumper->dump($cloner->cloneVar($var));
+                $handler = function ($var, string $label = null) use ($dumper, $cloner) {
+                    $var = $cloner->cloneVar($var);
+                    if (null !== $label) {
+                        $var = $var->withContext(['label' => $label]);
+                    }
+
+                    $dumper->dump($var);
                 };
                 VarDumper::setHandler($handler);
-                $handler($var);
+                $handler($var, $label);
             });
         }
     }
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -278,6 +278,10 @@ public function dump(DumperInterface $dumper)
             $cursor->attr = ['if_links' => true];
             $dumper->dumpScalar($cursor, 'default', ' ');
             $cursor->hashType = 0;
+        } elseif ('' !== $label) {
+            $cursor->hashType = -1;
+            $dumper->dumpScalar($cursor, 'default', $label.'^ ');
+            $cursor->hashType = 0;
         }
 
         $this->dumpItem($dumper, $cursor, $refs, $this->data[$this->position][$this->key]);
