feat: Bump psr/log to v2+

Author: pepamartinec

composer.json

@@ -29,12 +29,13 @@
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3|^7.2",
         "myclabs/php-enum": "^1.8",
-        "psr/log": "^1.1",
+        "psr/log": "^2|^3",
         "symfony/validator": "^5.2|^6.0"
     },
     "require-dev": {
         "infection/infection": "^0.26",
         "keboola/coding-standard": ">=14.0",
+        "monolog/monolog": "^3.9",
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-phpunit": "^1.1",
         "phpunit/phpunit": "^9.5",

tests/ClientFactoryTest.php

@@ -13,8 +13,9 @@
 use Keboola\NotificationClient\EventsClient;
 use Keboola\NotificationClient\NotificationsClient;
 use Keboola\NotificationClient\SubscriptionClient;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\Test\TestLogger;
 
 class ClientFactoryTest extends TestCase
 {
@@ -55,7 +56,9 @@ public function testGetClient(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
 
         $clientFactory = new ClientFactory(
             'https://dummy',
@@ -77,8 +80,8 @@ public function testGetClient(): void
         /** @var Request $request */
         $request = $requestHistory[0]['request'];
         self::assertSame('test agent', $request->getHeader('User-Agent')[0]);
-        self::assertTrue($logger->hasDebugThatContains('"GET  /1.1" 200 '));
-        self::assertTrue($logger->hasDebugThatContains('test agent'));
+        self::assertTrue($logsHandler->hasDebugThatContains('"GET  /1.1" 200 '));
+        self::assertTrue($logsHandler->hasDebugThatContains('test agent'));
     }
 
     public function testGetClientLazy(): void
@@ -94,7 +97,9 @@ public function testGetClientLazy(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
 
         $clientFactory = new ClientFactory(
             'https://dummy',

tests/ClientTest.php

@@ -15,9 +15,10 @@
 use Keboola\NotificationClient\Requests\Event;
 use Keboola\NotificationClient\Requests\PostEvent\JobData;
 use Keboola\NotificationClient\Requests\PostEvent\JobFailedEventData;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
-use Psr\Log\Test\TestLogger;
 
 class ClientTest extends TestCase
 {
@@ -182,7 +183,10 @@ public function testLogger(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             [
                 'handler' => $stack,
@@ -195,8 +199,8 @@ public function testLogger(): void
         /** @var Request $request */
         $request = $requestHistory[0]['request'];
         self::assertSame('test agent', $request->getHeader('User-Agent')[0]);
-        self::assertTrue($logger->hasDebugThatContains('"POST  /1.1" 200 '));
-        self::assertTrue($logger->hasDebugThatContains('test agent'));
+        self::assertTrue($logsHandler->hasDebugThatContains('"POST  /1.1" 200 '));
+        self::assertTrue($logsHandler->hasDebugThatContains('test agent'));
     }
 
     public function testRetrySuccess(): void
@@ -234,7 +238,10 @@ public function testRetrySuccess(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             [
                 'handler' => $stack,
@@ -252,7 +259,7 @@ public function testRetrySuccess(): void
         self::assertSame('https://example.com/events/job-failed', $request->getUri()->__toString());
         $request = $requestHistory[2]['request'];
         self::assertSame('https://example.com/events/job-failed', $request->getUri()->__toString());
-        self::assertTrue($logger->hasNoticeThatContains('retrying'));
+        self::assertTrue($logsHandler->hasNoticeThatContains('retrying'));
     }
 
     public function testRetryFailure(): void
@@ -271,7 +278,10 @@ public function testRetryFailure(): void
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = $this->getClient(
             ['handler' => $stack, 'backoffMaxTries' => 1, 'userAgent' => 'Test', 'logger' => $logger],
         );
@@ -282,7 +292,7 @@ public function testRetryFailure(): void
             self::assertStringContainsString('500 Internal Server Error', $e->getMessage());
         }
         self::assertCount(2, $requestHistory);
-        self::assertTrue($logger->hasNoticeThatContains('We have tried this 1 times. Giving up.'));
+        self::assertTrue($logsHandler->hasNoticeThatContains('We have tried this 1 times. Giving up.'));
     }
 
     public function testNoRetry(): void

tests/StorageApiIndexClientTest.php

@@ -11,13 +11,10 @@
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use Keboola\NotificationClient\Exception\ClientException;
-use Keboola\NotificationClient\Requests\PostSubscription\EmailRecipient;
-use Keboola\NotificationClient\Requests\PostSubscription\Filter;
-use Keboola\NotificationClient\Requests\Subscription;
 use Keboola\NotificationClient\StorageApiIndexClient;
-use Keboola\NotificationClient\SubscriptionClient;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\Test\TestLogger;
 
 class StorageApiIndexClientTest extends TestCase
 {
@@ -49,7 +46,10 @@ public function testInvalidResponse(string $responseData, string $expectedError)
         $history = Middleware::history($requestHistory);
         $stack = HandlerStack::create($mock);
         $stack->push($history);
-        $logger = new TestLogger();
+
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
         $client = new StorageApiIndexClient(
             'https://dummy',
             ['handler' => $stack, 'logger' => $logger, 'backoffMaxTries' => 3, 'userAgent' => 'Test'],