diff options
| -rw-r--r-- | apps/files_external/lib/Command/Notify.php | 11 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 4 | ||||
| -rw-r--r-- | lib/private/AppFramework/OCS/V1Response.php | 9 | ||||
| -rw-r--r-- | lib/private/legacy/OC_API.php | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/apps/files_external/lib/Command/Notify.php b/apps/files_external/lib/Command/Notify.php index bba698fb25f..60639f7dbe4 100644 --- a/apps/files_external/lib/Command/Notify.php +++ b/apps/files_external/lib/Command/Notify.php @@ -1,4 +1,7 @@ <?php + +declare(strict_types=1); + /** * @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl> * @@ -108,9 +111,9 @@ class Notify extends Base { if ($input->getOption('user')) { return (string)$input->getOption('user'); } elseif (isset($_ENV['NOTIFY_USER'])) { - return (string)$_ENV['NOTIFY_USER']; + return $_ENV['NOTIFY_USER']; } elseif (isset($_SERVER['NOTIFY_USER'])) { - return (string)$_SERVER['NOTIFY_USER']; + return $_SERVER['NOTIFY_USER']; } else { return null; } @@ -120,9 +123,9 @@ class Notify extends Base { if ($input->getOption('password')) { return (string)$input->getOption('password'); } elseif (isset($_ENV['NOTIFY_PASSWORD'])) { - return (string)$_ENV['NOTIFY_PASSWORD']; + return $_ENV['NOTIFY_PASSWORD']; } elseif (isset($_SERVER['NOTIFY_PASSWORD'])) { - return (string)$_SERVER['NOTIFY_PASSWORD']; + return $_SERVER['NOTIFY_PASSWORD']; } else { return null; } diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index cca5d29909c..5c8b4d7e67b 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -2007,7 +2007,7 @@ </RedundantCondition> </file> <file src="lib/private/Authentication/Token/PublicKeyToken.php"> - <UndefinedMethod occurrences="16"> + <UndefinedMagicMethod occurrences="16"> <code>parent::getExpires()</code> <code>parent::getLastCheck()</code> <code>parent::getLoginName()</code> @@ -2024,7 +2024,7 @@ <code>parent::setScope(json_encode($scope))</code> <code>parent::setToken($token)</code> <code>parent::setType(IToken::WIPE_TOKEN)</code> - </UndefinedMethod> + </UndefinedMagicMethod> </file> <file src="lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php"> <InvalidReturnStatement occurrences="1"/> diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php index f4f19832fa8..8c402809cc4 100644 --- a/lib/private/AppFramework/OCS/V1Response.php +++ b/lib/private/AppFramework/OCS/V1Response.php @@ -68,13 +68,12 @@ class V1Response extends BaseResponse { public function render() { $meta = [ 'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure', - 'statuscode' => $this->getOCSStatus(), - 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage, + 'statuscode' => (string)$this->getOCSStatus(), + 'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage ?? '', + 'totalitems' => (string)($this->itemsCount ?? ''), + 'itemsperpage' => (string)($this->itemsPerPage ?? ''), ]; - $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : ''; - $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: ''; - return $this->renderResult($meta); } } diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php index 46ee3495572..0da546f3263 100644 --- a/lib/private/legacy/OC_API.php +++ b/lib/private/legacy/OC_API.php @@ -101,7 +101,7 @@ class OC_API { public static function requestedFormat(): string { $formats = ['json', 'xml']; - $format = (isset($_GET['format']) && in_array($_GET['format'], $formats)) ? $_GET['format'] : 'xml'; + $format = (isset($_GET['format']) && is_string($_GET['format']) && in_array($_GET['format'], $formats)) ? $_GET['format'] : 'xml'; return $format; } |