From 35273895147e00f66f18116063c21dde357ae108 Mon Sep 17 00:00:00 2001
From: Richard Steinmetz <richard@steinmetz.cloud>
Date: Mon, 12 Aug 2024 09:24:23 +0200
Subject: [PATCH] fixup! chore: bump psr/log to ^2

---
 composer.json                                |  1 +
 composer.lock                                | 65 +++++++++++++++++++-
 tests/Unit/Listener/MoveJunkListenerTest.php |  4 +-
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 8f9d751584..35b06948d6 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,7 @@
 		"youthweb/urllinker": "^2.0"
 	},
 	"require-dev": {
+		"beste/psr-testlogger": "^1.0",
 		"psalm/phar": "^5.25.0",
 		"roave/security-advisories": "dev-master"
 	},
diff --git a/composer.lock b/composer.lock
index 29bec6a31f..b163d889fa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7dea1081222036203e146d00d5db449b",
+    "content-hash": "fc7e2523f7ea6f152586165bf9579fdb",
     "packages": [
         {
             "name": "amphp/amp",
@@ -3507,6 +3507,69 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "beste/psr-testlogger",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beste/psr-testlogger.git",
+                "reference": "405cf168378fdb0977f34d9abc36a4a31bf29315"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beste/psr-testlogger/zipball/405cf168378fdb0977f34d9abc36a4a31bf29315",
+                "reference": "405cf168378fdb0977f34d9abc36a4a31bf29315",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^8.1",
+                "psr/log": "^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8.2",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.1.1",
+                "phpstan/phpstan-strict-rules": "^1.4",
+                "phpunit/phpunit": "^9.5.23",
+                "symfony/var-dumper": "^6.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Beste\\Psr\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jérôme Gamez",
+                    "email": "jerome@gamez.name"
+                }
+            ],
+            "description": "PSR-3 compliant test logger for developers who like tests and want to check if their application logs messages as they expect.",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3",
+                "testing"
+            ],
+            "support": {
+                "issues": "https://github.com/beste/psr-testlogger/issues",
+                "source": "https://github.com/beste/psr-testlogger/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/jeromegamez",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-24T15:52:38+00:00"
+        },
         {
             "name": "psalm/phar",
             "version": "5.25.0",
diff --git a/tests/Unit/Listener/MoveJunkListenerTest.php b/tests/Unit/Listener/MoveJunkListenerTest.php
index 7efaf0f062..78d256254a 100644
--- a/tests/Unit/Listener/MoveJunkListenerTest.php
+++ b/tests/Unit/Listener/MoveJunkListenerTest.php
@@ -18,7 +18,7 @@
 use OCA\Mail\Exception\ServiceException;
 use OCA\Mail\Listener\MoveJunkListener;
 use Psr\Log\LoggerInterface;
-use Psr\Log\Test\TestLogger;
+use Beste\Psr\Log\TestLogger;
 
 class MoveJunkListenerTest extends TestCase {
 	private IMailManager $mailManager;
@@ -29,7 +29,7 @@ protected function setUp(): void {
 		parent::setUp();
 
 		$this->mailManager = $this->createMock(IMailManager::class);
-		$this->logger = new TestLogger();
+		$this->logger = TestLogger::create();
 
 		$this->listener = new MoveJunkListener(
 			$this->mailManager,