diff options
| -rw-r--r-- | apps/encryption/lib/Crypto/Encryption.php | 2 | ||||
| -rw-r--r-- | apps/encryption/lib/Util.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Filesystem.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Mount/MountPoint.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 2 | ||||
| -rw-r--r-- | lib/public/Files/Mount/IMountPoint.php | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php index 6fa388e8875..51c5122eb93 100644 --- a/apps/encryption/lib/Crypto/Encryption.php +++ b/apps/encryption/lib/Crypto/Encryption.php @@ -435,7 +435,7 @@ class Encryption implements IEncryptionModule { public function shouldEncrypt($path) { if ($this->util->shouldEncryptHomeStorage() === false) { $storage = $this->util->getStorage($path); - if ($storage->instanceOfStorage('\OCP\Files\IHomeStorage')) { + if ($storage && $storage->instanceOfStorage('\OCP\Files\IHomeStorage')) { return false; } } diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php index 2b11b8151c0..139dd3f50fa 100644 --- a/apps/encryption/lib/Util.php +++ b/apps/encryption/lib/Util.php @@ -191,7 +191,7 @@ class Util { * get storage of path * * @param string $path - * @return \OC\Files\Storage\Storage + * @return \OC\Files\Storage\Storage|null */ public function getStorage($path) { return $this->files->getMount($path)->getStorage(); diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index bf94be273f2..fade3b69fbb 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -312,7 +312,7 @@ class Filesystem { * get the storage mounted at $mountPoint * * @param string $mountPoint - * @return \OC\Files\Storage\Storage + * @return \OC\Files\Storage\Storage|null */ public static function getStorage($mountPoint) { if (!self::$mounts) { diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php index cbf3785c409..891bbc41c36 100644 --- a/lib/private/Files/Mount/MountPoint.php +++ b/lib/private/Files/Mount/MountPoint.php @@ -39,7 +39,7 @@ use OCP\ILogger; class MountPoint implements IMountPoint { /** - * @var \OC\Files\Storage\Storage $storage + * @var \OC\Files\Storage\Storage|null $storage */ protected $storage = null; protected $class; @@ -167,7 +167,7 @@ class MountPoint implements IMountPoint { } /** - * @return \OC\Files\Storage\Storage + * @return \OC\Files\Storage\Storage|null */ public function getStorage() { if (is_null($this->storage)) { diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index ec73a8c06ae..7b1eff47cd5 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -494,7 +494,7 @@ class Folder extends Node implements \OCP\Files\Folder { $mounts[] = $this->getMountPoint(); $mounts = array_filter($mounts, function (IMountPoint $mount) { - return $mount->getStorage(); + return $mount->getStorage() !== null; }); $storageIds = array_map(function (IMountPoint $mount) { return $mount->getStorage()->getCache()->getNumericStorageId(); diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php index 7315fd97035..51a5fbade48 100644 --- a/lib/public/Files/Mount/IMountPoint.php +++ b/lib/public/Files/Mount/IMountPoint.php @@ -48,7 +48,7 @@ interface IMountPoint { /** * Get the storage that is mounted * - * @return \OC\Files\Storage\Storage + * @return \OC\Files\Storage\Storage|null * @since 8.0.0 */ public function getStorage(); |