Skip to content

Add ext-psr to conflict section in composer.json #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samdark merged 3 commits into from
Dec 5, 2025
Merged

Add ext-psr to conflict section in composer.json #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26dda2b
Initial plan
Copilot Dec 2, 2025
239cbed
Add ext-psr to conflict section in composer.json
Copilot Dec 2, 2025
da89e3e
Add changelog entry for ext-psr conflict
Copilot Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading