mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-07 13:46:38 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Benjamin Pentzold
2017-05-22 12:00:08 +02:00
parent 26c7de1e51 e5ff7eb074
commit 1c48ebbf90
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -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

2
src/Monolog/ErrorHandler.php
View File

@@ -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]);
}

2
src/Monolog/Handler/ChromePHPHandler.php
View File

@@ -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);

8
src/Monolog/Handler/PHPConsoleHandler.php
View File

@@ -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']
);
}

2
src/Monolog/Processor/WebProcessor.php
View File

@@ -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'])) {

4
tests/Monolog/LoggerTest.php
View File

@@ -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;