Force cast getCode to int

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

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index b82d2a4a4c71fd69105dac38f1bbe36833f54b8a..c8eda8658eff9af96a4394dc9377a62811e37e44 100644 (file)
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -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) {

diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
index 6c59263ddd57a305818586498f912fc65b4c5df9..c7055be3ed84598c824f40dc8e431510c6d18233 100644 (file)
--- a/apps/files_external/lib/Lib/Storage/SMB.php
+++ b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -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);
                }
        }