refactor(objectstorage): move $user property from ObjectStoreStorage class to HomeObj...

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

diff --git a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php
index b2d0bc3d478dbcf4658bbe989755930d90568d80..feceb706e19df5cdb4da5c05dc95a9fdc8dddf82 100644 (file)
--- a/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php
@@ -7,6 +7,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Citharel <nextcloud@tcit.fr>
  *
  * @license AGPL-3.0
  *
@@ -29,6 +30,8 @@ use OCP\Files\IHomeStorage;
 use OCP\IUser;
 
 class HomeObjectStoreStorage extends ObjectStoreStorage implements IHomeStorage {
+       protected IUser $user;
+
        /**
         * The home user storage requires a user object to create a unique storage id
         * @param array $params

diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index eb8aaffe1e03e5402ccadfee107e4bb5470bc16b..5c2881bef0f414d14d88c0265e8900d000f414f4 100644 (file)
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -51,20 +51,9 @@ use OCP\Files\Storage\IStorage;
 class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFileWrite {
        use CopyDirectory;
 
-       /**
-        * @var \OCP\Files\ObjectStore\IObjectStore $objectStore
-        */
-       protected $objectStore;
-       /**
-        * @var string $id
-        */
-       protected $id;
-       /**
-        * @var \OC\User\User $user
-        */
-       protected $user;
-
-       private $objectPrefix = 'urn:oid:';
+       protected IObjectStore $objectStore;
+       protected string $id;
+       private string $objectPrefix = 'urn:oid:';
 
        private $logger;