feat: Allow Symfony 7.*, use psr/log:^3.0 with newer Monolog

pepamartinec · pepamartinec · commit 51ba57b5adce · 2025-04-24T11:58:52.000+02:00
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -15,8 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        phpVersion: [8.1, 8.2, 8.3]
-        symfonyVersion: ["5.4.*", "6.1.*"]
+        phpVersion: [8.1, 8.2, 8.3, 8.4]
+        symfonyVersion: ["5.4.*", "6.4.*", "7.2.*"]
+        exclude:
+          - phpVersion: 8.1
+            symfonyVersion: 7.2.*
 
     steps:
       -
diff --git a/composer.json b/composer.json
@@ -29,19 +29,19 @@
         "php": ">=8.1",
         "ext-json": "*",
         "keboola/common-exceptions": "^1.2",
-        "monolog/monolog": "^2.3",
-        "symfony/config": "^5.4|^6.0",
-        "symfony/filesystem": "^5.4|^6.0",
-        "symfony/finder": "^5.4|^6.0",
-        "symfony/property-access": "^5.4|^6.0",
-        "symfony/serializer": "^5.4|^6.0"
+        "monolog/monolog": "^3.0",
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/filesystem": "^5.4|^6.0|^7.0",
+        "symfony/finder": "^5.4|^6.0|^7.0",
+        "symfony/property-access": "^5.4|^6.0|^7.0",
+        "symfony/serializer": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
-        "devedge/sami-github": "^1.0",
-        "keboola/coding-standard": "^15.0",
-        "keboola/php-temp": "^2.0",
-        "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": "^9.5"
+        "devedge/sami-github": "^1.0.6",
+        "keboola/coding-standard": "^15.0.1",
+        "keboola/php-temp": "^2.0.1",
+        "phpstan/phpstan": "^1.12.24",
+        "phpunit/phpunit": "^9.6.22"
     },
     "scripts": {
         "tests": "phpunit",
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,6 @@
 parameters:
     ignoreErrors:
-        -
-        			identifier: missingType.iterableValue
+        - identifier: missingType.iterableValue
         - '#Argument of an invalid type array\|object supplied for foreach, only iterables are supported.#'
+        - message: '#Class Keboola\\Component\\Logger extends @final class Monolog\\Logger.#'
+          reportUnmatched: false
diff --git a/src/Logger.php b/src/Logger.php
@@ -7,6 +7,7 @@
 use Keboola\Component\Config\BaseConfig;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
+use Monolog\Level;
 use Monolog\Logger as MonologLogger;
 
 class Logger extends MonologLogger implements Logger\SyncActionLogging, Logger\AsyncActionLogging
@@ -15,7 +16,7 @@ public static function getDefaultErrorHandler(): StreamHandler
     {
         $errorHandler = new StreamHandler('php://stderr');
         $errorHandler->setBubble(false);
-        $errorHandler->setLevel(MonologLogger::WARNING);
+        $errorHandler->setLevel(Level::Warning);
         $errorHandler->setFormatter(new LineFormatter("%message%\n"));
         return $errorHandler;
     }
@@ -24,7 +25,7 @@ public static function getDefaultLogHandler(): StreamHandler
     {
         $logHandler = new StreamHandler('php://stdout');
         $logHandler->setBubble(false);
-        $logHandler->setLevel(MonologLogger::INFO);
+        $logHandler->setLevel(Level::Info);
         $logHandler->setFormatter(new LineFormatter("%message%\n"));
         return $logHandler;
     }
@@ -33,7 +34,7 @@ public static function getDefaultCriticalHandler(): StreamHandler
     {
         $handler = new StreamHandler('php://stderr');
         $handler->setBubble(false);
-        $handler->setLevel(MonologLogger::CRITICAL);
+        $handler->setLevel(Level::Critical);
         $handler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));
         return $handler;
     }
@@ -42,7 +43,7 @@ public static function getDefaultDebugHandler(): StreamHandler
     {
         $handler = new StreamHandler('php://stdout');
         $handler->setBubble(false);
-        $handler->setLevel(MonologLogger::DEBUG);
+        $handler->setLevel(Level::Debug);
         $handler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));
         return $handler;
     }
