From 6b09a79227a5dc98aa4620c6e5e15b610a06c806 Mon Sep 17 00:00:00 2001
From: Andrew Summers <18727110+summersab@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:07:38 -0500
Subject: Refactor `OC\Server::getShareManager`

Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
---
 lib/private/Share20/Hooks.php           | 6 ++++--
 lib/private/Template/JSConfigHelper.php | 3 ++-
 lib/public/Util.php                     | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php
index ae08b20fde6..2ab328b6bd9 100644
--- a/lib/private/Share20/Hooks.php
+++ b/lib/private/Share20/Hooks.php
@@ -21,12 +21,14 @@
  */
 namespace OC\Share20;
 
+use OCP\Share\IManager as IShareManager;
+
 class Hooks {
 	public static function post_deleteUser($arguments) {
-		\OC::$server->getShareManager()->userDeleted($arguments['uid']);
+		\OC::$server->get(IShareManager::class)->userDeleted($arguments['uid']);
 	}
 
 	public static function post_deleteGroup($arguments) {
-		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
+		\OC::$server->get(IShareManager::class)->groupDeleted($arguments['gid']);
 	}
 }
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 7b6d0a6a346..9cf0838e43a 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -49,6 +49,7 @@ use OCP\ISession;
 use OCP\IURLGenerator;
 use OCP\ILogger;
 use OCP\IUser;
+use OCP\Share\IManager as IShareManager;
 use OCP\User\Backend\IPasswordConfirmationBackend;
 use OCP\Util;
 
@@ -260,7 +261,7 @@ class JSConfigHelper {
 					'resharingAllowed' => Share::isResharingAllowed(),
 					'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
 					'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
-					'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
+					'allowGroupSharing' => \OC::$server->get(IShareManager::class)->allowGroupSharing(),
 					'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
 					'defaultInternalExpireDate' => $defaultInternalExpireDate,
 					'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
diff --git a/lib/public/Util.php b/lib/public/Util.php
index bff8038b3dd..34ccc61074f 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -48,6 +48,7 @@ namespace OCP;
 
 use OC\AppScriptDependency;
 use OC\AppScriptSort;
+use OCP\Share\IManager as IShareManager;
 use bantu\IniGetWrapper\IniGetWrapper;
 use Psr\Container\ContainerExceptionInterface;
 
@@ -127,11 +128,11 @@ class Util {
 	 *
 	 * @return boolean
 	 * @since 7.0.0
-	 * @deprecated 9.1.0 Use \OC::$server->getShareManager()->sharingDisabledForUser
+	 * @deprecated 9.1.0 Use \OC::$server->get(\OCP\Share\IManager::class)->sharingDisabledForUser
 	 */
 	public static function isSharingDisabledForUser() {
 		if (self::$shareManager === null) {
-			self::$shareManager = \OC::$server->getShareManager();
+			self::$shareManager = \OC::$server->get(IShareManager::class);
 		}
 
 		$user = \OC::$server->getUserSession()->getUser();
-- 
cgit v1.2.3


From 2c8d410f674b74d33ce187e7aa3e20ffbfc5d26a Mon Sep 17 00:00:00 2001
From: skjnldsv <skjnldsv@protonmail.com>
Date: Fri, 15 Mar 2024 14:51:43 +0100
Subject: fix: php-cs

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
---
 lib/public/Util.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/public/Util.php b/lib/public/Util.php
index 87b0700f12b..11229567188 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -49,7 +49,6 @@ namespace OCP;
 use bantu\IniGetWrapper\IniGetWrapper;
 use OC\AppScriptDependency;
 use OC\AppScriptSort;
-use OCP\Share\IManager as IShareManager;
 use OCP\Share\IManager;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Log\LoggerInterface;
@@ -115,7 +114,7 @@ class Util {
 	 */
 	public static function isSharingDisabledForUser() {
 		if (self::$shareManager === null) {
-			self::$shareManager = \OC::$server->get(IShareManager::class);
+			self::$shareManager = \OC::$server->get(IManager::class);
 		}
 
 		$user = \OC::$server->getUserSession()->getUser();
-- 
cgit v1.2.3