diff options
Diffstat (limited to 'src/Monolog/Handler/RavenHandler.php')
| -rw-r--r-- | src/Monolog/Handler/RavenHandler.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php index 53a8b39..1c8e718 100644 --- a/src/Monolog/Handler/RavenHandler.php +++ b/src/Monolog/Handler/RavenHandler.php @@ -1,4 +1,4 @@ -<?php +<?php declare(strict_types=1); /* * This file is part of the Monolog package. @@ -27,7 +27,7 @@ class RavenHandler extends AbstractProcessingHandler /** * Translates Monolog log levels to Raven log levels. */ - private $logLevels = array( + private $logLevels = [ Logger::DEBUG => Raven_Client::DEBUG, Logger::INFO => Raven_Client::INFO, Logger::NOTICE => Raven_Client::INFO, @@ -36,7 +36,7 @@ class RavenHandler extends AbstractProcessingHandler Logger::CRITICAL => Raven_Client::FATAL, Logger::ALERT => Raven_Client::FATAL, Logger::EMERGENCY => Raven_Client::FATAL, - ); + ]; /** * @var string should represent the current version of the calling @@ -92,7 +92,7 @@ class RavenHandler extends AbstractProcessingHandler }); // the other ones are added as a context item - $logs = array(); + $logs = []; foreach ($records as $r) { $logs[] = $this->processRecord($r); } @@ -133,10 +133,11 @@ class RavenHandler extends AbstractProcessingHandler */ protected function write(array $record) { + /** @var bool|null|array This is false, unless set below to null or an array of data, when we read the current user context */ $previousUserContext = false; - $options = array(); + $options = []; $options['level'] = $this->logLevels[$record['level']]; - $options['tags'] = array(); + $options['tags'] = []; if (!empty($record['extra']['tags'])) { $options['tags'] = array_merge($options['tags'], $record['extra']['tags']); unset($record['extra']['tags']); @@ -156,7 +157,7 @@ class RavenHandler extends AbstractProcessingHandler $options['logger'] = $record['channel']; } foreach ($this->getExtraParameters() as $key) { - foreach (array('extra', 'context') as $source) { + foreach (['extra', 'context'] as $source) { if (!empty($record[$source][$key])) { $options[$key] = $record[$source][$key]; unset($record[$source][$key]); @@ -179,14 +180,15 @@ class RavenHandler extends AbstractProcessingHandler $options['release'] = $this->release; } - if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) { + if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) { $options['extra']['message'] = $record['formatted']; $this->ravenClient->captureException($record['context']['exception'], $options); } else { - $this->ravenClient->captureMessage($record['formatted'], array(), $options); + $this->ravenClient->captureMessage($record['formatted'], [], $options); } - if ($previousUserContext !== false) { + // restore the user context if it was modified + if (!is_bool($previousUserContext)) { $this->ravenClient->user_context($previousUserContext); } } @@ -194,7 +196,7 @@ class RavenHandler extends AbstractProcessingHandler /** * {@inheritDoc} */ - protected function getDefaultFormatter() + protected function getDefaultFormatter(): FormatterInterface { return new LineFormatter('[%channel%] %message%'); } @@ -216,11 +218,11 @@ class RavenHandler extends AbstractProcessingHandler */ protected function getExtraParameters() { - return array('checksum', 'release', 'event_id'); + return ['checksum', 'release', 'event_id']; } /** - * @param string $value + * @param string $value * @return self */ public function setRelease($value) |