@@ -51,7 +52,7 @@ public static function getSyncActionErrorHandler(): StreamHandler
     {
         $logHandler = new StreamHandler('php://stderr');
         $logHandler->setBubble(false);
-        $logHandler->setLevel(MonologLogger::ERROR);
+        $logHandler->setLevel(Level::Error);
         $logHandler->setFormatter(new LineFormatter("%message%\n"));
         return $logHandler;
     }
@@ -60,7 +61,7 @@ public static function getSyncActionCriticalHandler(): StreamHandler
     {
         $logHandler = new StreamHandler('php://stderr');
         $logHandler->setBubble(false);
-        $logHandler->setLevel(MonologLogger::CRITICAL);
+        $logHandler->setLevel(Level::Critical);
         $logHandler->setFormatter(new LineFormatter("%message% %context% %extra%\n", null, false, true));
         return $logHandler;
     }
@@ -69,7 +70,7 @@ public static function getSyncActionDebugHandler(): StreamHandler
     {
         $logHandler = new StreamHandler('php://stdout');
         $logHandler->setBubble(false);
-        $logHandler->setLevel(MonologLogger::DEBUG);
+        $logHandler->setLevel(Level::Debug);
         $logHandler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));
         return $logHandler;
     }
diff --git a/src/Manifest/ManifestManager/Options/OutTable/Serializer/LegacyManifestNormalizer.php b/src/Manifest/ManifestManager/Options/OutTable/Serializer/LegacyManifestNormalizer.php
@@ -13,6 +13,13 @@
 
 class LegacyManifestNormalizer implements NormalizerInterface, DenormalizerInterface
 {
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            '*' => true,
+        ];
+    }
+
     public function normalize($object, ?string $format = null, array $context = []): array
     {
         $data = [];
@@ -263,12 +270,12 @@ private function setMetadata(
         }
     }
 
-    public function supportsNormalization($data, $format = null): bool
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof ManifestOptions;
     }
 
-    public function supportsDenormalization($data, $type, $format = null): bool
+    public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         return $type === ManifestOptions::class;
     }
diff --git a/tests/Logger/LoggerTest.php b/tests/Logger/LoggerTest.php
@@ -8,6 +8,8 @@
 use Keboola\Component\Config\BaseConfig;
 use Keboola\Component\Logger;
 use Monolog\Handler\StreamHandler;
+use Monolog\Level;
+use Monolog\LogRecord;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
@@ -25,7 +27,7 @@ public function testDefaultHandler(): void
         /** @var StreamHandler $streamHandler */
         $streamHandler = $handlers[0];
         $this->assertSame('php://stderr', $streamHandler->getUrl());
-        $this->assertSame(Logger::DEBUG, $streamHandler->getLevel());
+        $this->assertSame(Level::Debug, $streamHandler->getLevel());
     }
 
     public function testSetupSyncActionLogging(): void
@@ -40,32 +42,30 @@ public function testSetupSyncActionLogging(): void
         /** @var StreamHandler $streamHandler1 */
         $streamHandler1 = $handlers[0];
         $this->assertSame('php://stderr', $streamHandler1->getUrl());
-        $this->assertSame(Logger::CRITICAL, $streamHandler1->getLevel());
+        $this->assertSame(Level::Critical, $streamHandler1->getLevel());
 
         /** @var StreamHandler $streamHandler2 */
         $streamHandler2 = $handlers[1];
         $this->assertSame('php://stderr', $streamHandler2->getUrl());
-        $this->assertSame(Logger::ERROR, $streamHandler2->getLevel());
+        $this->assertSame(Level::Error, $streamHandler2->getLevel());
 
         // Init streams (stream is created with first message)
