Skip to content

Commit c1ad0e4

Browse files
committed
[VarDumper] Add VAR_DUMPER_FORMAT=server format
1 parent 7c90c8b commit c1ad0e4

File tree

3 files changed

+80
-13
lines changed

3 files changed

+80
-13
lines changed

src/Symfony/Component/VarDumper/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ CHANGELOG
55
-----
66

77
* added `RdKafka` support
8+
* added `VAR_DUMPER_FORMAT=server` support
9+
* register & lock the handler to use as soon as the `VAR_DUMPER_FORMAT` env var is set
810

911
4.4.0
1012
-----

src/Symfony/Component/VarDumper/Resources/functions/dump.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
use Symfony\Component\VarDumper\VarDumper;
1313

14+
// Register & lock the handler with expected format as soon as the env var was set:
15+
if (isset($_SERVER['VAR_DUMPER_FORMAT'])) {
16+
VarDumper::register(true);
17+
}
18+
1419
if (!function_exists('dump')) {
1520
/**
1621
* @author Nicolas Grekas <p@tchwork.com>

src/Symfony/Component/VarDumper/VarDumper.php

Lines changed: 73 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@
1111

1212
namespace Symfony\Component\VarDumper;
1313

14+
use Symfony\Component\HttpFoundation\Request;
15+
use Symfony\Component\HttpFoundation\RequestStack;
16+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1417
use Symfony\Component\VarDumper\Caster\ReflectionCaster;
1518
use Symfony\Component\VarDumper\Cloner\VarCloner;
1619
use Symfony\Component\VarDumper\Dumper\CliDumper;
20+
use Symfony\Component\VarDumper\Dumper\ContextProvider\CliContextProvider;
21+
use Symfony\Component\VarDumper\Dumper\ContextProvider\RequestContextProvider;
1722
use Symfony\Component\VarDumper\Dumper\ContextProvider\SourceContextProvider;
1823
use Symfony\Component\VarDumper\Dumper\ContextualizedDumper;
24+
use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
1925
use Symfony\Component\VarDumper\Dumper\HtmlDumper;
26+
use Symfony\Component\VarDumper\Dumper\ServerDumper;
2027

2128
// Load the global dump() function
2229
require_once __DIR__.'/Resources/functions/dump.php';
@@ -27,34 +34,87 @@
2734
class VarDumper
2835
{
2936
private static $handler;
37+
private static $locked = false;
3038

31-
public static function dump($var)
39+
/**
40+
* @final
41+
*
42+
* @param bool $lock lock the registered handler so it cannot be replaced
43+
*/
44+
public static function register(bool $lock = false): void
3245
{
33-
if (null === self::$handler) {
34-
$cloner = new VarCloner();
35-
$cloner->addCasters(ReflectionCaster::UNSET_CLOSURE_FILE_INFO);
46+
self::$locked = $lock;
47+
$cloner = new VarCloner();
48+
$cloner->addCasters(ReflectionCaster::UNSET_CLOSURE_FILE_INFO);
49+
50+
switch ($_SERVER['VAR_DUMPER_FORMAT'] ?? null) {
51+
case 'html':
52+
$dumper = new HtmlDumper();
53+
break;
54+
case 'cli':
55+
$dumper = new CliDumper();
56+
break;
57+
case 'server':
58+
$host = $_SERVER['VAR_DUMPER_SERVER'] ?? '127.0.0.1:9912';
59+
$dumper = new ServerDumper($host, self::getDefaultDumper(), self::getDefaultContextProviders());
60+
break;
61+
default:
62+
$dumper = self::getDefaultDumper();
63+
}
3664

37-
if (isset($_SERVER['VAR_DUMPER_FORMAT'])) {
38-
$dumper = 'html' === $_SERVER['VAR_DUMPER_FORMAT'] ? new HtmlDumper() : new CliDumper();
39-
} else {
40-
$dumper = \in_array(\PHP_SAPI, ['cli', 'phpdbg']) ? new CliDumper() : new HtmlDumper();
41-
}
65+
$dumper = !$dumper instanceof ServerDumper ? new ContextualizedDumper($dumper, [new SourceContextProvider()]) : $dumper;
4266

43-
$dumper = new ContextualizedDumper($dumper, [new SourceContextProvider()]);
67+
self::$handler = function ($var) use ($cloner, $dumper) {
68+
$dumper->dump($cloner->cloneVar($var));
69+
};
70+
}
4471

45-
self::$handler = function ($var) use ($cloner, $dumper) {
46-
$dumper->dump($cloner->cloneVar($var));
47-
};
72+
public static function dump($var)
73+
{
74+
if (null === self::$handler) {
75+
self::register();
4876
}
4977

5078
return (self::$handler)($var);
5179
}
5280

5381
public static function setHandler(callable $callable = null)
5482
{
83+
$lock = \func_num_args() > 1 ? func_get_arg(1) : false;
5584
$prevHandler = self::$handler;
85+
86+
if (self::$locked) {
87+
return $prevHandler;
88+
}
89+
if ($lock) {
90+
self::$locked = true;
91+
}
92+
5693
self::$handler = $callable;
5794

5895
return $prevHandler;
5996
}
97+
98+
private static function getDefaultDumper(): DataDumperInterface
99+
{
100+
return \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliDumper() : new HtmlDumper();
101+
}
102+
103+
private static function getDefaultContextProviders(): array
104+
{
105+
$contextProviders = [];
106+
107+
if ('cli' !== \PHP_SAPI && (class_exists(Request::class))) {
108+
$requestStack = new RequestStack();
109+
$requestStack->push(Request::createFromGlobals());
110+
$contextProviders['request'] = new RequestContextProvider($requestStack);
111+
}
112+
113+
$fileLinkFormatter = class_exists(FileLinkFormatter::class) ? new FileLinkFormatter(null, $requestStack ?? null) : null;
114+
115+
return $contextProviders + [
116+
'cli' => new CliContextProvider(),
117+
'source' => new SourceContextProvider(null, null, $fileLinkFormatter),
118+
];
119+
}
60120
}

0 commit comments

Comments
 (0)