1 files changed, 11 insertions, 28 deletions

diff --git a/lib/private/Files/Storage/StorageFactory.php b/lib/private/Files/Storage/StorageFactory.php
index 18fca1d28e3..603df7fe007 100644
--- a/lib/private/Files/Storage/StorageFactory.php
+++ b/lib/private/Files/Storage/StorageFactory.php
@@ -8,7 +8,10 @@
 namespace OC\Files\Storage;
 
 use OCP\Files\Mount\IMountPoint;
+use OCP\Files\Storage\IConstructableStorage;
+use OCP\Files\Storage\IStorage;
 use OCP\Files\Storage\IStorageFactory;
+use Psr\Log\LoggerInterface;
 
 class StorageFactory implements IStorageFactory {
 	/**
@@ -16,19 +19,7 @@ class StorageFactory implements IStorageFactory {
 	 */
 	private $storageWrappers = [];
 
-	/**
-	 * allow modifier storage behaviour by adding wrappers around storages
-	 *
-	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
-	 *
-	 * @param string $wrapperName name of the wrapper
-	 * @param callable $callback callback
-	 * @param int $priority wrappers with the lower priority are applied last (meaning they get called first)
-	 * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
-	 * @return bool true if the wrapper was added, false if there was already a wrapper with this
-	 * name registered
-	 */
-	public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) {
+	public function addStorageWrapper(string $wrapperName, callable $callback, int $priority = 50, array $existingMounts = []): bool {
 		if (isset($this->storageWrappers[$wrapperName])) {
 			return false;
 		}
@@ -46,31 +37,23 @@ class StorageFactory implements IStorageFactory {
 	 * Remove a storage wrapper by name.
 	 * Note: internal method only to be used for cleanup
 	 *
-	 * @param string $wrapperName name of the wrapper
 	 * @internal
 	 */
-	public function removeStorageWrapper($wrapperName) {
+	public function removeStorageWrapper(string $wrapperName): void {
 		unset($this->storageWrappers[$wrapperName]);
 	}
 
 	/**
 	 * Create an instance of a storage and apply the registered storage wrappers
-	 *
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
-	 * @param string $class
-	 * @param array $arguments
-	 * @return \OCP\Files\Storage
 	 */
-	public function getInstance(IMountPoint $mountPoint, $class, $arguments) {
+	public function getInstance(IMountPoint $mountPoint, string $class, array $arguments): IStorage {
+		if (!is_a($class, IConstructableStorage::class, true)) {
+			\OCP\Server::get(LoggerInterface::class)->warning('Building a storage not implementing IConstructableStorage is deprecated since 31.0.0', ['class' => $class]);
+		}
 		return $this->wrap($mountPoint, new $class($arguments));
 	}
 
-	/**
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
-	 * @param \OCP\Files\Storage $storage
-	 * @return \OCP\Files\Storage
-	 */
-	public function wrap(IMountPoint $mountPoint, $storage) {
+	public function wrap(IMountPoint $mountPoint, IStorage $storage): IStorage {
 		$wrappers = array_values($this->storageWrappers);
 		usort($wrappers, function ($a, $b) {
 			return $b['priority'] - $a['priority'];
@@ -81,7 +64,7 @@ class StorageFactory implements IStorageFactory {
 		}, $wrappers);
 		foreach ($wrappers as $wrapper) {
 			$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
-			if (!($storage instanceof \OCP\Files\Storage)) {
+			if (!($storage instanceof IStorage)) {
 				throw new \Exception('Invalid result from storage wrapper');
 			}
 		}