-        $streamHandler1->handle([
-            'level' => Logger::CRITICAL,
-            'message' => '',
-            'extra' => [],
-            'context' => [],
-            'datetime' => new DateTimeImmutable(),
-            'channel' => '',
-            'level_name' => Logger::getLevelName(Logger::CRITICAL),
-        ]);
-        $streamHandler2->handle([
-            'level' => Logger::ERROR,
-            'message' => '',
-            'extra' => [],
-            'context' => [],
-            'datetime' => new DateTimeImmutable(),
-            'channel' => '',
-            'level_name' => Logger::getLevelName(Logger::ERROR),
-        ]);
+        $streamHandler1->handle(new LogRecord(
+            datetime: new DateTimeImmutable(),
+            channel: '',
+            level: Level::Critical,
+            message: '',
+            context: [],
+            extra: [],
+        ));
+        $streamHandler2->handle(new LogRecord(
+            datetime: new DateTimeImmutable(),
+            channel: '',
+            level: Level::Error,
+            message: '',
+            context: [],
+            extra: [],
+        ));
 
         // Connect tester (logger) to the streams
         /** @var resource $stream1 */
@@ -143,10 +143,10 @@ public function testDebugLogging(): void
             StreamTester::getContent(),
         );
 
-        $this->assertSame(Logger::CRITICAL, $handlerCritical->getLevel());
-        $this->assertSame(Logger::WARNING, $handlerError->getLevel());
-        $this->assertSame(Logger::INFO, $handlerLog->getLevel());
-        $this->assertSame(Logger::DEBUG, $handlerDebug->getLevel());
+        $this->assertSame(Level::Critical, $handlerCritical->getLevel());
+        $this->assertSame(Level::Warning, $handlerError->getLevel());
+        $this->assertSame(Level::Info, $handlerLog->getLevel());
+        $this->assertSame(Level::Debug, $handlerDebug->getLevel());
 
         $this->assertSame('php://stderr', $handlerCritical->getUrl());
         $this->assertSame('php://stderr', $handlerError->getUrl());
