Skip to content

Commit 9c5b1b2

Browse files
authored
Merge pull request #124 from GoreSakuraba/feature/psr_log_update
allow usage of psr/log v2 and v3
2 parents 9135beb + 49ac5c9 commit 9c5b1b2

File tree

5 files changed

+2
-6
lines changed

5 files changed

+2
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"opentracing/opentracing": "^1.0",
2929
"packaged/thrift": "^0.13",
3030
"psr/cache": "^1.0 || ^2.0",
31-
"psr/log": "^1.0"
31+
"psr/log": "^1.0 || ^2.0 || ^3.0"
3232
},
3333
"require-dev": {
3434
"phpunit/phpunit": "^7 || ^8 || ^9",

src/Jaeger/Reporter/RemoteReporter.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
use Jaeger\Sender\UdpSender;
66
use Jaeger\Span;
7-
use Psr\Log\LoggerInterface;
8-
use Psr\Log\NullLogger;
97

108
class RemoteReporter implements ReporterInterface
119
{

src/Jaeger/ReporterFactory/AbstractReporterFactory.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Jaeger\ReporterFactory;
44

55
use Jaeger\Config;
6-
use Psr\Log\LoggerInterface;
76
use Thrift\Transport\TTransport;
87

98
abstract class AbstractReporterFactory implements ReporterFactoryInterface

src/Jaeger/ReporterFactory/ZipkinReporterFactory.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Jaeger\Sender\UdpSender;
1010
use Jaeger\Thrift\Agent\AgentClient;
1111
use Jaeger\ThriftUdpTransport;
12-
use Psr\Log\LoggerInterface;
1312
use Thrift\Exception\TTransportException;
1413
use Thrift\Protocol\TBinaryProtocol;
1514
use Thrift\Protocol\TCompactProtocol;

tests/Jaeger/Logger/StackLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class StackLogger implements \Psr\Log\LoggerInterface
1111

1212
use LoggerTrait;
1313

14-
public function log($level, $message, array $context = array())
14+
public function log($level, $message, array $context = array()): void
1515
{
1616
$this->messagesStack[] = $message;
1717
}

0 commit comments

Comments
 (0)