upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

fix: Resolve some psalm issues

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2023-09-20 20:22:36 +02:00
parent bcfaa850f3
commit d00b9cd2fe
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/dav/lib/Connector/Sabre/CorsPlugin.php
View file

@ -69,9 +69,10 @@ class CorsPlugin extends ServerPlugin {
return;
}
$originHeader = $request->getHeader('Origin');
if ($this->ignoreOriginHeader($originHeader)) {
if ($originHeader === null || $this->ignoreOriginHeader($originHeader)) {
return;
}
try {
if (Util::isSameDomain($originHeader, $request->getAbsoluteUrl())) {
return;
@ -86,6 +87,10 @@ class CorsPlugin extends ServerPlugin {
$this->server->on('beforeMethod:OPTIONS', [$this, 'setOptionsRequestHeaders'], 5);
}
/**
* @param \Throwable $ex The thrown exception
* @return void
*/
public function onException(\Throwable $ex) {
$this->setCorsHeaders($this->server->httpRequest, $this->server->httpResponse);
}

2
lib/private/Route/Router.php
View file

@ -287,7 +287,7 @@ class Router implements IRouter {
// Reach here if it's valid
$response = new \OC\OCS\Result(null, 100, 'OPTIONS request successful');
$response = \OC_Response::setOptionsRequestHeaders($response);
\OC_Response::setOptionsRequestHeaders($response, $this->config);
\OC_API::respond($response, \OC_API::requestedFormat());
// Return since no more processing for an OPTIONS request is required

2
lib/public/Util.php
View file

@ -650,7 +650,7 @@ class Util {
$host = \strtolower($parts['host']);
$port = $parts['port'] ?? null;
if ($port === null || $port === '') {
if ($port === null || $port === 0) {
if ($protocol === 'http') {
$port = 80;
} elseif ($protocol === 'https') {