diff --git a/tests/Logger/StreamTester.php b/tests/Logger/StreamTester.php
@@ -33,7 +33,6 @@ public static function getContent(): string
     public function filter($in, $out, &$consumed, $closing): int
     {
         while ($bucket = stream_bucket_make_writeable($in)) {
-            /** @var \stdClass $bucket */
             self::$content .= $bucket->data;
             $consumed += $bucket->datalen;
             stream_bucket_append($out, $bucket);

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use Keboola\Component\Config\BaseConfig;`
`8`	`8`	`use Monolog\Formatter\LineFormatter;`
`9`	`9`	`use Monolog\Handler\StreamHandler;`
	`10`	`+use Monolog\Level;`
`10`	`11`	`use Monolog\Logger as MonologLogger;`
`11`	`12`
`12`	`13`	`class Logger extends MonologLogger implements Logger\SyncActionLogging, Logger\AsyncActionLogging`
`@@ -15,7 +16,7 @@ public static function getDefaultErrorHandler(): StreamHandler`
`15`	`16`	`{`
`16`	`17`	`$errorHandler = new StreamHandler('php://stderr');`
`17`	`18`	`$errorHandler->setBubble(false);`
`18`		`- $errorHandler->setLevel(MonologLogger::WARNING);`
	`19`	`+ $errorHandler->setLevel(Level::Warning);`
`19`	`20`	`$errorHandler->setFormatter(new LineFormatter("%message%\n"));`
`20`	`21`	`return $errorHandler;`
`21`	`22`	`}`
`@@ -24,7 +25,7 @@ public static function getDefaultLogHandler(): StreamHandler`
`24`	`25`	`{`
`25`	`26`	`$logHandler = new StreamHandler('php://stdout');`
`26`	`27`	`$logHandler->setBubble(false);`
`27`		`- $logHandler->setLevel(MonologLogger::INFO);`
	`28`	`+ $logHandler->setLevel(Level::Info);`
`28`	`29`	`$logHandler->setFormatter(new LineFormatter("%message%\n"));`
`29`	`30`	`return $logHandler;`
`30`	`31`	`}`
`@@ -33,7 +34,7 @@ public static function getDefaultCriticalHandler(): StreamHandler`
`33`	`34`	`{`
`34`	`35`	`$handler = new StreamHandler('php://stderr');`
`35`	`36`	`$handler->setBubble(false);`
`36`		`- $handler->setLevel(MonologLogger::CRITICAL);`
	`37`	`+ $handler->setLevel(Level::Critical);`
`37`	`38`	`$handler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));`
`38`	`39`	`return $handler;`
`39`	`40`	`}`
`@@ -42,7 +43,7 @@ public static function getDefaultDebugHandler(): StreamHandler`
`42`	`43`	`{`
`43`	`44`	`$handler = new StreamHandler('php://stdout');`
`44`	`45`	`$handler->setBubble(false);`
`45`		`- $handler->setLevel(MonologLogger::DEBUG);`
	`46`	`+ $handler->setLevel(Level::Debug);`
`46`	`47`	`$handler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));`
`47`	`48`	`return $handler;`
`48`	`49`	`}`
`@@ -51,7 +52,7 @@ public static function getSyncActionErrorHandler(): StreamHandler`
`51`	`52`	`{`
`52`	`53`	`$logHandler = new StreamHandler('php://stderr');`
`53`	`54`	`$logHandler->setBubble(false);`
`54`		`- $logHandler->setLevel(MonologLogger::ERROR);`
	`55`	`+ $logHandler->setLevel(Level::Error);`
`55`	`56`	`$logHandler->setFormatter(new LineFormatter("%message%\n"));`
`56`	`57`	`return $logHandler;`
`57`	`58`	`}`
`@@ -60,7 +61,7 @@ public static function getSyncActionCriticalHandler(): StreamHandler`
`60`	`61`	`{`
`61`	`62`	`$logHandler = new StreamHandler('php://stderr');`
`62`	`63`	`$logHandler->setBubble(false);`
`63`		`- $logHandler->setLevel(MonologLogger::CRITICAL);`
	`64`	`+ $logHandler->setLevel(Level::Critical);`
`64`	`65`	`$logHandler->setFormatter(new LineFormatter("%message% %context% %extra%\n", null, false, true));`
`65`	`66`	`return $logHandler;`
`66`	`67`	`}`
`@@ -69,7 +70,7 @@ public static function getSyncActionDebugHandler(): StreamHandler`
`69`	`70`	`{`
`70`	`71`	`$logHandler = new StreamHandler('php://stdout');`
`71`	`72`	`$logHandler->setBubble(false);`
`72`		`- $logHandler->setLevel(MonologLogger::DEBUG);`
	`73`	`+ $logHandler->setLevel(Level::Debug);`
`73`	`74`	`$logHandler->setFormatter(new LineFormatter("[%datetime%] %level_name%: %message% %context% %extra%\n"));`
`74`	`75`	`return $logHandler;`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,13 @@`
`13`	`13`
`14`	`14`	`class LegacyManifestNormalizer implements NormalizerInterface, DenormalizerInterface`
`15`	`15`	`{`
	`16`	`+ public function getSupportedTypes(?string $format): array`
	`17`	`+ {`
	`18`	`+ return [`
	`19`	`+ '*' => true,`
	`20`	`+ ];`
	`21`	`+ }`
	`22`	`+`
`16`	`23`	`public function normalize($object, ?string $format = null, array $context = []): array`
`17`	`24`	`{`
`18`	`25`	`$data = [];`
`@@ -263,12 +270,12 @@ private function setMetadata(`
`263`	`270`	`}`
`264`	`271`	`}`
`265`	`272`
`266`		`- public function supportsNormalization($data, $format = null): bool`
	`273`	`+ public function supportsNormalization($data, $format = null, array $context = []): bool`
`267`	`274`	`{`
`268`	`275`	`return $data instanceof ManifestOptions;`
`269`	`276`	`}`
`270`	`277`
`271`		`- public function supportsDenormalization($data, $type, $format = null): bool`
	`278`	`+ public function supportsDenormalization($data, $type, $format = null, array $context = []): bool`
`272`	`279`	`{`
`273`	`280`	`return $type === ManifestOptions::class;`
`274`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public static function getContent(): string`
`33`	`33`	`public function filter($in, $out, &$consumed, $closing): int`
`34`	`34`	`{`
`35`	`35`	`while ($bucket = stream_bucket_make_writeable($in)) {`
`36`		`- /** @var \stdClass $bucket */`
`37`	`36`	`self::$content .= $bucket->data;`
`38`	`37`	`$consumed += $bucket->datalen;`
`39`	`38`	`stream_bucket_append($out, $bucket);`