Skip to content

Commit d2f1d49

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [ErrorHandler] Return false directly and remove unused variable [OptionsResolver] Assert that the error type is valid in deprecations test [HttpClient] Allow bearer token with colon [Form] Fix custom formats deprecation with HTML5 widgets [Translator] Optional Intl dependency [Contracts][Translation] Optional Intl dependency [ErrorHandler] Escape JSON encoded log context update missing translations arabic [Yaml] simplify the test fix test by letting mock throw the actual expected exception
2 parents 4006c23 + 5a6feca commit d2f1d49

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ErrorHandler.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,8 @@ public function handleError(int $type, string $message, string $file, int $line)
425425
}
426426

427427
if (!$type || (!$log && !$throw)) {
428-
return !$silenced && $type && $log;
428+
return false;
429429
}
430-
$scope = $this->scopedErrors & $type;
431430

432431
if (false !== strpos($message, "@anonymous\0")) {
433432
$logMessage = $this->parseAnonymousClass($message);

Resources/views/logs.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<td>
3636
<?= $this->formatLogMessage($log['message'], $log['context']); ?>
3737
<?php if ($log['context']) { ?>
38-
<pre class="text-muted prewrap m-t-5"><?= json_encode($log['context'], \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES); ?></pre>
38+
<pre class="text-muted prewrap m-t-5"><?= $this->escape(json_encode($log['context'], \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES)); ?></pre>
3939
<?php } ?>
4040
</td>
4141
</tr>

0 commit comments

Comments
 (0)