Completed
Pull Request — master (#246)
by Joas
12:22
created
lib/Service/FederatedLinkService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@
 block discarded – undo
217 217
 	 * @return string
218 218
 	 */
219 219
 	public function generateLinkRemoteURL($remote) {
220
-		return $this->configService->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
220
+		return $this->configService->generateRemoteHost($remote).self::REMOTE_URL_LINK;
221 221
 	}
222 222
 
223 223
 
Please login to merge, or discard this patch.
lib/Service/MembersService.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
 			return;
297 297
 		}
298 298
 
299
-		$tmpContact = $this->userId . ':' . $ident;
299
+		$tmpContact = $this->userId.':'.$ident;
300 300
 		try {
301 301
 			MiscService::getContactData($tmpContact);
302 302
 		} catch (Exception $e) {
Please login to merge, or discard this patch.
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @param $ident
110 110
 	 * @param int $type
111 111
 	 *
112
-	 * @return array
112
+	 * @return Member[]
113 113
 	 * @throws \Exception
114 114
 	 */
115 115
 	public function addMember($circleUniqueId, $ident, $type) {
@@ -258,8 +258,8 @@  discard block
 block discarded – undo
258 258
 	/**
259 259
 	 * Verify if a local account is valid.
260 260
 	 *
261
-	 * @param $ident
262
-	 * @param $type
261
+	 * @param string $ident
262
+	 * @param integer $type
263 263
 	 *
264 264
 	 * @throws NoUserException
265 265
 	 */
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 * Verify if a mail have a valid format.
281 281
 	 *
282 282
 	 * @param $ident
283
-	 * @param $type
283
+	 * @param integer $type
284 284
 	 *
285 285
 	 * @throws EmailAccountInvalidFormatException
286 286
 	 */
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 	 * Verify if a contact exist in current user address books.
302 302
 	 *
303 303
 	 * @param $ident
304
-	 * @param $type
304
+	 * @param integer $type
305 305
 	 *
306 306
 	 * @throws NoUserException
307 307
 	 */
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 * @param int $type
386 386
 	 * @param int $level
387 387
 	 *
388
-	 * @return array
388
+	 * @return Member[]
389 389
 	 * @throws \Exception
390 390
 	 */
391 391
 	public function levelMember($circleUniqueId, $name, $type, $level) {
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	/**
417 417
 	 * @param Circle $circle
418 418
 	 * @param Member $member
419
-	 * @param $level
419
+	 * @param integer $level
420 420
 	 *
421 421
 	 * @throws Exception
422 422
 	 */
@@ -489,9 +489,9 @@  discard block
 block discarded – undo
489 489
 	/**
490 490
 	 * @param string $circleUniqueId
491 491
 	 * @param string $name
492
-	 * @param $type
492
+	 * @param integer $type
493 493
 	 *
494
-	 * @return array
494
+	 * @return Member[]
495 495
 	 * @throws \Exception
496 496
 	 */
497 497
 	public function removeMember($circleUniqueId, $name, $type) {
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@
 block discarded – undo
34 34
 
35 35
 
36 36
 	/**
37
-	 * @param $userId
37
+	 * @param string $userId
38 38
 	 * @param $circleUniqueIds
39
-	 * @param $limit
40
-	 * @param $offset
39
+	 * @param integer $limit
40
+	 * @param integer $offset
41 41
 	 *
42 42
 	 * @return array
43 43
 	 */
Please login to merge, or discard this patch.
lib/Service/CirclesService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -487,24 +487,24 @@
 block discarded – undo
487 487
 		switch ($type) {
488 488
 			case Circle::CIRCLES_PERSONAL:
489 489
 				return $urlGen->getAbsoluteURL(
490
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
490
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
491 491
 				);
492 492
 			case Circle::CIRCLES_CLOSED:
493 493
 				return $urlGen->getAbsoluteURL(
494
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
494
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
495 495
 				);
496 496
 			case Circle::CIRCLES_SECRET:
497 497
 				return $urlGen->getAbsoluteURL(
498
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
498
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
499 499
 				);
500 500
 			case Circle::CIRCLES_PUBLIC:
501 501
 				return $urlGen->getAbsoluteURL(
502
-					$urlGen->imagePath(Application::APP_NAME, 'public' . $ext)
502
+					$urlGen->imagePath(Application::APP_NAME, 'public'.$ext)
503 503
 				);
504 504
 		}
505 505
 
506 506
 		return $urlGen->getAbsoluteURL(
507
-			$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
507
+			$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
508 508
 		);
509 509
 	}
510 510
 
Please login to merge, or discard this patch.
lib/Api/v1/Circles.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public static function generateLink($circleUniqueId) {
455 455
 		return \OC::$server->getURLGenerator()
456
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
456
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
457 457
 	}
458 458
 
459 459
 
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 	 */
469 469
 	public static function generateAbsoluteLink($circleUniqueId) {
470 470
 		return \OC::$server->getURLGenerator()
471
-						   ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
471
+						   ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId;
472 472
 	}
473 473
 
474 474
 
@@ -483,8 +483,8 @@  discard block
 block discarded – undo
483 483
 	 */
484 484
 	public static function generateRemoteLink(FederatedLink $link) {
485 485
 		return \OC::$server->getURLGenerator()
486
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
487
-			   . '-' . $link->getToken();
486
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
487
+			   . '-'.$link->getToken();
488 488
 	}
489 489
 
490 490
 
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 	public static function generateUserParameter(SharingFrame $frame) {
497 497
 
498 498
 		if ($frame->getCloudId() !== null) {
499
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
499
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
500 500
 		} else {
501 501
 			$name = MiscService::getDisplay($frame->getAuthor(), Member::TYPE_USER);
502 502
 		}
Please login to merge, or discard this patch.