Skip to content
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.

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

fix(deps): Do not ship psr/log #10706

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Conversation

ChristophWurst
Copy link
Member

@ChristophWurst ChristophWurst commented Feb 17, 2025

It is provided by server's 3rdparty. Shipping another copy can lead to a dependency hell.

psr/log is now installed only for Psalm to have stubs. This avoids vendoring stubs in our repo, which would get outdated one day. Renovate will help us keep the stub package updated.

Fixes #10658

How to test

  • composer i to wipe the old psr/log

The app should work the same as on main.

@@ -63,16 +63,16 @@ jobs:
strategy:
matrix:
php-versions: ['8.3']
nextcloud-versions: ['master']
nextcloud-versions: ['chore/mail-bisect-6e1d9a26209ec5524fbc2fb9c7cbb53315e64d72']
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because of #10688 (comment). I need a slightly outdated server checkout for CI. Right now that means we don't get the latest server master results, but I'm mostly interested in getting this to stable4.2

@ChristophWurst ChristophWurst marked this pull request as ready for review February 17, 2025 09:47
Copy link
Contributor

@kesselb kesselb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😎

It is provided by server's 3rdparty. Shipping another copy can lead to a
dependency hell.

Signed-off-by: Christoph Wurst <[email protected]>
@ChristophWurst ChristophWurst force-pushed the fix/deps/no-psr-log-shipping branch from 8af2238 to 2f8f9bd Compare February 17, 2025 10:01
@ChristophWurst
Copy link
Member Author

/backport to stable4.2

@ChristophWurst ChristophWurst merged commit 1c67737 into main Feb 17, 2025
35 checks passed
@ChristophWurst ChristophWurst deleted the fix/deps/no-psr-log-shipping branch February 17, 2025 10:15
devnoname120 added a commit to devnoname120/epubviewer that referenced this pull request Feb 27, 2025
Nextcloud broke things again in an update without mentioning it in the changelog. A ton of apps are impacted (not just epubviewer).

This commit uses a trick to prevent epubviewer's dependencies from installing `Psr\Log` and instead use the one diretly shipped in the dependencies of Nextcloud 31.

Fix #29 (comment)

Related:
- nextcloud/mail#10644
- ChristophWurst/nextcloud_sentry#701
- nextcloud/mail#10706
- nextcloud/mail#10658
- ihttps://github.com/nextcloud/mail/pull/10708
- And many more…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop support for Nextcloud 30 to deal with the psr/log incompatibility
2 participants