diff options
| author | Lesnykh Ilia <Aliance@users.noreply.github.com> | 2017-05-08 12:13:42 +0300 |
|---|---|---|
| committer | Jordi Boggiano <j.boggiano@seld.be> | 2017-05-08 11:13:42 +0200 |
| commit | e5ff7eb0746c50d483fc9797f1f288acd8cbb5fc (patch) | |
| tree | 9ef7158be2468a74b93100ad45eab5757ea5f466 | |
| parent | 35c84c5b6f79cb36f17b1cc2d7c0a4e490729614 (diff) | |
| download | monolog-e5ff7eb0746c50d483fc9797f1f288acd8cbb5fc.zip monolog-e5ff7eb0746c50d483fc9797f1f288acd8cbb5fc.tar.gz monolog-e5ff7eb0746c50d483fc9797f1f288acd8cbb5fc.tar.bz2 | |
Use coalesce operator (#982)
* Use coalesce operator
* Use coalesce operator
* Use coalesce operator
* Use coalesce operator
| -rw-r--r-- | src/Monolog/ErrorHandler.php | 2 | ||||
| -rw-r--r-- | src/Monolog/Handler/ChromePHPHandler.php | 2 | ||||
| -rw-r--r-- | src/Monolog/Handler/PHPConsoleHandler.php | 8 | ||||
| -rw-r--r-- | 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 91dd522..e4f0e83 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 5dc5d5c..c66bbc2 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 71ffbe5..fad0b9a 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 2e7134f..37324af 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'])) { |