From fa5d07f86f3db79e32a2623207858bfb92cd7812 Mon Sep 17 00:00:00 2001 From: Sam-Burns Date: Sat, 1 Apr 2017 21:52:18 +0100 Subject: [PATCH 1/3] Skipping DateTime microsecond test in PHP 7.1.3, because of https://bugs.php.net/bug.php?id=74258 --- tests/Monolog/LoggerTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php index e167cc6c..3d88b2fc 100644 --- a/tests/Monolog/LoggerTest.php +++ b/tests/Monolog/LoggerTest.php @@ -553,6 +553,10 @@ class LoggerTest extends \PHPUnit_Framework_TestCase */ public function testUseMicrosecondTimestamps($micro, $assert, $assertFormat) { + if (PHP_VERSION_ID === 70103) { + $this->markTestSkipped(); + } + $logger = new Logger('foo'); $logger->useMicrosecondTimestamps($micro); $handler = new TestHandler; From ed6f071284a68da3f8aee741877025c5293a2f28 Mon Sep 17 00:00:00 2001 From: Sam-Burns Date: Sat, 1 Apr 2017 22:05:07 +0100 Subject: [PATCH 2/3] Allowing PHP 'nightly' build to fail, because it is seg faulting while running Composer --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0d2a2512..dbb2084a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ matrix: - php: 7.1 - php: nightly fast_finish: true + allow_failures: + - php: nightly before_script: - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini From e5ff7eb0746c50d483fc9797f1f288acd8cbb5fc Mon Sep 17 00:00:00 2001 From: Lesnykh Ilia Date: Mon, 8 May 2017 12:13:42 +0300 Subject: [PATCH 3/3] Use coalesce operator (#982) * Use coalesce operator * Use coalesce operator * Use coalesce operator * Use coalesce operator --- src/Monolog/ErrorHandler.php | 2 +- src/Monolog/Handler/ChromePHPHandler.php | 2 +- src/Monolog/Handler/PHPConsoleHandler.php | 8 ++++---- src/Monolog/Processor/WebProcessor.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php index 91dd5225..e4f0e83f 100644 --- a/src/Monolog/ErrorHandler.php +++ b/src/Monolog/ErrorHandler.php @@ -175,7 +175,7 @@ class ErrorHandler // fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) { - $level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : LogLevel::CRITICAL; + $level = $this->errorLevelMap[$code] ?? LogLevel::CRITICAL; $this->logger->log($level, self::codeToString($code).': '.$message, ['code' => $code, 'message' => $message, 'file' => $file, 'line' => $line]); } diff --git a/src/Monolog/Handler/ChromePHPHandler.php b/src/Monolog/Handler/ChromePHPHandler.php index 5dc5d5c0..c66bbc20 100644 --- a/src/Monolog/Handler/ChromePHPHandler.php +++ b/src/Monolog/Handler/ChromePHPHandler.php @@ -132,7 +132,7 @@ class ChromePHPHandler extends AbstractProcessingHandler return; } - self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; + self::$json['request_uri'] = $_SERVER['REQUEST_URI'] ?? ''; } $json = @json_encode(self::$json); diff --git a/src/Monolog/Handler/PHPConsoleHandler.php b/src/Monolog/Handler/PHPConsoleHandler.php index 71ffbe59..fad0b9ae 100644 --- a/src/Monolog/Handler/PHPConsoleHandler.php +++ b/src/Monolog/Handler/PHPConsoleHandler.php @@ -203,10 +203,10 @@ class PHPConsoleHandler extends AbstractProcessingHandler $context = $record['context']; $this->connector->getErrorsDispatcher()->dispatchError( - isset($context['code']) ? $context['code'] : null, - isset($context['message']) ? $context['message'] : $record['message'], - isset($context['file']) ? $context['file'] : null, - isset($context['line']) ? $context['line'] : null, + $context['code'] ?? null, + $context['message'] ?? $record['message'], + $context['file'] ?? null, + $context['line'] ?? null, $this->options['classesPartialsTraceIgnore'] ); } diff --git a/src/Monolog/Processor/WebProcessor.php b/src/Monolog/Processor/WebProcessor.php index 2e7134fb..37324af4 100644 --- a/src/Monolog/Processor/WebProcessor.php +++ b/src/Monolog/Processor/WebProcessor.php @@ -88,7 +88,7 @@ class WebProcessor private function appendExtraFields(array $extra): array { foreach ($this->extraFields as $extraName => $serverName) { - $extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null; + $extra[$extraName] = $this->serverData[$serverName] ?? null; } if (isset($this->serverData['UNIQUE_ID'])) {