8000 Merge branch 'ErrorHandler/ImproveFileLinkFormat' of github.com:nlemo… · symfony/symfony@47e3e57 · GitHub
[go: up one dir, main page]

Skip to content

Commit 47e3e57

Browse files
committed
Merge branch 'ErrorHandler/ImproveFileLinkFormat' of github.com:nlemoine/symfony into ErrorHandler/ImproveFileLinkFormat
2 parents e79903d + 2a3893f commit 47e3e57

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ public function __construct(bool|callable $debug = false, string $charset = null
5252
{
5353
$this->debug = \is_bool($debug) ? $debug : $debug(...);
5454
$this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
55-
$this->fileLinkFormat = \is_string($fileLinkFormat) ? new FileLinkFormatter($fileLinkFormat) : ($fileLinkFormat ?: false);
56-
if (false === $this->fileLinkFormat) {
57-
$this->fileLinkFormat = new FileLinkFormatter();
58-
}
55+
$this->fileLinkFormat = $fileLinkFormat instanceof FileLinkFormatter ? $fileLinkFormat : new FileLinkFormatter($fileLinkFormat);
5956
$this->projectDir = $projectDir;
6057
$this->outputBuffer = \is_string($outputBuffer) ? $outputBuffer : $outputBuffer(...);
6158
$this->logger = $logger;

0 commit comments

Comments
 (0)
0