upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Force cast getCode to int

Browse source 
Otherwise psalm complains that the type can also be a non-falsy-string

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-10-16 23:38:31 +02:00
parent c4bb69c143
commit ff4c8e9bee
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/lib/Controller/StoragesController.php
View file

@ -294,12 +294,12 @@ abstract class StoragesController extends Controller {
} catch (InsufficientDataForMeaningfulAnswerException $e) {
$status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
$storage->setStatus(
$status,
(int)$status,
$this->l10n->t('Insufficient data: %s', [$e->getMessage()])
);
} catch (StorageNotAvailableException $e) {
$storage->setStatus(
$e->getCode(),
(int)$e->getCode(),
$this->l10n->t('%s', [$e->getMessage()])
);
} catch (\Exception $e) {

14
apps/files_external/lib/Lib/Storage/SMB.php
View file

@ -282,7 +282,7 @@ class SMB extends Common implements INotifyStorage {
}
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while getting folder content']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}
@ -428,7 +428,7 @@ class SMB extends Common implements INotifyStorage {
return false;
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while deleting file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}
@ -515,7 +515,7 @@ class SMB extends Common implements INotifyStorage {
throw new EntityTooLargeException("not enough available space to create file", 0, $e);
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while opening file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}
@ -542,7 +542,7 @@ class SMB extends Common implements INotifyStorage {
return false;
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while removing folder']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}
@ -558,7 +558,7 @@ class SMB extends Common implements INotifyStorage {
throw new EntityTooLargeException("not enough available space to create file", 0, $e);
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while creating file']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}
@ -655,7 +655,7 @@ class SMB extends Common implements INotifyStorage {
return true;
} catch (ConnectException $e) {
$this->logger->logException($e, ['message' => 'Error while creating folder']);
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
} catch (Exception $e) {
return false;
}
@ -670,7 +670,7 @@ class SMB extends Common implements INotifyStorage {
} catch (ForbiddenException $e) {
return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
throw new StorageNotAvailableException($e->getMessage(), (int)$e->getCode(), $e);
}
}