nextcloud / circles

lib/Db/MembersRequest.php

Doc Comments +8 added lines, -3 removed lines

@@ -300,7 +300,7 @@ 
 	 * returns the index of a specific UserID in a Members List
 	 *
 	 * @param array $members
-	 * @param $userId
+	 * @param string $userId
 	 *
 	 * @return int
 	 */
@@ -631,12 +631,19 @@ 
 	}
 
 
+	/**
+	 * @param string $groupId
+	 */
 	public function unlinkAllFromGroup($groupId) {
 		$qb = $this->getGroupsDeleteSql($groupId);
 		$qb->execute();
 	}
 
 
+	/**
+	 * @param string $circleId
+	 * @param string $groupId
+	 */
 	public function unlinkFromGroup($circleId, $groupId) {
 		$qb = $this->getGroupsDeleteSql($groupId);
 		$this->limitToCircleId($qb, $circleId);
@@ -674,8 +681,6 @@ 
 	/**
 	 * @param string $circleId
 	 * @param string $contactId
-	 * @param string $userId
-	 * @param int $type
 	 *
 	 * @return Member
 	 * @throws MemberDoesNotExistException

lib/AppInfo/Application.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Util;
 
-require_once __DIR__ . '/../../appinfo/autoload.php';
+require_once __DIR__.'/../../appinfo/autoload.php';
 
 
 class Application extends App {
@@ -245,9 +245,9 @@ 
 		$this->dispatcher->addListener('\OCA\Circles::onLinkRemove', [$groupsBackendService, 'onLinkRemove']);
 		$this->dispatcher->addListener('\OCA\Circles::onSettingsChange', [$groupsBackendService, 'onSettingsChange']);
 
-		$this->dispatcher->addListener(IGroup::class . '::postAddUser', [$groupsBackendService, 'onGroupPostAddUser']);
-		$this->dispatcher->addListener(IGroup::class . '::postRemoveUser', [$groupsBackendService, 'onGroupPostRemoveUser']);
-		$this->dispatcher->addListener(IGroup::class . '::postDelete', [$groupsBackendService, 'onGroupPostDelete']);
+		$this->dispatcher->addListener(IGroup::class.'::postAddUser', [$groupsBackendService, 'onGroupPostAddUser']);
+		$this->dispatcher->addListener(IGroup::class.'::postRemoveUser', [$groupsBackendService, 'onGroupPostRemoveUser']);
+		$this->dispatcher->addListener(IGroup::class.'::postDelete', [$groupsBackendService, 'onGroupPostDelete']);
 	}
 
 }

lib/Model/BaseCircle.php

Spacing +2 added lines, -2 removed lines

@@ -315,7 +315,7 @@ 
 	 * @return BaseCircle
 	 */
 	public function setGroupId($groupId) {
-		$this->groupId = (string) $groupId;
+		$this->groupId = (string)$groupId;
 
 		return $this;
 	}
@@ -324,7 +324,7 @@ 
 	 * @return string
 	 */
 	public function getGroupId() {
-		return (string) $this->groupId;
+		return (string)$this->groupId;
 	}
 
 	/**

lib/Activity/ProviderParser.php

Spacing +4 added lines, -4 removed lines

@@ -152,7 +152,7 @@ 
 				continue;
 			}
 
-			$replace['{' . $k . '}'] = $data[$k]['_parsed'];
+			$replace['{'.$k.'}'] = $data[$k]['_parsed'];
 		}
 
 		$line = strtr($line, $replace);
@@ -316,7 +316,7 @@ 
 		return [
 			'type'    => $member->getTypeName(),
 			'id'      => $member->getUserId(),
-			'name'    => $member->getDisplayName() . ' (' . $member->getTypeString() . ')',
+			'name'    => $member->getDisplayName().' ('.$member->getTypeString().')',
 			'_parsed' => $member->getDisplayName()
 		];
 	}
@@ -352,8 +352,8 @@ 
 		return [
 			'type'    => 'circle',
 			'id'      => $link->getUniqueId(),
-			'name'    => $link->getToken() . '@' . $link->getAddress(),
-			'_parsed' => $link->getToken() . '@' . $link->getAddress()
+			'name'    => $link->getToken().'@'.$link->getAddress(),
+			'_parsed' => $link->getToken().'@'.$link->getAddress()
 		];
 	}
 

lib/Service/EventsService.php

Spacing +22 added lines, -22 removed lines

@@ -124,7 +124,7 @@ 
 			);
 		}
 
-		$this->dispatch('\OCA\Circles::onCircleCreation',  ['circle' => $circle]);
+		$this->dispatch('\OCA\Circles::onCircleCreation', ['circle' => $circle]);
 	}
 
 
@@ -151,7 +151,7 @@ 
 			)
 		);
 
-		$this->dispatch('\OCA\Circles::onCircleDestruction',  ['circle' => $circle]);
+		$this->dispatch('\OCA\Circles::onCircleDestruction', ['circle' => $circle]);
 	}
 
 
@@ -196,7 +196,7 @@ 
 				  )
 		);
 
-		$this->dispatch('\OCA\Circles::onMemberNew',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberNew', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -252,7 +252,7 @@ 
 					  )
 				  )
 		);
-		$this->dispatch('\OCA\Circles::onMemberInvited',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberInvited', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -284,7 +284,7 @@ 
 					  )
 				  )
 		);
-		$this->dispatch('\OCA\Circles::onMemberRequesting',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberRequesting', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -318,7 +318,7 @@ 
 				  )
 		);
 
-		$this->dispatch('\OCA\Circles::onMemberLeaving',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberLeaving', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -351,7 +351,7 @@ 
 		$this->membersRequest->avoidDuplicateMembers($mods, [$member]);
 
 		$this->publishEvent($event, $mods);
-		$this->dispatch('\OCA\Circles::onMemberLevel',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberLevel', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -376,7 +376,7 @@ 
 				$circle->getUniqueId(), Member::LEVEL_MEMBER, true
 			)
 		);
-		$this->dispatch('\OCA\Circles::onMemberOwner',  ['circle' => $circle, 'member' => $member]);
+		$this->dispatch('\OCA\Circles::onMemberOwner', ['circle' => $circle, 'member' => $member]);
 	}
 
 
@@ -409,7 +409,7 @@ 
 		);
 
 		$this->publishEvent($event, $mods);
-		$this->dispatch('\OCA\Circles::onGroupLink',  ['circle' => $circle, 'group' => $group]);
+		$this->dispatch('\OCA\Circles::onGroupLink', ['circle' => $circle, 'group' => $group]);
 	}
 
 
@@ -442,7 +442,7 @@ 
 		);
 
 		$this->publishEvent($event, $mods);
-		$this->dispatch('\OCA\Circles::onGroupUnlink',  ['circle' => $circle, 'group' => $group]);
+		$this->dispatch('\OCA\Circles::onGroupUnlink', ['circle' => $circle, 'group' => $group]);
 	}
 
 
@@ -475,7 +475,7 @@ 
 		);
 
 		$this->publishEvent($event, $mods);
-		$this->dispatch('\OCA\Circles::onGroupLevel',  ['circle' => $circle, 'group' => $group]);
+		$this->dispatch('\OCA\Circles::onGroupLevel', ['circle' => $circle, 'group' => $group]);
 	}
 
 
@@ -500,7 +500,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestSent',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestSent', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -525,7 +525,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestReceived',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestReceived', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -550,7 +550,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestRejected',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestRejected', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -575,7 +575,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestCanceled',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestCanceled', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -600,7 +600,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestAccepted',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestAccepted', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -625,7 +625,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRequestAccepting',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRequestAccepting', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -650,7 +650,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkUp',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkUp', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -675,7 +675,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkDown',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkDown', ['circle' => $circle, 'link' => $link]);
 	}
 
 
@@ -712,7 +712,7 @@ 
 			$link->getCircleId(), Member::LEVEL_MODERATOR, true
 		)
 		);
-		$this->dispatch('\OCA\Circles::onLinkRemove',  ['circle' => $circle, 'link' => $link]);
+		$this->dispatch('\OCA\Circles::onLinkRemove', ['circle' => $circle, 'link' => $link]);
 	}
 
 	/**
@@ -724,7 +724,7 @@ 
 	 * @param array  $oldSettings
 	 */
 	public function onSettingsChange(Circle $circle, array $oldSettings = []) {
-		$this->dispatch('\OCA\Circles::onSettingsChange',  ['circle' => $circle, 'oldSettings' => $oldSettings]);
+		$this->dispatch('\OCA\Circles::onSettingsChange', ['circle' => $circle, 'oldSettings' => $oldSettings]);
 	}
 
 
@@ -775,7 +775,7 @@ 
 	 * @param array $arguments
 	 */
 	private function dispatch($context, $arguments) {
-		$this->eventDispatcher->dispatch($context, new GenericEvent(null,$arguments));
+		$this->eventDispatcher->dispatch($context, new GenericEvent(null, $arguments));
 	}
 
 }

