From: John Molakvoæ <skjnldsv@users.noreply.github.com>
Date: Thu, 30 May 2024 12:25:07 +0000 (+0200)
Subject: Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
X-Git-Tag: v30.0.0beta1~378^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=16e331ffb94b016895b0de21159b78061b3899e2;p=nextcloud-server.git

Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
---

16e331ffb94b016895b0de21159b78061b3899e2
diff --cc lib/private/Encryption/EncryptionWrapper.php
index 887ca988b1a,4ff8a3c0c6d..cc1c5326c5c
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@@ -28,9 -11,9 +11,10 @@@ use OC\Files\Filesystem
  use OC\Files\Storage\Wrapper\Encryption;
  use OC\Files\View;
  use OC\Memcache\ArrayCache;
 +use OCP\Encryption\IFile;
  use OCP\Files\Mount\IMountPoint;
- use OCP\Files\Storage;
+ use OCP\Files\Storage\IDisableEncryptionStorage;
+ use OCP\Files\Storage\IStorage;
  use Psr\Log\LoggerInterface;
  
  /**
diff --cc lib/private/Encryption/HookManager.php
index 0e8704ad03f,fc6546fb253..5ce51229e4e
--- a/lib/private/Encryption/HookManager.php
+++ b/lib/private/Encryption/HookManager.php
@@@ -24,9 -8,8 +8,9 @@@
  namespace OC\Encryption;
  
  use OC\Files\Filesystem;
- use OC\Files\View;
  use OC\Files\SetupManager;
+ use OC\Files\View;
 +use OCP\Encryption\IFile;
  use Psr\Log\LoggerInterface;
  
  class HookManager {