Merge pull request #384 from keboola/pepa_PAT-221_updateLogger

feat[output-mapping]: Update to newer Monolog

Author: pepamartinec

composer.json

@@ -36,23 +36,23 @@
         "keboola/storage-api-client": "^15.0|^16.0|^17.0",
         "keboola/storage-api-php-client-branch-wrapper": "^6.0",
         "microsoft/azure-storage-blob": "^1.5",
-        "monolog/monolog": "^1.25.5|^2.0",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/serializer": "^5.4|^6.0",
-        "symfony/yaml": "^5.4|^6.0"
+        "psr/log": "^2.0|^3.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/finder": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "brianium/paratest": "^6.11",
         "keboola/coding-standard": ">=14.0",
         "keboola/php-temp": "^2.0",
+        "monolog/monolog": "^3.0",
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.2",
         "phpunit/phpunit": "^9.5",
-        "psr/log": "^1.1",
         "sempro/phpunit-pretty-print": "^1.4",
-        "symfony/dotenv": "^5.4|^6.0"
+        "symfony/dotenv": "^5.4|^6.0|^7.0"
     },
     "scripts": {
         "pre-autoload-dump": [

tests/Configuration/Table/WebalizerTest.php

@@ -10,10 +10,10 @@
 use Keboola\StorageApiBranch\ClientWrapper;
 use Keboola\StorageApiBranch\Factory\ClientOptions;
 use Monolog\Handler\TestHandler;
+use Monolog\Level;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Util\Test;
-use Psr\Log\Test\TestLogger;
 
 class WebalizerTest extends TestCase
 {
@@ -29,8 +29,10 @@ public function setUp(): void
     /** @dataProvider webalizeDataProvider */
     public function testWebalize(array $config, array $expectedConfig, int $expectsApiCalls): void
     {
+        $logger = new Logger('test');
+
         // test webalized column names
-        $webalizator = new Webalizer($this->clientWrapper->getBranchClient(), new TestLogger(), true);
+        $webalizator = new Webalizer($this->clientWrapper->getBranchClient(), $logger, true);
         $webalizedColumnNames = $webalizator->webalize($config);
         self::assertEquals($expectedConfig, $webalizedColumnNames);
 
@@ -46,7 +48,7 @@ function ($columns) {
                 ),
             );
 
-        $webalizator = new Webalizer($clientMock, new TestLogger(), true);
+        $webalizator = new Webalizer($clientMock, $logger, true);
         self::assertIsArray($webalizator->webalize($config));
     }
 
@@ -56,14 +58,16 @@ public function testLegacyWebalize(array $config, array $expectedConfig): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::never())->method('webalizeColumnNames');
 
-        $webalizator = new Webalizer($clientMock, new TestLogger(), false);
+        $webalizator = new Webalizer($clientMock, new Logger('test'), false);
         self::assertEquals($expectedConfig, $webalizator->webalize($config));
     }
 
     public function testLoggingWebalizedColumnNames(): void
     {
-        $testLogger = new TestLogger();
-        $webalizator = new Webalizer($this->clientWrapper->getBranchClient(), $testLogger, true);
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+
+        $webalizator = new Webalizer($this->clientWrapper->getBranchClient(), $logger, true);
         $webalizator->webalize([
             'columns' => ['ěščřžýáíéúů'],
             'primary_key' => ['éíěčíáčšžášřýšěí'],
@@ -82,26 +86,26 @@ public function testLoggingWebalizedColumnNames(): void
                 ],
             ],
         ]);