lib/Service/GroupsBackendService.php

Spacing +22 added lines, -22 removed lines

@@ -157,7 +157,7 @@ 
 			}
 		}
 
-		$this->miscService->log('onCircleCreation: '. json_encode($this->circle), 1);
+		$this->miscService->log('onCircleCreation: '.json_encode($this->circle), 1);
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 			$this->group->delete();
 		}
 
-		$this->miscService->log('onCircleDestruction: '. json_encode($this->circle), 1);
+		$this->miscService->log('onCircleDestruction: '.json_encode($this->circle), 1);
 	}
 
 	/**
@@ -192,21 +192,21 @@ 
 			}
 		}
 
-		$this->miscService->log('onMemberNew: '. json_encode($this->circle).json_encode($this->member), 1);
+		$this->miscService->log('onMemberNew: '.json_encode($this->circle).json_encode($this->member), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onMemberInvited(GenericEvent $event) {
-		$this->miscService->log('onMemberInvited: '. json_encode($event), 1);
+		$this->miscService->log('onMemberInvited: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onMemberRequesting(GenericEvent $event) {
-		$this->miscService->log('onMemberRequesting: '. json_encode($event), 1);
+		$this->miscService->log('onMemberRequesting: '.json_encode($event), 1);
 	}
 
 	/**
@@ -226,105 +226,105 @@ 
 			}
 		}
 
-		$this->miscService->log('onMemberLeaving: '. json_encode($this->circle).json_encode($this->member), 1);
+		$this->miscService->log('onMemberLeaving: '.json_encode($this->circle).json_encode($this->member), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onMemberLevel(GenericEvent $event) {
-		$this->miscService->log('onMemberLevel: '. json_encode($event), 1);
+		$this->miscService->log('onMemberLevel: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onMemberOwner(GenericEvent $event) {
-		$this->miscService->log('onMemberOwner: '. json_encode($event), 1);
+		$this->miscService->log('onMemberOwner: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onGroupLink(GenericEvent $event) {
-		$this->miscService->log('onGroupLink: '. json_encode($event), 1);
+		$this->miscService->log('onGroupLink: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onGroupUnlink(GenericEvent $event) {
-		$this->miscService->log('onGroupUnlink: '. json_encode($event), 1);
+		$this->miscService->log('onGroupUnlink: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onGroupLevel(GenericEvent $event) {
-		$this->miscService->log('onGroupLevel: '. json_encode($event), 1);
+		$this->miscService->log('onGroupLevel: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestSent(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestSent: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestSent: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestReceived(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestReceived: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestReceived: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestRejected(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestRejected: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestRejected: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestCanceled(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestCanceled: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestCanceled: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestAccepted(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestAccepted: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestAccepted: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRequestAccepting(GenericEvent $event) {
-		$this->miscService->log('onLinkRequestAccepting: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRequestAccepting: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkUp(GenericEvent $event) {
-		$this->miscService->log('onLinkUp: '. json_encode($event), 1);
+		$this->miscService->log('onLinkUp: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkDown(GenericEvent $event) {
-		$this->miscService->log('onLinkDown: '. json_encode($event), 1);
+		$this->miscService->log('onLinkDown: '.json_encode($event), 1);
 	}
 
 	/**
 	 * @param GenericEvent $event
 	 */
 	public function onLinkRemove(GenericEvent $event) {
-		$this->miscService->log('onLinkRemove: '. json_encode($event), 1);
+		$this->miscService->log('onLinkRemove: '.json_encode($event), 1);
 	}
 
 	/**
@@ -340,7 +340,7 @@ 
 
 		$this->setCircleGroupName($this->getCircleGroupName());
 
-		$this->miscService->log('onSettingsChange: '. json_encode($this->circle).json_encode($oldSettings), 1);
+		$this->miscService->log('onSettingsChange: '.json_encode($this->circle).json_encode($oldSettings), 1);
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 	protected function setCircleGroupName($displayName)
 	{
 		if ($this->group && method_exists($this->group, 'setDisplayName')) {
-			$this->miscService->log('setCircleGroupName: '. json_encode($displayName), 1);
+			$this->miscService->log('setCircleGroupName: '.json_encode($displayName), 1);
 			return $this->group->setDisplayName($displayName);
 		}
 

lib/Service/CirclesService.php

Spacing +6 added lines, -6 removed lines

@@ -532,24 +532,24 @@ 
 		switch ($type) {
 			case Circle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
 				);
 			case Circle::CIRCLES_CLOSED:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
 				);
 			case Circle::CIRCLES_SECRET:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
 				);
 			case Circle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
 				);
 		}
 
 		return $urlGen->getAbsoluteURL(
-			$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
+			$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
 		);
 	}
 
@@ -585,7 +585,7 @@ 
 			$circle->getUniqueId(), Member::LEVEL_MEMBER, true
 		);
 
-		$limit = (int) $circle->getSetting('members_limit');
+		$limit = (int)$circle->getSetting('members_limit');
 		if ($limit === -1) {
 			return;
 		}

lib/Service/GroupsService.php

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
 				$count++;
 			}
 
-			$limit = (int) $circle->getSetting('members_limit');
+			$limit = (int)$circle->getSetting('members_limit');
 			if ($limit === 0) {
 				$limit = $this->configService->getAppValue(ConfigService::CIRCLES_MEMBERS_LIMIT);
 			}

lib/Service/ConfigService.php

Spacing +3 added lines, -3 removed lines

@@ -277,7 +277,7 @@ 
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -467,7 +467,7 @@ 
 	 */
 	public function getGroupBackendNamePrefix() {
 		if ($this->groupBackendNamePrefix === null && $this->isGroupsBackend()) {
-			$this->groupBackendNamePrefix = ltrim((string) $this->getAppValue(self::CIRCLES_GROUP_BACKEND_NAME_PREFIX));
+			$this->groupBackendNamePrefix = ltrim((string)$this->getAppValue(self::CIRCLES_GROUP_BACKEND_NAME_PREFIX));
 		}
 
 		return $this->groupBackendNamePrefix;
@@ -482,7 +482,7 @@ 
 		if ($this->groupBackendNameSuffix === null && $this->isGroupsBackend()) {
 			$l = OC::$server->getL10N('circles');
 			$defaultSuffix = ' '.$l->t('Circle');
-			$customSuffix = (string) $this->getAppValue(self::CIRCLES_GROUP_BACKEND_NAME_SUFFIX);
+			$customSuffix = (string)$this->getAppValue(self::CIRCLES_GROUP_BACKEND_NAME_SUFFIX);
 			$this->groupBackendNameSuffix = rtrim($customSuffix ?: $defaultSuffix);
 		}