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

[stable26] fix(dav): Always respond custom error page on exceptions #48303

Merged
merged 5 commits into from
Oct 1, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 23, 2024

Backport of #48297

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 requested a review from artonge September 23, 2024 16:11
@backportbot backportbot bot added the 3. to review Waiting for reviews label Sep 23, 2024
@artonge artonge changed the title [stable26] [stable27] fix(dav): Always respond custom error page on exceptions [stable26] fix(dav): Always respond custom error page on exceptions Sep 23, 2024
@artonge artonge marked this pull request as ready for review September 24, 2024 08:16
} else {
$templateName = 'xml_exception';
$renderAs = null;
$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch Note

Cannot get property on possibly null variable $this->server of type Sabre\DAV\Server|null
} else {
$templateName = 'xml_exception';
$renderAs = null;
$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method setHeader on possibly null value
$content = new OC_Template('core', $templateName, 'guest');
$debug = $this->config->getSystemValueBool('debug', false);

$content = new OC_Template('core', $templateName, $renderAs);

Check notice

Code scanning / Psalm

PossiblyNullArgument Note

Argument 3 of OC_Template::__construct cannot be null, possibly null value provided
if (BrowserErrorPagePlugin::isBrowserRequest($request)) {
$this->server->addPlugin(new BrowserErrorPagePlugin());
}
$this->server->addPlugin(new ErrorPagePlugin($this->request, \OC::$server->getConfig()));

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OC\Server::getConfig has been marked as deprecated
@artonge artonge added bug feature: dav php Pull requests that update Php code labels Sep 26, 2024
@artonge artonge force-pushed the backport/48297/stable26 branch 5 times, most recently from d4679a1 to b33694a Compare October 1, 2024 10:09
artonge and others added 5 commits October 1, 2024 14:46
Signed-off-by: Louis Chemineau <louis@chmn.me>
The `<?xml` tag is interpreted as PHP short tags, so this causes errors.
Instead just print that part of the template.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Louis Chemineau <louis@chmn.me>
…utput

Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
@sorbaugh sorbaugh merged commit 218c76b into stable26 Oct 1, 2024
38 of 40 checks passed
@sorbaugh sorbaugh deleted the backport/48297/stable26 branch October 1, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug feature: dav php Pull requests that update Php code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants