nextcloud / server

lib/private/Repair/RepairDavShares.php

Indentation +88 added lines, -88 removed lines

@@ -38,101 +38,101 @@
 use function urlencode;
 
 class RepairDavShares implements IRepairStep {
-	protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
+    protected const GROUP_PRINCIPAL_PREFIX = 'principals/groups/';
 
-	/** @var IConfig */
-	private $config;
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var LoggerInterface */
-	private $logger;
-	/** @var bool */
-	private $hintInvalidShares = false;
+    /** @var IConfig */
+    private $config;
+    /** @var IDBConnection */
+    private $dbc;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var bool */
+    private $hintInvalidShares = false;
 
-	public function __construct(
-		IConfig $config,
-		IDBConnection $dbc,
-		IGroupManager $groupManager,
-		LoggerInterface $logger
-	) {
-		$this->config = $config;
-		$this->dbc = $dbc;
-		$this->groupManager = $groupManager;
-		$this->logger = $logger;
-	}
+    public function __construct(
+        IConfig $config,
+        IDBConnection $dbc,
+        IGroupManager $groupManager,
+        LoggerInterface $logger
+    ) {
+        $this->config = $config;
+        $this->dbc = $dbc;
+        $this->groupManager = $groupManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getName() {
-		return 'Repair DAV shares';
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getName() {
+        return 'Repair DAV shares';
+    }
 
-	protected function repairUnencodedGroupShares() {
-		$qb = $this->dbc->getQueryBuilder();
-		$qb->select(['id', 'principaluri'])
-			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+    protected function repairUnencodedGroupShares() {
+        $qb = $this->dbc->getQueryBuilder();
+        $qb->select(['id', 'principaluri'])
+            ->from('dav_shares')
+            ->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
 
-		$updateQuery = $this->dbc->getQueryBuilder();
-		$updateQuery->update('dav_shares')
-			->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
-			->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
+        $updateQuery = $this->dbc->getQueryBuilder();
+        $updateQuery->update('dav_shares')
+            ->set('principaluri', $updateQuery->createParameter('updatedPrincipalUri'))
+            ->where($updateQuery->expr()->eq('id', $updateQuery->createParameter('shareId')));
 
-		$statement = $qb->execute();
-		while ($share = $statement->fetch()) {
-			$gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
-			$decodedGid = urldecode($gid);
-			$encodedGid = urlencode($gid);
-			if ($gid === $encodedGid
-				|| !$this->groupManager->groupExists($gid)
-				|| ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
-			) {
-				$this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
-				continue;
-			}
+        $statement = $qb->execute();
+        while ($share = $statement->fetch()) {
+            $gid = substr($share['principaluri'], strlen(self::GROUP_PRINCIPAL_PREFIX));
+            $decodedGid = urldecode($gid);
+            $encodedGid = urlencode($gid);
+            if ($gid === $encodedGid
+                || !$this->groupManager->groupExists($gid)
+                || ($gid !== $decodedGid && $this->groupManager->groupExists($decodedGid))
+            ) {
+                $this->hintInvalidShares = $this->hintInvalidShares || $gid !== $encodedGid;
+                continue;
+            }
 
-			// Repair when
-			// + the group name needs encoding
-			// + AND it is not encoded yet
-			// + AND there are no ambivalent groups
+            // Repair when
+            // + the group name needs encoding
+            // + AND it is not encoded yet
+            // + AND there are no ambivalent groups
 
-			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
-				$logParameters = [
-					'app' => 'core',
-					'id' => $share['id'],
-					'old' => $share['principaluri'],
-					'new' => $fixedPrincipal,
-				];
-				$updateQuery
-					->setParameter('updatedPrincipalUri', $fixedPrincipal)
-					->setParameter('shareId', $share['id'])
-					->execute();
-				$this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
-			} catch (Exception $e) {
-				$logParameters['message'] = $e->getMessage();
-				$logParameters['exception'] = $e;
-				$this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
-			}
-		}
-		return true;
-	}
+            try {
+                $fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+                $logParameters = [
+                    'app' => 'core',
+                    'id' => $share['id'],
+                    'old' => $share['principaluri'],
+                    'new' => $fixedPrincipal,
+                ];
+                $updateQuery
+                    ->setParameter('updatedPrincipalUri', $fixedPrincipal)
+                    ->setParameter('shareId', $share['id'])
+                    ->execute();
+                $this->logger->info('Repaired principal for dav share {id} from {old} to {new}', $logParameters);
+            } catch (Exception $e) {
+                $logParameters['message'] = $e->getMessage();
+                $logParameters['exception'] = $e;
+                $this->logger->info('Could not repair principal for dav share {id} from {old} to {new}: {message}', $logParameters);
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function run(IOutput $output) {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($versionFromBeforeUpdate, '20.0.7', '<')
-			&& $this->repairUnencodedGroupShares()
-		) {
-			$output->info('Repaired DAV group shares');
-			if ($this->hintInvalidShares) {
-				$output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
-			}
-		}
-	}
+    /**
+     * @inheritDoc
+     */
+    public function run(IOutput $output) {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($versionFromBeforeUpdate, '20.0.7', '<')
+            && $this->repairUnencodedGroupShares()
+        ) {
+            $output->info('Repaired DAV group shares');
+            if ($this->hintInvalidShares) {
+                $output->info('Invalid shares might be left in the database, running "occ dav:remove-invalid-shares" can remove them.');
+            }
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 		$qb = $this->dbc->getQueryBuilder();
 		$qb->select(['id', 'principaluri'])
 			->from('dav_shares')
-			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX . '%')));
+			->where($qb->expr()->like('principaluri', $qb->createNamedParameter(self::GROUP_PRINCIPAL_PREFIX.'%')));
 
 		$updateQuery = $this->dbc->getQueryBuilder();
 		$updateQuery->update('dav_shares')
@@ -100,7 +100,7 @@ 
 			// + AND there are no ambivalent groups
 
 			try {
-				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX . $encodedGid;
+				$fixedPrincipal = self::GROUP_PRINCIPAL_PREFIX.$encodedGid;
 				$logParameters = [
 					'app' => 'core',
 					'id' => $share['id'],

lib/private/Repair.php

Indentation +180 added lines, -180 removed lines

@@ -81,201 +81,201 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
+    /** @var IRepairStep[] */
+    private $repairSteps;
 
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	/** @var string */
-	private $currentStep;
+    /** @var string */
+    private $currentStep;
 
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-	}
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+    }
 
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', ['No repair steps available']);
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', ['No repair steps available']);
 
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
 
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
 
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
 
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new MoveAvatars(
-				\OC::$server->getJobList(),
-				\OC::$server->getConfig()
-			),
-			new CleanPreviews(
-				\OC::$server->getJobList(),
-				\OC::$server->getUserManager(),
-				\OC::$server->getConfig()
-			),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new InstallCoreBundle(
-				\OC::$server->query(BundleFetcher::class),
-				\OC::$server->getConfig(),
-				\OC::$server->query(Installer::class)
-			),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-			new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
-			\OC::$server->query(ResetGeneratedAvatarFlag::class),
-			\OC::$server->query(EncryptionLegacyCipher::class),
-			\OC::$server->query(EncryptionMigration::class),
-			\OC::$server->get(ShippedDashboardEnable::class),
-			\OC::$server->get(AddBruteForceCleanupJob::class),
-			\OC::$server->get(AddCheckForUserCertificatesJob::class),
-			\OC::$server->get(RepairDavShares::class)
-		];
-	}
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new MoveAvatars(
+                \OC::$server->getJobList(),
+                \OC::$server->getConfig()
+            ),
+            new CleanPreviews(
+                \OC::$server->getJobList(),
+                \OC::$server->getUserManager(),
+                \OC::$server->getConfig()
+            ),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new InstallCoreBundle(
+                \OC::$server->query(BundleFetcher::class),
+                \OC::$server->getConfig(),
+                \OC::$server->query(Installer::class)
+            ),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+            new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
+            \OC::$server->query(ResetGeneratedAvatarFlag::class),
+            \OC::$server->query(EncryptionLegacyCipher::class),
+            \OC::$server->query(EncryptionMigration::class),
+            \OC::$server->get(ShippedDashboardEnable::class),
+            \OC::$server->get(AddBruteForceCleanupJob::class),
+            \OC::$server->get(AddCheckForUserCertificatesJob::class),
+            \OC::$server->get(RepairDavShares::class)
+        ];
+    }
 
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-			\OC::$server->get(ValidatePhoneNumber::class),
-		];
-	}
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+            \OC::$server->get(ValidatePhoneNumber::class),
+        ];
+    }
 
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		/** @var Connection $connection */
-		$connection = \OC::$server->get(Connection::class);
-		/** @var ConnectionAdapter $connectionAdapter */
-		$connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connectionAdapter, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connectionAdapter, $config),
-			new DropAccountTermsTable($connectionAdapter),
-		];
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        /** @var Connection $connection */
+        $connection = \OC::$server->get(Connection::class);
+        /** @var ConnectionAdapter $connectionAdapter */
+        $connectionAdapter = \OC::$server->get(ConnectionAdapter::class);
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connectionAdapter, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connectionAdapter, $config),
+            new DropAccountTermsTable($connectionAdapter),
+        ];
 
