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

[stable29] Bug/48678/restore dav error response #49483

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

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Nov 25, 2024

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.

@kesselb
Copy link
Contributor

kesselb commented Nov 26, 2024

Conflicts: Constructor property promotion and Imports in Server and ServerFactory

$error->setAttribute('xmlns:s', self::NS_SABREDAV);
$DOM->appendChild($error);

$h = function ($v) {

Check notice

Code scanning / Psalm

MissingClosureReturnType Note

Closure does not have a return type, expecting string
$error->setAttribute('xmlns:s', self::NS_SABREDAV);
$DOM->appendChild($error);

$h = function ($v) {

Check notice

Code scanning / Psalm

MissingClosureParamType Note

Parameter $v has no provided type
}
class BrowserErrorPagePlugin extends ServerPlugin {
/** @var Server */
private $server;

Check notice

Code scanning / Psalm

MissingConstructor Note

OCA\DAV\Files\BrowserErrorPagePlugin has an uninitialized property OCA\DAV\Files\BrowserErrorPagePlugin::$server, but no constructor
$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
}
public function generateBody(int $httpCode) {
$request = \OC::$server->getRequest();

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OC\Server::getRequest has been marked as deprecated
@kesselb kesselb marked this pull request as ready for review November 26, 2024 12:59
@skjnldsv skjnldsv mentioned this pull request Nov 27, 2024
4 tasks
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

…eption output"

This reverts commit e202896.

Signed-off-by: Daniel Kesselberg <[email protected]>
This reverts commit d2bf361.

Signed-off-by: Daniel Kesselberg <[email protected]>
@skjnldsv skjnldsv mentioned this pull request Nov 29, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants