Completed
Pull Request — master (#566)
by Julius
02:05
created
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
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -344,7 +344,7 @@
 block discarded – undo
344 344
 			);
345 345
 		}
346 346
 
347
-		$tmpContact = $this->userId . ':' . $ident;
347
+		$tmpContact = $this->userId.':'.$ident;
348 348
 		$result = MiscService::getContactData($tmpContact);
349 349
 		if (empty($result)) {
350 350
 			throw new NoUserException($this->l10n->t("This contact is not available"));
Please login to merge, or discard this patch.
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
 	/**
332 332
 	 * Verify if a local account is valid.
333 333
 	 *
334
-	 * @param $ident
335
-	 * @param $type
334
+	 * @param string $ident
335
+	 * @param integer $type
336 336
 	 *
337 337
 	 * @param string $instance
338 338
 	 *
@@ -383,8 +383,8 @@  discard block
 block discarded – undo
383 383
 	/**
384 384
 	 * Verify if a contact exist in current user address books.
385 385
 	 *
386
-	 * @param $ident
387
-	 * @param $type
386
+	 * @param string $ident
387
+	 * @param integer $type
388 388
 	 *
389 389
 	 * @throws NoUserException
390 390
 	 * @throws EmailAccountInvalidFormatException
@@ -476,8 +476,8 @@  discard block
 block discarded – undo
476 476
 	 * Will return any data of a user related to a circle (as a Member). User can be a 'non-member'
477 477
 	 * Viewer needs to be at least Member of the Circle
478 478
 	 *
479
-	 * @param $circleId
480
-	 * @param $userId
479
+	 * @param string $circleId
480
+	 * @param string $userId
481 481
 	 * @param $type
482 482
 	 * @param bool $forceAll
483 483
 	 *
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 	 * @param int $level
534 534
 	 * @param bool $force
535 535
 	 *
536
-	 * @return array
536
+	 * @return Member[]
537 537
 	 * @throws CircleDoesNotExistException
538 538
 	 * @throws CircleTypeNotValidException
539 539
 	 * @throws ConfigNoCircleAvailableException
Please login to merge, or discard this patch.
lib/Model/DavCard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * @return string
147 147
 	 */
148 148
 	public function getUniqueId(): string {
149
-		return $this->getAddressBookId() . '/' . $this->getCardUri();
149
+		return $this->getAddressBookId().'/'.$this->getCardUri();
150 150
 	}
151 151
 
152 152
 
Please login to merge, or discard this patch.
lib/Model/GlobalScale/GSEvent.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 	}
95 95
 
96 96
 	/**
97
-	 * @param mixed $type
97
+	 * @param string $type
98 98
 	 *
99 99
 	 * @return GSEvent
100 100
 	 */
Please login to merge, or discard this patch.
lib/Model/BaseCircle.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 	}
407 407
 
408 408
 	/**
409
-	 * @return string
409
+	 * @return integer
410 410
 	 */
411 411
 	public function getType() {
412 412
 		return $this->type;
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 	}
461 461
 
462 462
 	/**
463
-	 * @return array
463
+	 * @return Member[]
464 464
 	 */
465 465
 	public function getGroups() {
466 466
 		return $this->groups;
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 	}
479 479
 
480 480
 	/**
481
-	 * @return array
481
+	 * @return FederatedLink[]
482 482
 	 */
483 483
 	public function getLinks() {
484 484
 		return $this->links;
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
 //	}
515 515
 
516 516
 	/**
517
-	 * @param integer|string $type
517
+	 * @param string $type
518 518
 	 *
519 519
 	 * @return integer
520 520
 	 */
Please login to merge, or discard this patch.
lib/Command/CirclesDetails.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 
87 87
 		$circle = $this->circlesRequest->forceGetCircle($circleId);
88 88
 
89
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
89
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
90 90
 
91 91
 		return 0;
92 92
 	}
Please login to merge, or discard this patch.
lib/Command/MembersList.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 		$members = $this->membersRequest->forceGetMembers($circleId);
101 101
 
102 102
 		if ($json) {
103
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
103
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
104 104
 
105 105
 			return 0;
106 106
 		}
Please login to merge, or discard this patch.
lib/Command/CirclesCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		];
126 126
 
127 127
 		if (!key_exists(strtolower($type), $types)) {
128
-			throw new CircleTypeNotValidException('unknown type: ' . json_encode(array_keys($types)));
128
+			throw new CircleTypeNotValidException('unknown type: '.json_encode(array_keys($types)));
129 129
 		}
130 130
 
131 131
 		$type = $types[strtolower($type)];
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		$circle = $this->circlesService->createCircle($type, $name, $ownerId);
134 134
 		$circle = $this->circlesRequest->forceGetCircle($circle->getUniqueId());
135 135
 
136
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
136
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
137 137
 
138 138
 		return 0;
139 139
 	}
Please login to merge, or discard this patch.
lib/Command/MembersDetails.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 		$memberId = $input->getArgument('member_id');
86 86
 
87 87
 		$member = $this->membersRequest->forceGetMemberById($memberId);
88
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
88
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
89 89
 
90 90
 		return 0;
91 91
 	}
Please login to merge, or discard this patch.