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.

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

Jump to bottom

[stable30] Bug/48678/restore dav error response #49481

Open
wants to merge 4 commits into
base: stable30
Choose a base branch
from
Open

[stable30] Bug/48678/restore dav error response #49481

wants to merge 4 commits into from
+150 −70

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Nov 25, 2024 •
edited by kesselb
Loading

Backport of #49004

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added this to the Nextcloud 30.0.3 milestone Nov 25, 2024
@kesselb
Copy link
Contributor

kesselb commented Nov 26, 2024

Conflicts: Constructor property promotion and Imports in Server and ServerFactory

github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 26, 2024
View reviewed changes
apps/dav/lib/Connector/Sabre/Server.php
}

if ($this->debugExceptions) {
$previous = $e;

Check notice

Code scanning / Psalm

MissingClosureReturnType Note

Closure does not have a return type, expecting string
Copy link
Member

Choose a reason for hiding this comment

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

^ why would Psalm complain here but not on master? Bug?

Copy link
Contributor

Choose a reason for hiding this comment

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

The psalm run https://github.com/nextcloud/server/actions/runs/12030997029/job/33539600726?pr=49481 does not report it. The reason for this warning could be that #48476 was only done for master, but not backported. However https://github.com/nextcloud/server/actions/runs/12030997029/job/33539601398?pr=49481 does not mention that warning as well. I'm a bit clueless where it comes from ;)

apps/dav/lib/Connector/Sabre/Server.php
}

if ($this->debugExceptions) {
$previous = $e;

Check notice

Code scanning / Psalm

MissingClosureParamType Note

Parameter $v has no provided type
@kesselb kesselb marked this pull request as ready for review November 26, 2024 12:49
@kesselb kesselb force-pushed the backport/49004/stable30 branch 2 times, most recently from 0d60beb to 20aada5 Compare November 26, 2024 12:52
@kesselb
Copy link
Contributor

kesselb commented Nov 26, 2024

smb-kerberos-sso seems unrelated and is failing for other stable30 pull requests too.

@skjnldsv skjnldsv mentioned this pull request Nov 27, 2024
Merged
6 tasks
kesselb
kesselb requested changes Nov 28, 2024
View reviewed changes
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.

Blocking

@kesselb
Revert "fix: Override start method of \Sabre\DAV\Server to remove exc…
b1f97a6 
…eption output"

This reverts commit e202896.

Signed-off-by: Daniel Kesselberg <[email protected]>
@kesselb
Revert "fix: Drop unnecessary exit"
9011b9e 
This reverts commit d2bf361.

Signed-off-by: Daniel Kesselberg <[email protected]>
@kesselb
Revert "fix(dav): Always respond custom error page on exceptions"
f8bb373 
This reverts commit 9992e7d.

Signed-off-by: Daniel Kesselberg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@come-nc come-nc come-nc left review comments

@kesselb kesselb kesselb requested changes

@miaulalala miaulalala miaulalala approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@st3iny st3iny Awaiting requested review from st3iny st3iny is a code owner

@SebastianKrupinski SebastianKrupinski Awaiting requested review from SebastianKrupinski SebastianKrupinski is a code owner

Requested changes must be addressed to merge this pull request.

Assignees

@kesselb kesselb

Labels
3. to review Waiting for reviews bug feature: dav
Projects
None yet
Milestone
Nextcloud 30.0.3
Development

Successfully merging this pull request may close these issues.
4 participants
@kesselb @ChristophWurst @miaulalala @come-nc