refactor(rector): Run with nextcloud set

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

REUSE.toml

@@ -30,7 +30,7 @@ SPDX-FileCopyrightText = "2018 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["composer.json", "composer.lock"]
+path = ["composer.json", "composer.lock", "vendor-bin/*/composer.json", "vendor-bin/*/composer.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2019 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

lib/Controller/APIController.php

@@ -10,6 +10,7 @@
 
 use OC\L10N\Factory;
 use OCA\Guests\AppInfo\Application;
+use OCA\Guests\Config;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
@@ -24,7 +25,7 @@ class APIController extends OCSController {
 	public function __construct(
 		IRequest $request,
 		private readonly IUserSession $userSession,
-		private readonly \OCA\Guests\Config $config,
+		private readonly Config $config,
 		private readonly IFactory $l10nFactory,
 		private readonly ISubAdmin $subAdmin,
 		private readonly IGroupManager $groupManager,

lib/Controller/UsersController.php

@@ -18,6 +18,7 @@
 use OCA\Guests\TransferService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Group\ISubAdmin;
@@ -48,9 +49,7 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 */
+	#[NoAdminRequired]
 	public function create(string $email, string $displayName, string $language, array $groups, bool $sendInvite = true): DataResponse {
 		$errorMessages = [];
 		$currentUser = $this->userSession->getUser();
@@ -208,7 +207,7 @@ public function transfer(string $guestUserId, string $targetUserId): DataRespons
 
 		try {
 			$transfer = $this->transferMapper->getBySource($sourceUser->getUID());
-		} catch (DoesNotExistException $e) {
+		} catch (DoesNotExistException) {
 			// Allow as this just means there is no pending transfer
 		}
 

lib/FilteredSettingsManager.php

@@ -7,24 +7,21 @@
 
 namespace OCA\Guests;
 
+use OC\AppFramework\App;
 use OCP\IUser;
 use OCP\Settings\IIconSection;
 use OCP\Settings\IManager;
 
 class FilteredSettingsManager implements IManager {
 
-	/** @var IManager */
-	private $manager;
-
 	public function __construct(
-		IManager $manager,
-		private readonly \OCA\Guests\AppWhitelist $appWhitelist,
+		private readonly IManager $manager,
+		private readonly AppWhitelist $appWhitelist,
 	) {
-		$this->manager = $manager;
 	}
 
 	private function isSettingAllowed(string $setting): bool {
-		$appId = \OC\AppFramework\App::getAppIdForClass($setting);
+		$appId = App::getAppIdForClass($setting);
 		return $this->appWhitelist->isAppWhitelisted($appId);
 	}
 

lib/GroupBackend.php

@@ -21,18 +21,14 @@
  */
 class GroupBackend extends ABackend implements ICountUsersBackend, IGroupDetailsBackend, IHideFromCollaborationBackend {
 	/** @var string[] */
-	private $guestMembers = [];
-
-	/** @var IUserSession */
-	private $userSession;
+	private array $guestMembers = [];
 
 	public function __construct(
-		private readonly \OCA\Guests\GuestManager $guestManager,
-		private readonly \OCA\Guests\Config $config,
-		IUserSession $userSession,
+		private readonly GuestManager $guestManager,
+		private readonly Config $config,
+		private readonly IUserSession $userSession,
 		private readonly string $groupName = 'guest_app',
 	) {
-		$this->userSession = $userSession;
 	}
 
 	private function getMembers(): array {

lib/Hooks.php

@@ -82,7 +82,7 @@ public function setupReadonlyFilesystem(array $params): void {
 		$user = $this->userManager->get($uid);
 
 		if ($user && $this->guestManager->isGuest($user)) {
-			Filesystem::addStorageWrapper('guests.readonly', function ($mountPoint, IStorage $storage) use ($uid): \OCA\Guests\Storage\ReadOnlyJail|\OCP\Files\Storage\IStorage {
+			Filesystem::addStorageWrapper('guests.readonly', function ($mountPoint, IStorage $storage) use ($uid): ReadOnlyJail|IStorage {
 				if ($mountPoint === "/$uid/") {
 					return new ReadOnlyJail([
 						'storage' => $storage,

lib/Mail.php

@@ -15,7 +15,7 @@
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
 use OCP\Mail\IMailer;
-use OCP\Share;
+use OCP\Share\IShare;
 use OCP\Util;
 
 class Mail {
@@ -37,7 +37,7 @@ public function __construct(
 	 * @param $uid
 	 * @throws \Exception
 	 */
-	public function sendGuestInviteMail(string $uid, string $guest, string $token, string $language = '', ?Share\IShare $share = null): void {
+	public function sendGuestInviteMail(string $uid, string $guest, string $token, string $language = '', ?IShare $share = null): void {
 		if ($language === '') {
 			$language = null;
 		}
@@ -56,7 +56,7 @@ public function sendGuestInviteMail(string $uid, string $guest, string $token, s
 		$replyTo = $this->userManager->get($uid)->getEMailAddress();
 		$senderDisplayName = $this->userSession->getUser()->getDisplayName();
 
-		if (!$share instanceof \OCP\Share\IShare) {
+		if (!$share instanceof IShare) {
 			[ $subject, $emailTemplate ] = $this->composeInviteMessage($senderDisplayName, $guestEmail, $passwordLink, $l10n);
 		} else {
 			[ $subject, $emailTemplate ] = $this->composeShareMessage($share, $senderDisplayName, $guestEmail, $passwordLink, $l10n);
@@ -88,7 +88,7 @@ public function sendGuestInviteMail(string $uid, string $guest, string $token, s
 		}
 	}
 
-	private function composeShareMessage(Share\IShare $share, string $senderDisplayName, string $guestEmail, string $passwordLink, IL10N $l10n): array {
+	private function composeShareMessage(IShare $share, string $senderDisplayName, string $guestEmail, string $passwordLink, IL10N $l10n): array {
 		$filename = trim($share->getTarget(), '/');
 		$subject = $l10n->t('%s shared a file with you', [$senderDisplayName]);
 		$expiration = $share->getExpirationDate();

lib/RestrictionManager.php

@@ -17,7 +17,9 @@
 use OCP\IServerContainer;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\Server;
 use OCP\Settings\IManager;
+use OCP\Util;
 use Psr\Log\LoggerInterface;
 
 class RestrictionManager {
@@ -50,18 +52,18 @@ public function setupRestrictions(): void {
 		}
 
 		if ($this->guestManager->isGuest($user)) {
-			\OCP\Util::connectHook('OC_Filesystem', 'preSetup', $this->hooks, 'setupReadonlyFilesystem');
+			Util::connectHook('OC_Filesystem', 'preSetup', $this->hooks, 'setupReadonlyFilesystem');
 			if (!$this->config->allowExternalStorage()) {
 				$this->mountProviderCollection->registerMountFilter(fn (IMountPoint $mountPoint, IUser $user): bool => !($mountPoint instanceof ExternalMountPoint && $this->guestManager->isGuest($user)));
 			}
 
 			/** @var NavigationManager $navManager */
-			$navManager = \OCP\Server::get(INavigationManager::class);
+			$navManager = Server::get(INavigationManager::class);
 
-			$this->server->registerService(INavigationManager::class, fn (): \OCA\Guests\FilteredNavigationManager => new FilteredNavigationManager($user, $navManager, $this->whitelist));
+			$this->server->registerService(INavigationManager::class, fn (): FilteredNavigationManager => new FilteredNavigationManager($user, $navManager, $this->whitelist));
 
 			$settingsManager = $this->server->get(IManager::class);
-			$this->server->registerService(IManager::class, fn (): \OCA\Guests\FilteredSettingsManager => new FilteredSettingsManager($settingsManager, $this->whitelist));
+			$this->server->registerService(IManager::class, fn (): FilteredSettingsManager => new FilteredSettingsManager($settingsManager, $this->whitelist));
 		}
 	}
 

lib/Settings/Admin.php

@@ -9,9 +9,10 @@
 namespace OCA\Guests\Settings;
 
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Settings\ISettings;
 use OCP\Util;
 
-class Admin implements \OCP\Settings\ISettings {
+class Admin implements ISettings {
 	/**
 	 * {@inheritdoc}
 	 */

lib/Storage/DirMask.php

@@ -28,20 +28,17 @@ class DirMask extends PermissionsMask {
 	 */
 	private readonly int $pathLength;
 
-	private $mask;
-
 	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $mask, 'path' => $path]
+	 * @param array $parameters ['storage' => $storage, 'mask' => $mask, 'path' => $path]
 	 *
 	 * $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
 	 * $path: The path relative to the storage root that should be masked
 	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->path = rtrim((string)$arguments['path'], '/');
-		$this->pathLength = strlen((string)$arguments['path']);
-		$this->mask = $arguments['mask'];
+	public function __construct($parameters) {
+		parent::__construct($parameters);
+		$this->path = rtrim((string)$parameters['path'], '/');
+		$this->pathLength = strlen((string)$parameters['path']);
 	}
 
 	protected function checkPath(string $path): bool {