nextcloud / circles

lib/Db/MemberRequest.php

Spacing +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
 			$qb->limitToRemoteInstance($remoteInstance->getInstance(), true);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}

lib/Command/CirclesConfig.php

Spacing +2 added lines, -2 removed lines

@@ -182,8 +182,8 @@
 			$value = array_search(strtoupper($item), $valid);
 			if (!$value) {
 				throw new InvalidArgumentException(
-					'Invalid config \'' . $item . '\'. Available values: '
-					. implode(', ', array_values($valid)) . '. '
+					'Invalid config \''.$item.'\'. Available values: '
+					. implode(', ', array_values($valid)).'. '
 					. 'To disable a config, start the value with an underscore'
 				);
 			}

lib/FederatedItems/MemberAdd.php

Spacing +9 added lines, -9 removed lines

@@ -164,15 +164,15 @@ 
 		$initiatorHelper = new MemberHelper($initiator);
 		$initiatorHelper->mustBeModerator();
 
-		$federatedId = $member->getUserId() . '@' . $member->getInstance();
+		$federatedId = $member->getUserId().'@'.$member->getInstance();
 
 		try {
 			$federatedUser =
 				$this->federatedUserService->getFederatedUser($federatedId, $member->getUserType());
 		} catch (MemberNotFoundException $e) {
 			throw new MemberNotFoundException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s not found',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s not found',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		}
 
@@ -182,8 +182,8 @@ 
 			$knownMember = $this->memberRequest->searchMember($member);
 			// TODO: maybe member is requesting access
 			throw new MemberAlreadyExistsException(
-				ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' %s is already a member',
-				['member' => $member->getUserId() . '@' . $member->getInstance()]
+				ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' %s is already a member',
+				['member' => $member->getUserId().'@'.$member->getInstance()]
 			);
 		} catch (MemberNotFoundException $e) {
 		}
@@ -201,7 +201,7 @@ 
 
 		// TODO: check if it is a member or a mail or a circle and fix the returned message
 		$event->setReadingOutcome(
-			ucfirst(Member::$DEF_TYPE[$member->getUserType()]) . ' ' . '\'%s\' have been added to Circle',
+			ucfirst(Member::$DEF_TYPE[$member->getUserType()]).' '.'\'%s\' have been added to Circle',
 			['userId' => $member->getUserId()]
 		);
 
@@ -501,7 +501,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -653,7 +653,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -695,7 +695,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}

lib/Service/ConfigService.php

Doc Comments +2 added lines, -2 removed lines

@@ -172,7 +172,7 @@ 
 	/**
 	 * returns if this type of circle is allowed by the current configuration.
 	 *
-	 * @param $type
+	 * @param integer $type
 	 *
 	 * @return int
 	 */
@@ -509,7 +509,7 @@ 
 	/**
 	 * @param string $type
 	 *
-	 * @return array|bool|mixed
+	 * @return string
 	 * @throws GSStatusException
 	 */
 	public function getGSStatus(string $type = '') {

Spacing +6 added lines, -6 removed lines

@@ -254,7 +254,7 @@ 
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -524,7 +524,7 @@ 
 
 			if ($type !== self::GS_MOCKUP) {
 				throw new GSStatusException(
-					'GS and lookup are not configured : ' . $lookup . ', ' . $enabled
+					'GS and lookup are not configured : '.$lookup.', '.$enabled
 				);
 			}
 		}
@@ -593,7 +593,7 @@ 
 			}
 
 			if (array_key_exists('port', $local)) {
-				return $local['host'] . ':' . $local['port'];
+				return $local['host'].':'.$local['port'];
 			} else {
 				return $local['host'];
 			}
@@ -615,13 +615,13 @@ 
 	 * @return string
 	 */
 	public function getRemotePath(string $route = 'circles.Remote.appService', array $args = []): string {
-		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME) . '://' . $this->getLocalInstance();
+		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME).'://'.$this->getLocalInstance();
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 	/**
@@ -724,7 +724,7 @@ 
 			$ncBase = substr($ncBase, 0, -strlen($forcedPath));
 		}
 
-		return rtrim($ncBase, '/') . $link;
+		return rtrim($ncBase, '/').$link;
 	}
 
 }

lib/Service/ShareService.php

Doc Comments -1 removed lines

@@ -64,7 +64,6 @@
 
 	/**
 	 * @param Circle $circle
-	 * @param string $instance
 	 */
 	public function syncRemoteShares(Circle $circle) {
 		$event = new FederatedEvent(SharedItemsSync::class);