From d6de656726d75cc7022649c2c9c2f5d30c7ef081 Mon Sep 17 00:00:00 2001 From: physikerwelt Date: Sun, 14 Jun 2026 07:30:12 +0200 Subject: [PATCH] Allow `psr/log` versions ^2.0 and ^3.0 in composer.json Otherwise, composer complains about version conflicts when installed from MW root dir and extension is included via merge-plugin. ```json { "extra": { "merge-plugin": { "include": [ "extensions/*/composer.json", "skins/*/composer.json" ] } } } ``` --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 41e127d..e53b277 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "composer/installers": "^2|^1.0.1", "opis/json-schema": "^2.3.0", "ruflin/elastica": "^7.1.0", - "psr/log": "^1.1.4", + "psr/log": "^1.1.4 || ^2.0 || ^3.0", "professional-wiki/message-builder": "^1.0.0" }, "require-dev": {