Skip to content

Commit 4ba09bd

Browse files
Merge branch '6.0' into 6.1
* 6.0: CS fixes Bump Symfony version to 6.0.11 Update VERSION for 6.0.10 Update CHANGELOG for 6.0.10 Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents d02c662 + b6ae24f commit 4ba09bd

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

BufferingLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __destruct()
5050
foreach ($this->logs as [$level, $message, $context]) {
5151
if (str_contains($message, '{')) {
5252
foreach ($context as $key => $val) {
53-
if (null === $val || is_scalar($val) || (\is_object($val) && \is_callable([$val, '__toString']))) {
53+
if (null === $val || \is_scalar($val) || (\is_object($val) && \is_callable([$val, '__toString']))) {
5454
$message = str_replace("{{$key}}", $val, $message);
5555
} elseif ($val instanceof \DateTimeInterface) {
5656
$message = str_replace("{{$key}}", $val->format(\DateTime::RFC3339), $message);

Debug.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static function enable(): ErrorHandler
2424

2525
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
2626
ini_set('display_errors', 0);
27-
} elseif (!filter_var(ini_get('log_errors'), \FILTER_VALIDATE_BOOLEAN) || ini_get('error_log')) {
27+
} elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOLEAN) || \ini_get('error_log')) {
2828
// CLI - display errors only if they're not already logged to STDERR
2929
ini_set('display_errors', 1);
3030
}

ErrorRenderer/HtmlErrorRenderer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ class HtmlErrorRenderer implements ErrorRendererInterface
4949
public function __construct(bool|callable $debug = false, string $charset = null, string|FileLinkFormatter $fileLinkFormat = null, string $projectDir = null, string|callable $outputBuffer = '', LoggerInterface $logger = null)
5050
{
5151
$this->debug = \is_bool($debug) ? $debug : $debug(...);
52-
$this->charset = $charset ?: (ini_get('default_charset') ?: 'UTF-8');
52+
$this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
5353
$fileLinkFormat ??= $_SERVER['SYMFONY_IDE'] ?? null;
54-
$this->fileLinkFormat = is_string($fileLinkFormat)
54+
$this->fileLinkFormat = \is_string($fileLinkFormat)
5555
? (ErrorRendererInterface::IDE_LINK_FORMATS[$fileLinkFormat] ?? $fileLinkFormat ?: false)
56-
: ($fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false);
56+
: ($fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: false);
5757
$this->projectDir = $projectDir;
5858
$this->outputBuffer = \is_string($outputBuffer) ? $outputBuffer : $outputBuffer(...);
5959
$this->logger = $logger;
@@ -309,7 +309,7 @@ private function formatLogMessage(string $message, array $context)
309309
if ($context && str_contains($message, '{')) {
310310
$replacements = [];
311311
foreach ($context as $key => $val) {
312-
if (is_scalar($val)) {
312+
if (\is_scalar($val)) {
313313
$replacements['{'.$key.'}'] = $val;
314314
}
315315
}

Tests/ErrorHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public function errorHandlerWhenLoggingProvider(): iterable
615615

616616
public function testAssertQuietEval()
617617
{
618-
if ('-1' === ini_get('zend.assertions')) {
618+
if ('-1' === \ini_get('zend.assertions')) {
619619
$this->markTestSkipped('zend.assertions is forcibly disabled');
620620
}
621621

0 commit comments

Comments
 (0)