code checker fixes for instanceOfStorage

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/files_sharing/lib/ISharedStorage.php b/apps/files_sharing/lib/ISharedStorage.php
index 9f57984803a341e9ed179ded13b7c1fb7404a802..c54b90f3f054551c919d4915231052752e3bfa0e 100644 (file)
--- a/apps/files_sharing/lib/ISharedStorage.php
+++ b/apps/files_sharing/lib/ISharedStorage.php
@@ -22,5 +22,7 @@
  */
 namespace OCA\Files_Sharing;
 
-interface ISharedStorage {
+use OCP\Files\Storage\IStorage;
+
+interface ISharedStorage extends IStorage {
 }

diff --git a/lib/public/Files/IHomeStorage.php b/lib/public/Files/IHomeStorage.php
index 0f10d5991483fff41298c4a012557095c9b5f857..7eb3ffc4a24ec58d4e7390a9e2d28e510dd96cb8 100644 (file)
--- a/lib/public/Files/IHomeStorage.php
+++ b/lib/public/Files/IHomeStorage.php
@@ -26,10 +26,12 @@
 
 namespace OCP\Files;
 
+use OCP\Files\Storage\IStorage;
+
 /**
  * Interface IHomeStorage
  *
  * @since 7.0.0
  */
-interface IHomeStorage {
+interface IHomeStorage extends IStorage {
 }

diff --git a/lib/public/Files/Storage/IDisableEncryptionStorage.php b/lib/public/Files/Storage/IDisableEncryptionStorage.php
index 11d71549cac9ae5d0e8078365b46073ae04ac899..7b70aa3e47f478263b1c0cef17a14545a51dce0a 100644 (file)
--- a/lib/public/Files/Storage/IDisableEncryptionStorage.php
+++ b/lib/public/Files/Storage/IDisableEncryptionStorage.php
@@ -28,5 +28,5 @@ namespace OCP\Files\Storage;
  *
  * @since 16.0.0
  */
-interface IDisableEncryptionStorage {
+interface IDisableEncryptionStorage extends IStorage {
 }

diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
index 21272f216c7db96003a4abed831831a773af8c29..f42eb81bfecd5e04c3656c209c58768c7425ab91 100644 (file)
--- a/lib/public/Files/Storage/IStorage.php
+++ b/lib/public/Files/Storage/IStorage.php
@@ -356,9 +356,12 @@ interface IStorage {
        /**
         * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
         *
+        * @template T of IStorage
         * @param string $class
+        * @psalm-param class-string<T> $class
         * @return bool
         * @since 9.0.0
+        * @psalm-assert-if-true T $this
         */
        public function instanceOfStorage($class);