Add rector and apply it

composer.json

@@ -42,7 +42,8 @@
       "@test:unit"
     ],
     "test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
-    "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './tests/stubs/*' -print0 | xargs -0 -n1 php -l"
+    "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './tests/stubs/*' -print0 | xargs -0 -n1 php -l",
+    "rector": "rector && composer cs:fix"
   },
   "require-dev": {
     "nextcloud/ocp": "dev-master",

lib/Api/v1/Circles.php

@@ -23,6 +23,7 @@
 use OCA\Circles\Service\CircleService;
 use OCA\Circles\Service\FederatedUserService;
 use OCA\Circles\Service\ShareWrapperService;
+use OCP\Server;
 
 class Circles {
 	public const API_VERSION = [0, 10, 0];
@@ -66,7 +67,7 @@ class Circles {
 	 */
 	public static function listCircles($type, $name = '', $level = 0, $userId = '', $forceAll = false) {
 		/** @var FederatedUserService $federatedUserService */
-		$federatedUserService = \OC::$server->get(FederatedUserService::class);
+		$federatedUserService = Server::get(FederatedUserService::class);
 
 		$personalCircle = false;
 		if ($forceAll) {
@@ -80,7 +81,7 @@ public static function listCircles($type, $name = '', $level = 0, $userId = '',
 		}
 
 		/** @var CircleService $circleService */
-		$circleService = \OC::$server->get(CircleService::class);
+		$circleService = Server::get(CircleService::class);
 
 		$probe = new CircleProbe();
 		$probe->includePersonalCircles($personalCircle);
@@ -110,7 +111,7 @@ public static function listCircles($type, $name = '', $level = 0, $userId = '',
 	 */
 	public static function joinedCircles($userId = '', $forceAll = false) {
 		/** @var FederatedUserService $federatedUserService */
-		$federatedUserService = \OC::$server->get(FederatedUserService::class);
+		$federatedUserService = Server::get(FederatedUserService::class);
 
 		$personalCircle = false;
 		if ($forceAll) {
@@ -124,7 +125,7 @@ public static function joinedCircles($userId = '', $forceAll = false) {
 		}
 
 		/** @var CircleService $circleService */
-		$circleService = \OC::$server->get(CircleService::class);
+		$circleService = Server::get(CircleService::class);
 
 		$probe = new CircleProbe();
 		$probe->mustBeMember();
@@ -163,15 +164,15 @@ public static function joinedCircles($userId = '', $forceAll = false) {
 	 */
 	public static function detailsCircle(string $circleUniqueId, bool $forceAll = false): Circle {
 		/** @var FederatedUserService $federatedUserService */
-		$federatedUserService = \OC::$server->get(FederatedUserService::class);
+		$federatedUserService = Server::get(FederatedUserService::class);
 		if ($forceAll || \OC::$CLI) {
 			$federatedUserService->bypassCurrentUserCondition(true);
 		} else {
 			$federatedUserService->initCurrentUser();
 		}
 
 		/** @var CircleService $circleService */
-		$circleService = \OC::$server->get(CircleService::class);
+		$circleService = Server::get(CircleService::class);
 
 		return $circleService->getCircle($circleUniqueId);
 	}
@@ -195,7 +196,7 @@ public static function detailsCircle(string $circleUniqueId, bool $forceAll = fa
 	 */
 	public static function getMember($circleUniqueId, $ident, $type, $forceAll = false) {
 		/** @var CirclesManager $circlesManager */
-		$circlesManager = \OC::$server->get(CirclesManager::class);
+		$circlesManager = Server::get(CirclesManager::class);
 		$federatedUser = $circlesManager->getFederatedUser($ident, $type);
 
 		return $circlesManager->getLink($circleUniqueId, $federatedUser->getSingleId());
@@ -216,9 +217,9 @@ public static function getMember($circleUniqueId, $ident, $type, $forceAll = fal
 	 */
 	public static function getFilesForCircles(array $circleUniqueIds): array {
 		try {
-			$circleService = \OC::$server->get(CircleService::class);
-			$federatedUserService = \OC::$server->get(FederatedUserService::class);
-			$shareWrapperService = \OC::$server->get(ShareWrapperService::class);
+			$circleService = Server::get(CircleService::class);
+			$federatedUserService = Server::get(FederatedUserService::class);
+			$shareWrapperService = Server::get(ShareWrapperService::class);
 
 			$federatedUserService->initCurrentUser();
 		} catch (\Exception $e) {

lib/Circles/FileSharingBroadcaster.php

@@ -34,6 +34,7 @@
 use OCP\IUserManager;
 use OCP\Mail\IEMailTemplate;
 use OCP\Mail\IMailer;
+use OCP\Server;
 use OCP\Share\Exceptions\IllegalIDChangeException;
 use OCP\Share\IShare;
 use OCP\Util;
@@ -101,26 +102,26 @@ public function init() {
 
 		$this->initiated = true;
 		$this->l10n = OC::$server->getL10N(Application::APP_ID);
-		$this->mailer = OC::$server->getMailer();
-		$this->rootFolder = OC::$server->getLazyRootFolder();
-		$this->userManager = OC::$server->getUserManager();
-		$this->federationCloudIdManager = OC::$server->getCloudIdManager();
-		$this->logger = \OCP\Server::get(LoggerInterface::class);
-		$this->urlGenerator = OC::$server->getURLGenerator();
+		$this->mailer = Server::get(IMailer::class);
+		$this->rootFolder = Server::get(IRootFolder::class);
+		$this->userManager = Server::get(IUserManager::class);
+		$this->federationCloudIdManager = Server::get(ICloudIdManager::class);
+		$this->logger = Server::get(LoggerInterface::class);
+		$this->urlGenerator = Server::get(IURLGenerator::class);
 		try {
-			$this->defaults = OC::$server->query(Defaults::class);
-			$this->fileSharesRequest = OC::$server->query(FileSharesRequest::class);
-			$this->tokensRequest = OC::$server->query(TokensRequest::class);
-			$this->configService = OC::$server->query(ConfigService::class);
-			$this->miscService = OC::$server->query(MiscService::class);
+			$this->defaults = Server::get(Defaults::class);
+			$this->fileSharesRequest = Server::get(FileSharesRequest::class);
+			$this->tokensRequest = Server::get(TokensRequest::class);
+			$this->configService = Server::get(ConfigService::class);
+			$this->miscService = Server::get(MiscService::class);
 		} catch (QueryException $e) {
 			OC::$server->getLogger()
 				->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
 		}
 
 		try {
 			$this->federationNotifications =
-				OC::$server->query(Notifications::class);
+				Server::get(Notifications::class);
 			$this->federatedEnabled = true;
 		} catch (QueryException $e) {
 		}
@@ -509,7 +510,7 @@ protected function sendPasswordByMail(IShare $share, $circleName, $email, $passw
 				$instanceName
 			]
 		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
 			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
@@ -655,7 +656,7 @@ protected function sendPasswordExistingShares(DeprecatedMember $author, string $
 			]
 		);
 
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+		$message->setFrom([Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
 			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());

lib/Command/CirclesTest.php

@@ -27,6 +27,7 @@
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCA\Circles\Tools\Traits\TDeserialize;
 use OCA\Circles\Tools\Traits\TStringTools;
+use OCP\Server;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -136,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		// loading CirclesManager
 		/** @var CirclesManager $circlesManager */
-		$circlesManager = \OC::$server->get(CirclesManager::class);
+		$circlesManager = Server::get(CirclesManager::class);
 		//		$circlesManager->startSuperSession();
 
 

lib/Db/CoreQueryBuilder.php

@@ -12,7 +12,6 @@
 namespace OCA\Circles\Db;
 
 use Doctrine\DBAL\Query\QueryBuilder;
-use OC;
 use OCA\Circles\Exceptions\RequestBuilderException;
 use OCA\Circles\IFederatedModel;
 use OCA\Circles\IFederatedUser;
@@ -26,6 +25,7 @@
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCP\DB\QueryBuilder\ICompositeExpression;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Server;
 
 /**
  * Class CoreQueryBuilder
@@ -223,7 +223,7 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
 	public function __construct() {
 		parent::__construct();
 
-		$this->configService = OC::$server->get(ConfigService::class);
+		$this->configService = Server::get(ConfigService::class);
 	}
 
 

lib/Db/CoreRequestBuilder.php

@@ -18,6 +18,7 @@
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Service\TimezoneService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\Server;
 use OCP\Share\IShare;
 
 /**
@@ -267,7 +268,7 @@ public function uninstall(): void {
 	 * this just empty all tables from the app.
 	 */
 	public function uninstallAppTables() {
-		$dbConn = \OC::$server->get(Connection::class);
+		$dbConn = Server::get(Connection::class);
 		$schema = new SchemaWrapper($dbConn);
 
 		foreach (array_keys(self::$tables) as $table) {

lib/Db/TokensRequest.php

@@ -12,6 +12,8 @@
 use OCA\Circles\Exceptions\TokenDoesNotExistException;
 use OCA\Circles\Model\DeprecatedMember;
 use OCA\Circles\Model\SharesToken;
+use OCP\Security\IHasher;
+use OCP\Server;
 
 /**
  * @deprecated
@@ -100,7 +102,7 @@ public function generateTokenForMember(DeprecatedMember $member, int $shareId, s
 			$token = $this->miscService->token(15);
 
 			if ($password !== '') {
-				$hasher = \OC::$server->getHasher();
+				$hasher = Server::get(IHasher::class);
 				$password = $hasher->hash($password);
 			}
 
@@ -147,7 +149,7 @@ public function updateSinglePassword(string $circleId, string $password) {
 		$qb = $this->getTokensUpdateSql();
 
 		if ($password !== '') {
-			$hasher = \OC::$server->getHasher();
+			$hasher = Server::get(IHasher::class);
 			$password = $hasher->hash($password);
 		}
 

lib/Model/Circle.php

@@ -33,6 +33,7 @@
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCA\Circles\Tools\Traits\TDeserialize;
 use OCP\Security\IHasher;
+use OCP\Server;
 
 /**
  * Class Circle
@@ -905,9 +906,9 @@ public function importFromDatabase(array $data, string $prefix = ''): IQueryRow
 		$curr = $this->get('password_single', $this->getSettings());
 		if (strlen($curr) >= 1 && strlen($curr) < 64) {
 			/** @var IHasher $hasher */
-			$hasher = \OC::$server->get(IHasher::class);
+			$hasher = Server::get(IHasher::class);
 			/** @var CircleRequest $circleRequest */
-			$circleRequest = \OC::$server->get(CircleRequest::class);
+			$circleRequest = Server::get(CircleRequest::class);
 
 			$new = $hasher->hash($curr);
 			$settings = $this->getSettings();

lib/Model/ManagedModel.php

@@ -11,8 +11,8 @@
 
 namespace OCA\Circles\Model;
 
-use OC;
 use OCA\Circles\IFederatedUser;
+use OCP\Server;
 
 /**
  * Class ManagedModel
@@ -32,7 +32,7 @@ class ManagedModel {
 	 */
 	protected function getManager(): ModelManager {
 		if ($this->modelManager === null) {
-			$this->modelManager = OC::$server->get(ModelManager::class);
+			$this->modelManager = Server::get(ModelManager::class);
 		}
 
 		return $this->modelManager;

lib/Model/ShareWrapper.php

@@ -13,7 +13,6 @@
 
 use DateTime;
 use JsonSerializable;
-use OC;
 use OC\Files\Cache\Cache;
 use OC\Share20\Share;
 use OC\Share20\ShareAttributes;
@@ -24,10 +23,12 @@
 use OCA\Circles\Tools\IDeserializable;
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCA\Circles\Tools\Traits\TDeserialize;
+use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
+use OCP\Server;
 use OCP\Share\Exceptions\IllegalIDChangeException;
 use OCP\Share\IAttributes;
 use OCP\Share\IShare;
@@ -422,7 +423,7 @@ public function getShare(
 				return null;
 			}
 			$share->setNodeCacheEntry(
-				Cache::cacheEntryFromData($this->getFileCache()->toCache(), OC::$server->getMimeTypeLoader())
+				Cache::cacheEntryFromData($this->getFileCache()->toCache(), Server::get(IMimeTypeLoader::class))
 			);
 		} elseif ($nullOnMissingFileCache) {
 			return null;
@@ -447,7 +448,7 @@ private function setShareDisplay(IShare $share, IURLGenerator $urlGenerator): vo
 
 		$display = $circle->getDisplayName();
 		if ($circle->getSource() === Member::TYPE_CIRCLE) {
-			$l10n = \OCP\Server::get(IFactory::class)->get('circles');
+			$l10n = Server::get(IFactory::class)->get('circles');
 			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]);
 		} else {
 			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';

lib/Search/Contacts.php

@@ -11,14 +11,16 @@
 use OCA\Circles\Model\DeprecatedMember;
 use OCA\Circles\Model\SearchResult;
 use OCA\Circles\Service\MiscService;
+use OCP\Contacts\IManager;
+use OCP\Server;
 
 class Contacts implements ISearch {
 	/**
 	 * {@inheritdoc}
 	 */
 	public function search($needle): array {
 		$result = [];
-		$contactManager = \OC::$server->getContactsManager();
+		$contactManager = Server::get(IManager::class);
 
 		// Add 'ADR' to search also in the address
 		$contacts = $contactManager->search($needle, ['FN', 'ORG', 'EMAIL']);

lib/Search/LocalGroups.php

@@ -10,14 +10,16 @@
 use OCA\Circles\ISearch;
 use OCA\Circles\Model\DeprecatedMember;
 use OCA\Circles\Model\SearchResult;
+use OCP\IGroupManager;
+use OCP\Server;
 
 class LocalGroups implements ISearch {
 	/**
 	 * {@inheritdoc}
 	 */
 	public function search($needle): array {
 		$result = [];
-		$groupManager = \OC::$server->getGroupManager();
+		$groupManager = Server::get(IGroupManager::class);
 
 		$groups = $groupManager->search($needle);
 		foreach ($groups as $group) {

lib/Search/LocalUsers.php

@@ -13,6 +13,8 @@
 use OCA\Circles\Service\ConfigService;
 use OCA\Circles\Tools\Traits\TArrayTools;
 use OCP\Collaboration\Collaborators\ISearch as ICollaboratorSearch;
+use OCP\IUserManager;
+use OCP\Server;
 use OCP\Share\IShare;
 
 class LocalUsers implements ISearch {
@@ -46,7 +48,7 @@ public function __construct(
 	 */
 	public function search($needle): array {
 		$result = [];
-		$userManager = \OC::$server->getUserManager();
+		$userManager = Server::get(IUserManager::class);
 
 		if ($this->configService->getAppValue(ConfigService::CIRCLES_SEARCH_FROM_COLLABORATOR) === '1') {
 			return $this->searchFromCollaborator($needle);