Completed
Pull Request — master (#347)
by Maxence
01:46
created
lib/Model/BaseCircle.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 	}
401 401
 
402 402
 	/**
403
-	 * @return string
403
+	 * @return integer
404 404
 	 */
405 405
 	public function getType() {
406 406
 		return $this->type;
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 	}
426 426
 
427 427
 	/**
428
-	 * @param array $members
428
+	 * @param Member[] $members
429 429
 	 *
430 430
 	 * @return BaseCircle
431 431
 	 */
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 	}
437 437
 
438 438
 	/**
439
-	 * @return array
439
+	 * @return Member[]
440 440
 	 */
441 441
 	public function getMembers() {
442 442
 		return $this->members;
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 	}
455 455
 
456 456
 	/**
457
-	 * @return array
457
+	 * @return Member[]
458 458
 	 */
459 459
 	public function getGroups() {
460 460
 		return $this->groups;
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 	}
473 473
 
474 474
 	/**
475
-	 * @return array
475
+	 * @return FederatedLink[]
476 476
 	 */
477 477
 	public function getLinks() {
478 478
 		return $this->links;
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 //	}
509 509
 
510 510
 	/**
511
-	 * @param integer|string $type
511
+	 * @param string $type
512 512
 	 *
513 513
 	 * @return integer
514 514
 	 */
Please login to merge, or discard this patch.
lib/Db/MembersRequest.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	 * returns the index of a specific UserID in a Members List
233 233
 	 *
234 234
 	 * @param array $members
235
-	 * @param $userId
235
+	 * @param string $userId
236 236
 	 *
237 237
 	 * @return int
238 238
 	 */
@@ -545,6 +545,9 @@  discard block
 block discarded – undo
545 545
 	}
546 546
 
547 547
 
548
+	/**
549
+	 * @param string $groupId
550
+	 */
548 551
 	public function unlinkAllFromGroup($groupId) {
549 552
 		$qb = $this->getGroupsDeleteSql($groupId);
550 553
 		$qb->execute();
@@ -575,8 +578,6 @@  discard block
 block discarded – undo
575 578
 	/**
576 579
 	 * @param string $circleId
577 580
 	 * @param string $contactId
578
-	 * @param string $userId
579
-	 * @param int $type
580 581
 	 *
581 582
 	 * @return Member
582 583
 	 * @throws MemberDoesNotExistException
Please login to merge, or discard this patch.
lib/Service/DavService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 * @param DavCard $davCard
147 147
 	 */
148 148
 	private function updateDavCard(DavCard $davCard) {
149
-		$this->miscService->log('Updating Card: ' . json_encode($davCard));
149
+		$this->miscService->log('Updating Card: '.json_encode($davCard));
150 150
 		$this->manageCircles($davCard);
151 151
 		$this->manageContact($davCard);
152 152
 	}
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 	 */
205 205
 	private function manageMember(Circle $circle, DavCard $davCard, int $type, string $userId = '') {
206 206
 		if ($userId === '') {
207
-			$userId = $davCard->getOwner() . ':' . $davCard->getContactId();
207
+			$userId = $davCard->getOwner().':'.$davCard->getContactId();
208 208
 		}
209 209
 
210 210
 		try {
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 				continue;
287 287
 			}
288 288
 
289
-			$circle = new Circle(Circle::CIRCLES_PUBLIC, $group . ' - ' . $this->uuid(5));
289
+			$circle = new Circle(Circle::CIRCLES_PUBLIC, $group.' - '.$this->uuid(5));
290 290
 			$circle->setContactAddressBook($davCard->getAddressBookId());
291 291
 			$circle->setContactGroupName($group);
292 292
 
Please login to merge, or discard this patch.