Completed
Pull Request — master (#324)
by John
01:58
created
lib/Model/BaseCircle.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 	}
348 348
 
349 349
 	/**
350
-	 * @return string
350
+	 * @return integer
351 351
 	 */
352 352
 	public function getType() {
353 353
 		return $this->type;
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 	}
372 372
 
373 373
 	/**
374
-	 * @param array $members
374
+	 * @param Member[] $members
375 375
 	 * @return BaseCircle
376 376
 	 */
377 377
 	public function setMembers($members) {
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 	}
382 382
 
383 383
 	/**
384
-	 * @return array
384
+	 * @return Member[]
385 385
 	 */
386 386
 	public function getMembers() {
387 387
 		return $this->members;
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
 	}
399 399
 
400 400
 	/**
401
-	 * @return array
401
+	 * @return Member[]
402 402
 	 */
403 403
 	public function getGroups() {
404 404
 		return $this->groups;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 	}
416 416
 
417 417
 	/**
418
-	 * @return array
418
+	 * @return FederatedLink[]
419 419
 	 */
420 420
 	public function getLinks() {
421 421
 		return $this->links;
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 //	}
452 452
 
453 453
 	/**
454
-	 * @param integer|string $type
454
+	 * @param string $type
455 455
 	 * @return integer
456 456
 	 */
457 457
 	public static function typeInt($type) {
Please login to merge, or discard this patch.
lib/Model/Circle.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 
147 147
 	/**
148 148
 	 * @param array $arr
149
-	 * @param $key
149
+	 * @param string $key
150 150
 	 * @param int $type
151 151
 	 *
152 152
 	 * @return null|Member
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.
lib/Controller/FederatedController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -265,7 +265,7 @@
 block discarded – undo
265 265
 	 * @return DataResponse
266 266
 	 */
267 267
 	private function federatedFail($reason) {
268
-		$this->miscService->log(0, 'federated fail: ' . $reason);
268
+		$this->miscService->log(0, 'federated fail: '.$reason);
269 269
 
270 270
 		return new DataResponse(
271 271
 			[
Please login to merge, or discard this patch.
lib/Service/MembersService.php 2 patches
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @param $ident
117 117
 	 * @param int $type
118 118
 	 *
119
-	 * @return array
119
+	 * @return Member[]
120 120
 	 * @throws Exception
121 121
 	 */
122 122
 	public function addMember($circleUniqueId, $ident, $type) {
@@ -271,8 +271,8 @@  discard block
 block discarded – undo
271 271
 	/**
272 272
 	 * Verify if a local account is valid.
273 273
 	 *
274
-	 * @param $ident
275
-	 * @param $type
274
+	 * @param string $ident
275
+	 * @param integer $type
276 276
 	 *
277 277
 	 * @throws NoUserException
278 278
 	 */
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 	 * Verify if a mail have a valid format.
294 294
 	 *
295 295
 	 * @param $ident
296
-	 * @param $type
296
+	 * @param integer $type
297 297
 	 *
298 298
 	 * @throws EmailAccountInvalidFormatException
299 299
 	 */
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 	 * Verify if a contact exist in current user address books.
315 315
 	 *
316 316
 	 * @param $ident
317
-	 * @param $type
317
+	 * @param integer $type
318 318
 	 *
319 319
 	 * @throws NoUserException
320 320
 	 */
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 * @param int $type
430 430
 	 * @param int $level
431 431
 	 *
432
-	 * @return array
432
+	 * @return Member[]
433 433
 	 * @throws Exception
434 434
 	 */
435 435
 	public function levelMember($circleUniqueId, $name, $type, $level) {
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 	/**
461 461
 	 * @param Circle $circle
462 462
 	 * @param Member $member
463
-	 * @param $level
463
+	 * @param integer $level
464 464
 	 *
465 465
 	 * @throws Exception
466 466
 	 */
@@ -535,9 +535,9 @@  discard block
 block discarded – undo
535 535
 	/**
536 536
 	 * @param string $circleUniqueId
537 537
 	 * @param string $name
538
-	 * @param $type
538
+	 * @param integer $type
539 539
 	 *
540
-	 * @return array
540
+	 * @return Member[]
541 541
 	 * @throws Exception
542 542
 	 */
543 543
 	public function removeMember($circleUniqueId, $name, $type) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		
218 218
 		$member->inviteToCircle($circle->getType());
219 219
 
220
-		if ($this->configService->isInvitationSkipped()){
220
+		if ($this->configService->isInvitationSkipped()) {
221 221
 			$member->joinCircle($circle->getType());
222 222
 		}
223 223
 	}
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 			return;
328 328
 		}
329 329
 
330
-		$tmpContact = $this->userId . ':' . $ident;
330
+		$tmpContact = $this->userId.':'.$ident;
331 331
 		$result = MiscService::getContactData($tmpContact);
332 332
 		if (empty($result)) {
333 333
 			throw new NoUserException($this->l10n->t("This contact is not available"));
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
@@ -510,24 +510,24 @@
 block discarded – undo
510 510
 		switch ($type) {
511 511
 			case Circle::CIRCLES_PERSONAL:
512 512
 				return $urlGen->getAbsoluteURL(
513
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
513
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
514 514
 				);
515 515
 			case Circle::CIRCLES_CLOSED:
516 516
 				return $urlGen->getAbsoluteURL(
517
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
517
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
518 518
 				);
519 519
 			case Circle::CIRCLES_SECRET:
520 520
 				return $urlGen->getAbsoluteURL(
521
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
521
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
522 522
 				);
523 523
 			case Circle::CIRCLES_PUBLIC:
524 524
 				return $urlGen->getAbsoluteURL(
525
-					$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
525
+					$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
526 526
 				);
527 527
 		}
528 528
 
529 529
 		return $urlGen->getAbsoluteURL(
530
-			$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
530
+			$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
531 531
 		);
532 532
 	}
533 533
 
Please login to merge, or discard this patch.