-        self::assertCount(4, $testLogger->records);
-        self::assertEquals(Logger::getLevelName(Logger::WARNING), strtoupper($testLogger->records[0]['level']));
-        self::assertEquals(Logger::getLevelName(Logger::WARNING), strtoupper($testLogger->records[1]['level']));
-        self::assertEquals(Logger::getLevelName(Logger::WARNING), strtoupper($testLogger->records[2]['level']));
-        self::assertEquals(Logger::getLevelName(Logger::WARNING), strtoupper($testLogger->records[3]['level']));
-        self::assertEquals(
+        self::assertCount(4, $logsHandler->getRecords());
+        self::assertSame(Level::Warning, $logsHandler->getRecords()[0]->level);
+        self::assertSame(Level::Warning, $logsHandler->getRecords()[1]->level);
+        self::assertSame(Level::Warning, $logsHandler->getRecords()[2]->level);
+        self::assertSame(Level::Warning, $logsHandler->getRecords()[3]->level);
+        self::assertSame(
             'Column name "ěščřžýáíéúů" was webalized to "escrzyaieuu"',
-            $testLogger->records[0]['message'],
+            $logsHandler->getRecords()[0]->message,
         );
-        self::assertEquals(
+        self::assertSame(
             'Column name "éíěčíáčšžášřýšěí" was webalized to "eieciacszasrysei"',
-            $testLogger->records[1]['message'],
+            $logsHandler->getRecords()[1]->message,
         );
-        self::assertEquals(
+        self::assertSame(
             'Column name "webalize | test 😁" was webalized to "webalize_test"',
-            $testLogger->records[2]['message'],
+            $logsHandler->getRecords()[2]->message,
         );
-        self::assertEquals(
+        self::assertSame(
             'Column name "    webalize spaces  " was webalized to "webalize_spaces"',
-            $testLogger->records[3]['message'],
+            $logsHandler->getRecords()[3]->message,
         );
     }
 

tests/Storage/TableDataModifierTest.php

@@ -292,7 +292,7 @@ public function testDeleteTableRowsWithUnexistColumn(): void
 
         $expectedMessage = 'Cannot delete rows ' .
             'from table "in.c-TableDataModifierTest_testDeleteTableRowsWithUnexistColumn.test1" ' .
-            'in Storage: Cannot filter by column "UnexistColumn", column does not exist';
+            'in Storage: Filter validation: Cannot filter by column "UnexistColumn", column does not exist';
 
         $this->expectException(InvalidOutputException::class);
         $this->expectExceptionMessage($expectedMessage);

tests/Writer/Table/SlicerDeciderTest.php

@@ -9,8 +9,9 @@
 use Keboola\OutputMapping\Mapping\MappingFromRawConfigurationAndPhysicalDataWithManifest;
 use Keboola\OutputMapping\Writer\Table\SlicerDecider;
 use Keboola\Temp\Temp;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\Test\TestLogger;
 
 class SlicerDeciderTest extends TestCase
 {
@@ -45,8 +46,8 @@ public function testDecideSliceMultipleFiles(): void
             $mock2,
         ];
 
-        $testLogger = new TestLogger();
-        $slicerDecider = new SlicerDecider($testLogger);
+        $logger = new Logger('test');
+        $slicerDecider = new SlicerDecider($logger);
         $result = $slicerDecider->decideSliceFiles($combinedSources);
 
         $this->assertCount(2, $result);
@@ -64,8 +65,8 @@ public function testDecideSliceEmptyFile(): void
             $mock1,
         ];
 
-        $testLogger = new TestLogger();
-        $slicerDecider = new SlicerDecider($testLogger);
+        $logger = new Logger('test');
+        $slicerDecider = new SlicerDecider($logger);
         $result = $slicerDecider->decideSliceFiles($combinedSources);
 
         $this->assertCount(0, $result);
@@ -84,7 +85,7 @@ public function testDecideSliceTwoSameFiles(): void
             $mock1,
         ];
 
-        $testLogger = new TestLogger();
+        $testLogger = new Logger('test');
         $slicerDecider = new SlicerDecider($testLogger);
 
         $this->expectException(InvalidOutputException::class);
@@ -105,13 +106,14 @@ public function testDecideSliceSlicedFilesWithoutManifest(): void
             $mock1,
         ];
 
-        $testLogger = new TestLogger();
-        $slicerDecider = new SlicerDecider($testLogger);
+        $logsHandler = new TestHandler();
+        $logger = new Logger('test', [$logsHandler]);
+        $slicerDecider = new SlicerDecider($logger);
 
         $result = $slicerDecider->decideSliceFiles($combinedSources);
 
         self::assertCount(0, $result);
-        self::assertTrue($testLogger->hasWarningThatContains(
+        self::assertTrue($logsHandler->hasWarningThatContains(
             'Sliced files without manifest are not supported. Skipping file "file1"',
         ));
     }
@@ -130,8 +132,8 @@ public function testDecideFileWithUnsuportedConfigurationMapping(): void
             $mock1,
         ];
 
-        $testLogger = new TestLogger();
-        $slicerDecider = new SlicerDecider($testLogger);
+        $logger = new Logger('test');
+        $slicerDecider = new SlicerDecider($logger);
 
         $this->expectException(InvalidOutputException::class);
         $this->expectExceptionMessage(