diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index fdf3edbdb59..854a28efc2c 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -23,11 +23,11 @@ class Encoding extends Wrapper { private CappedMemoryCache $namesCache; /** - * @param array $parameters + * @param array{storage: IStorage, ...} $parameters */ public function __construct(array $parameters) { - $this->storage = $parameters['storage']; $this->namesCache = new CappedMemoryCache(); + parent::__construct($parameters); } /** diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 8d3e271ab67..194c57a4191 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -42,7 +42,7 @@ class Encryption extends Wrapper { private bool $enabled = true; /** - * @param array $parameters + * @param array{storage: Storage\IStorage, ...} $parameters */ public function __construct( array $parameters, diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 6088c9c0ece..e67885b4397 100644 --- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php @@ -28,7 +28,7 @@ class PermissionsMask extends Wrapper { protected readonly int $mask; /** - * @param array{storage: Storage, mask: int, ...} $parameters + * @param array{storage: IStorage, mask: int, ...} $parameters * * $storage: The storage the permissions mask should be applied on * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index 22d1e8eea36..d9928626ed1 100644 --- a/lib/private/Files/Storage/Wrapper/Wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php @@ -26,7 +26,7 @@ use Override; use Psr\Log\LoggerInterface; class Wrapper implements Storage, ILockingStorage, IWriteStreamStorage { - protected ?Storage $storage = null; + protected ?IStorage $storage = null; public ?ICache $cache = null; @@ -39,7 +39,7 @@ class Wrapper implements Storage, ILockingStorage, IWriteStreamStorage { public ?IUpdater $updater = null; /** - * @param array{storage: Storage, ...} $parameters + * @param array{storage: IStorage, ...} $parameters */ public function __construct(array $parameters) { $this->storage = $parameters['storage'];