TASK: Upgrade monolog to version 2.9.1 (#697)

TYPO3 · Feb 23, 2023 · dad4d15 · dad4d15
1 parent 833715d
commit dad4d15
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 34 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "guzzlehttp/guzzle": "^6.0 || ^7.0",
-        "monolog/monolog": "^1.17",
+        "monolog/monolog": "^2.9.1",
         "myclabs/php-enum": "^1.8",
         "neos/utility-files": "^3.0",
         "padraic/phar-updater": "1.0.6",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Cli/Symfony/Logger/ConsoleFormatter.php b/src/Cli/Symfony/Logger/ConsoleFormatter.php
@@ -27,7 +27,7 @@ class ConsoleFormatter extends LineFormatter
     /**
      * {@inheritdoc}
      */
-    public function format(array $record)
+    public function format(array $record): string
     {
         if ($record['level'] >= Logger::ERROR) {
             $record['start_tag'] = '<error>';

diff --git a/src/Cli/Symfony/Logger/ConsoleHandler.php b/src/Cli/Symfony/Logger/ConsoleHandler.php
@@ -53,7 +53,7 @@ public function __construct(OutputInterface $output, bool $bubble = true, array
     /**
      * {@inheritdoc}
      */
-    public function isHandling(array $record)
+    public function isHandling(array $record): bool
     {
         if (!$this->updateLevel()) {
             return false;

diff --git a/tests/Unit/Integration/FactoryTest.php b/tests/Unit/Integration/FactoryTest.php
@@ -259,8 +259,6 @@ public function getDeployment(): void
     {
         putenv('HOME=' . __DIR__ . '/Fixtures');
 
-        $files = [getenv('HOME') . '/.surf/deployments/deploy.php'];
-
         $this->filesystem->getRealPath('./.surf')->willReturn('foo');
         $this->filesystem->isDirectory('foo')->willReturn(false);
         $this->filesystem->fileExists(Argument::any())->willReturn(true);
@@ -278,15 +276,13 @@ public function getDeploymentWithoutSimulation(): void
     {
         putenv('HOME=' . __DIR__ . '/Fixtures');
 
-        $files = [getenv('HOME') . '/.surf/deployments/deploy.php'];
-
         $this->filesystem->getRealPath('./.surf')->willReturn('foo');
         $this->filesystem->isDirectory('foo')->willReturn(false);
         $this->filesystem->fileExists(Argument::any())->willReturn(true);
 
-        $deployment = $this->subject->getDeployment('deploy', null, false);
+        $this->logger->pushHandler(new StreamHandler(getenv('HOME') . '/.surf/workspace/logs/deploy.log'))->shouldBeCalledOnce()->willReturn($this->logger);
 
-        $this->logger->pushHandler(new StreamHandler(getenv('HOME') . '/.surf/workspace/logs/deploy.log'))->shouldBeCalledOnce();
+        $deployment = $this->subject->getDeployment('deploy', null, false);
 
         self::assertFalse($deployment->getForceRun());
         self::assertTrue($deployment->isInitialized());