From 26dda2b3fe592593c30c995bc415cedf42a2ce9f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 2 Dec 2025 07:31:33 +0000
Subject: [PATCH 1/3] Initial plan


From 239cbed3309a40ec5740147b32a0902d4241ab87 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 2 Dec 2025 07:34:02 +0000
Subject: [PATCH 2/3] Add ext-psr to conflict section in composer.json

Co-authored-by: samdark <47294+samdark@users.noreply.github.com>
---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 2753f7e0..a374d16a 100644
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,9 @@
         "yiisoft/log-target-file": "Allows writing log messages to the files",
         "yiisoft/log-target-syslog": "Allows writing log messages to the Syslog"
     },
+    "conflict": {
+        "ext-psr": "*"
+    },
     "autoload": {
         "psr-4": {
             "Yiisoft\\Log\\": "src"

From da89e3e88042ce84e185e254abf4ec7bac86a996 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:47:41 +0000
Subject: [PATCH 3/3] Add changelog entry for ext-psr conflict

Co-authored-by: samdark <47294+samdark@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e5accfa..5852fe0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.1.2 under development
 
-- no changes in this release.
+- Chg #126: Add `ext-psr` to `conflict` section in `composer.json` (@samdark)
 
 ## 2.1.1 June 03, 2025