1 files changed, 21 insertions, 28 deletions
diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php
index d6d1d26c35a..741100ca117 100644
--- a/lib/private/Files/Storage/Storage.php
+++ b/lib/private/Files/Storage/Storage.php
@@ -8,11 +8,11 @@
 
 namespace OC\Files\Storage;
 
-use OC\Files\Cache\Cache;
-use OC\Files\Cache\Propagator;
-use OC\Files\Cache\Scanner;
-use OC\Files\Cache\Updater;
-use OC\Files\Cache\Watcher;
+use OCP\Files\Cache\ICache;
+use OCP\Files\Cache\IPropagator;
+use OCP\Files\Cache\IScanner;
+use OCP\Files\Cache\IUpdater;
+use OCP\Files\Cache\IWatcher;
 use OCP\Files\Storage\ILockingStorage;
 use OCP\Files\Storage\IStorage;
 
@@ -23,51 +23,44 @@ use OCP\Files\Storage\IStorage;
  */
 interface Storage extends IStorage, ILockingStorage {
 	/**
-	 * @inheritDoc
-	 * @return Cache
+	 * @param string $path
+	 * @param ?IStorage $storage
 	 */
-	public function getCache($path = '', $storage = null);
+	public function getCache($path = '', $storage = null): ICache;
 
 	/**
-	 * @inheritDoc
-	 * @return Scanner
+	 * @param string $path
+	 * @param ?IStorage $storage
 	 */
-	public function getScanner($path = '', $storage = null);
+	public function getScanner($path = '', $storage = null): IScanner;
 
 	/**
-	 * @inheritDoc
-	 * @return Watcher
+	 * @param string $path
+	 * @param ?IStorage $storage
 	 */
-	public function getWatcher($path = '', $storage = null);
+	public function getWatcher($path = '', $storage = null): IWatcher;
 
 	/**
-	 * @inheritDoc
-	 * @return Propagator
+	 * @param ?IStorage $storage
 	 */
-	public function getPropagator($storage = null);
+	public function getPropagator($storage = null): IPropagator;
 
 	/**
-	 * @inheritDoc
-	 * @return Updater
+	 * @param ?IStorage $storage
 	 */
-	public function getUpdater($storage = null);
+	public function getUpdater($storage = null): IUpdater;
 
-	/**
-	 * @return \OC\Files\Cache\Storage
-	 */
-	public function getStorageCache();
+	public function getStorageCache(): \OC\Files\Cache\Storage;
 
 	/**
 	 * @param string $path
-	 * @return array|null
 	 */
-	public function getMetaData($path);
+	public function getMetaData($path): ?array;
 
 	/**
 	 * Get the contents of a directory with metadata
 	 *
 	 * @param string $directory
-	 * @return \Traversable an iterator, containing file metadata
 	 *
 	 * The metadata array will contain the following fields
 	 *
@@ -79,5 +72,5 @@ interface Storage extends IStorage, ILockingStorage {
 	 * - storage_mtime
 	 * - permissions
 	 */
-	public function getDirectoryContent($directory): \Traversable;
+	public function getDirectoryContent($directory): \Traversable|false;
 }