Skip to content

Commit 16a29dd

Browse files
Merge branch '4.4' into 5.4
* 4.4: CS fixes 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 c116cda + 7771a74 commit 16a29dd

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

BufferingLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __destruct()
5353
foreach ($this->logs as [$level, $message, $context]) {
5454
if (false !== strpos($message, '{')) {
5555
foreach ($context as $key => $val) {
56-
if (null === $val || is_scalar($val) || (\is_object($val) && \is_callable([$val, '__toString']))) {
56+
if (null === $val || \is_scalar($val) || (\is_object($val) && \is_callable([$val, '__toString']))) {
5757
$message = str_replace("{{$key}}", $val, $message);
5858
} elseif ($val instanceof \DateTimeInterface) {
5959
$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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function __construct($debug = false, string $charset = null, $fileLinkFor
5858
}
5959

6060
$this->debug = $debug;
61-
$this->charset = $charset ?: (ini_get('default_charset') ?: 'UTF-8');
62-
$this->fileLinkFormat = $fileLinkFormat ?: (ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'));
61+
$this->charset = $charset ?: (\ini_get('default_charset') ?: 'UTF-8');
62+
$this->fileLinkFormat = $fileLinkFormat ?: (\ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'));
6363
$this->projectDir = $projectDir;
6464
$this->outputBuffer = $outputBuffer;
6565
$this->logger = $logger;
@@ -323,7 +323,7 @@ private function formatLogMessage(string $message, array $context)
323323
if ($context && false !== strpos($message, '{')) {
324324
$replacements = [];
325325
foreach ($context as $key => $val) {
326-
if (is_scalar($val)) {
326+
if (\is_scalar($val)) {
327327
$replacements['{'.$key.'}'] = $val;
328328
}
329329
}

Tests/ErrorHandlerTest.php

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

662662
public function testAssertQuietEval()
663663
{
664-
if ('-1' === ini_get('zend.assertions')) {
664+
if ('-1' === \ini_get('zend.assertions')) {
665665
$this->markTestSkipped('zend.assertions is forcibly disabled');
666666
}
667667

0 commit comments

Comments
 (0)