-		return $steps;
-	}
+        return $steps;
+    }
 
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
 
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', [$string]);
-	}
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', [$string]);
+    }
 
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
 
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

apps/dav/lib/DAV/Sharing/Backend.php

Indentation +211 added lines, -211 removed lines

@@ -36,215 +36,215 @@
 
 class Backend {
 
-	/** @var IDBConnection */
-	private $db;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var Principal */
-	private $principalBackend;
-	/** @var string */
-	private $resourceType;
-
-	public const ACCESS_OWNER = 1;
-	public const ACCESS_READ_WRITE = 2;
-	public const ACCESS_READ = 3;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param Principal $principalBackend
-	 * @param string $resourceType
-	 */
-	public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
-		$this->db = $db;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->principalBackend = $principalBackend;
-		$this->resourceType = $resourceType;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string[] $add
-	 * @param string[] $remove
-	 */
-	public function updateShares(IShareable $shareable, array $add, array $remove) {
-		foreach ($add as $element) {
-			$principal = $this->principalBackend->findByUri($element['href'], '');
-			if ($principal !== '') {
-				$this->shareWith($shareable, $element);
-			}
-		}
-		foreach ($remove as $element) {
-			$principal = $this->principalBackend->findByUri($element, '');
-			if ($principal !== '') {
-				$this->unshare($shareable, $element);
-			}
-		}
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function shareWith($shareable, $element) {
-		$user = $element['href'];
-		$parts = explode(':', $user, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$principal = explode('/', $parts[1], 3);
-		if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
-			// Invalid principal
-			return;
-		}
-
-		$principal[2] = urldecode($principal[2]);
-		if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
-			($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
-			// User or group does not exist
-			return;
-		}
-
-		// remove the share if it already exists
-		$this->unshare($shareable, $element['href']);
-		$access = self::ACCESS_READ;
-		if (isset($element['readOnly'])) {
-			$access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($parts[1]),
-				'type' => $query->createNamedParameter($this->resourceType),
-				'access' => $query->createNamedParameter($access),
-				'resourceid' => $query->createNamedParameter($shareable->getResourceId())
-			]);
-		$query->execute();
-	}
-
-	/**
-	 * @param $resourceId
-	 */
-	public function deleteAllShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	public function deleteAllSharesByUser($principaluri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function unshare($shareable, $element) {
-		$parts = explode(':', $element, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
-		;
-		$query->execute();
-	}
-
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @param int $resourceId
-	 * @return array
-	 */
-	public function getShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['principaluri', 'access'])
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->groupBy(['principaluri', 'access'])
-			->execute();
-
-		$shares = [];
-		while ($row = $result->fetch()) {
-			$p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
-			$shares[] = [
-				'href' => "principal:${row['principaluri']}",
-				'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
-				'status' => 1,
-				'readOnly' => (int) $row['access'] === self::ACCESS_READ,
-				'{http://owncloud.org/ns}principal' => $row['principaluri'],
-				'{http://owncloud.org/ns}group-share' => is_null($p)
-			];
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * For shared resources the sharee is set in the ACL of the resource
-	 *
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		$shares = $this->getShares($resourceId);
-		foreach ($shares as $share) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-				'protected' => true,
-			];
-			if (!$share['readOnly']) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			} elseif ($this->resourceType === 'calendar') {
-				// Allow changing the properties of read only calendars,
-				// so users can change the visibility.
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			}
-		}
-		return $acl;
-	}
+    /** @var IDBConnection */
+    private $db;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var Principal */
+    private $principalBackend;
+    /** @var string */
+    private $resourceType;
+
+    public const ACCESS_OWNER = 1;
+    public const ACCESS_READ_WRITE = 2;
+    public const ACCESS_READ = 3;
+
+    /**
+     * @param IDBConnection $db
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param Principal $principalBackend
+     * @param string $resourceType
+     */
+    public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
+        $this->db = $db;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->principalBackend = $principalBackend;
+        $this->resourceType = $resourceType;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string[] $add
+     * @param string[] $remove
+     */
+    public function updateShares(IShareable $shareable, array $add, array $remove) {
+        foreach ($add as $element) {
+            $principal = $this->principalBackend->findByUri($element['href'], '');
+            if ($principal !== '') {
+                $this->shareWith($shareable, $element);
+            }
+        }
+        foreach ($remove as $element) {
+            $principal = $this->principalBackend->findByUri($element, '');
+            if ($principal !== '') {
+                $this->unshare($shareable, $element);
+            }
+        }
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function shareWith($shareable, $element) {
+        $user = $element['href'];
+        $parts = explode(':', $user, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $principal = explode('/', $parts[1], 3);
+        if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
+            // Invalid principal
+            return;
+        }
+
+        $principal[2] = urldecode($principal[2]);
+        if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
+            ($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
+            // User or group does not exist
+            return;
+        }
+
+        // remove the share if it already exists
+        $this->unshare($shareable, $element['href']);
+        $access = self::ACCESS_READ;
+        if (isset($element['readOnly'])) {
+            $access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($parts[1]),
+                'type' => $query->createNamedParameter($this->resourceType),
+                'access' => $query->createNamedParameter($access),
+                'resourceid' => $query->createNamedParameter($shareable->getResourceId())
+            ]);
+        $query->execute();
+    }
+
+    /**
+     * @param $resourceId
+     */
+    public function deleteAllShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    public function deleteAllSharesByUser($principaluri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function unshare($shareable, $element) {
+        $parts = explode(':', $element, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
+        ;
+        $query->execute();
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @param int $resourceId
+     * @return array
+     */
+    public function getShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['principaluri', 'access'])
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->groupBy(['principaluri', 'access'])
+            ->execute();
+
+        $shares = [];
+        while ($row = $result->fetch()) {
+            $p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
+            $shares[] = [
+                'href' => "principal:${row['principaluri']}",
+                'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
+                'status' => 1,
+                'readOnly' => (int) $row['access'] === self::ACCESS_READ,
+                '{http://owncloud.org/ns}principal' => $row['principaluri'],
+                '{http://owncloud.org/ns}group-share' => is_null($p)
+            ];
+        }
+
+        return $shares;
+    }
+
+    /**
+     * For shared resources the sharee is set in the ACL of the resource
+     *
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        $shares = $this->getShares($resourceId);
+        foreach ($shares as $share) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                'protected' => true,
+            ];
+            if (!$share['readOnly']) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            } elseif ($this->resourceType === 'calendar') {
+                // Allow changing the properties of read only calendars,
+                // so users can change the visibility.
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            }
+        }
+        return $acl;
+    }
 }