Skip to content

Commit 72f4dea

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [Serializer] Fix variadic support when using type hints [VarDumper] Backport handler lock when using VAR_DUMPER_FORMAT
2 parents 1d1c0bf + a3d083f commit 72f4dea

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

DataCollector/DumpDataCollector.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,7 @@ public function __destruct()
230230
--$i;
231231
}
232232

233-
if (isset($_SERVER['VAR_DUMPER_FORMAT'])) {
234-
$html = 'html' === $_SERVER['VAR_DUMPER_FORMAT'];
235-
} else {
236-
$html = !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && stripos($h[$i], 'html');
237-
}
238-
239-
if ($html) {
233+
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && stripos($h[$i], 'html')) {
240234
$dumper = new HtmlDumper('php://output', $this->charset);
241235
$dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
242236
} else {

0 commit comments

Comments
 (0)