Completed
Pull Request — master (#551)
by Maxence
02:09
created
lib/Service/EventsService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@
 block discarded – undo
282 282
 	 * generateEvent()
283 283
 	 * Create an Activity Event with the basic settings for the app.
284 284
 	 *
285
-	 * @param $type
285
+	 * @param string $type
286 286
 	 *
287 287
 	 * @return \OCP\Activity\IEvent
288 288
 	 */
Please login to merge, or discard this patch.
lib/Service/SearchService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
 			$searcher = \OC::$server->query((string)$container);
89 89
 
90 90
 			if (!($searcher instanceof ISearch)) {
91
-				$this->miscService->log('Search ' . $container . ' is not compatible exception');
91
+				$this->miscService->log('Search '.$container.' is not compatible exception');
92 92
 				continue;
93 93
 			}
94 94
 
Please login to merge, or discard this patch.
lib/Model/FederatedLink.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -303,6 +303,9 @@
 block discarded – undo
303 303
 	}
304 304
 
305 305
 
306
+	/**
307
+	 * @param integer $status
308
+	 */
306 309
 	public function hasToBeValidStatusUpdate($status) {
307 310
 		try {
308 311
 			$this->hasToBeValidStatusUpdateWhileLinkDown($status);
Please login to merge, or discard this patch.
lib/Controller/TestController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
 
129 129
 
130 130
 	/**
131
-	 * @return DataResponse
131
+	 * @return string
132 132
 	 */
133 133
 	public function testAsyncStatus() {
134 134
 		return $this->miscService->success(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
 	 * @return string
92 92
 	 */
93 93
 	private function generateTestAsyncURL($remote) {
94
-		return $this->configService->generateRemoteHost($remote) . Application::TEST_URL_ASYNC;
94
+		return $this->configService->generateRemoteHost($remote).Application::TEST_URL_ASYNC;
95 95
 	}
96 96
 
97 97
 
Please login to merge, or discard this patch.
lib/Service/MiscService.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 		ob_start();
285 285
 		echo(json_encode($result));
286 286
 		$size = ob_get_length();
287
-		header('Content-Length: ' . $size);
287
+		header('Content-Length: '.$size);
288 288
 		ob_end_flush();
289 289
 		flush();
290 290
 	}
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 	/**
80 80
 	 * @param $arr
81
-	 * @param $k
81
+	 * @param string $k
82 82
 	 *
83 83
 	 * @param string $default
84 84
 	 *
@@ -93,6 +93,9 @@  discard block
 block discarded – undo
93 93
 	}
94 94
 
95 95
 
96
+	/**
97
+	 * @param string[] $arr
98
+	 */
96 99
 	public static function mustContains($data, $arr) {
97 100
 		if (!is_array($arr)) {
98 101
 			$arr = [$arr];
@@ -250,7 +253,7 @@  discard block
 block discarded – undo
250 253
 
251 254
 
252 255
 	/**
253
-	 * @param $ident
256
+	 * @param string $ident
254 257
 	 *
255 258
 	 * @return mixed|string
256 259
 	 * @deprecated
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -438,8 +438,8 @@
 block discarded – undo
438 438
 
439 439
 	/**
440 440
 	 * @param string $userId
441
-	 * @param $shareType
442
-	 * @param Node $node
441
+	 * @param integer $shareType
442
+	 * @param Node|null $node
443 443
 	 * @param int $limit
444 444
 	 * @param int $offset
445 445
 	 *
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -300,19 +300,19 @@  discard block
 block discarded – undo
300 300
 	 */
301 301
 	private function createShare($share) {
302 302
 		$this->miscService->log(
303
-			'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: '
304
-			. $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: '
305
-			. $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0
303
+			'Creating share (1/4) - type: '.$share->getShareType().' - token: '
304
+			. $share->getToken().' - type: '.$share->getShareType().' - with: '
305
+			. $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0
306 306
 		);
307 307
 
308 308
 		$qb = $this->getBaseInsertSql($share);
309
-		$this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0);
309
+		$this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0);
310 310
 
311 311
 		$result = $qb->execute();
312
-		$this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0);
312
+		$this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0);
313 313
 
314 314
 		$id = $qb->getLastInsertId();
315
-		$this->miscService->log('Share created ID (4/4) : ' . $id, 0);
315
+		$this->miscService->log('Share created ID (4/4) : '.$id, 0);
316 316
 
317 317
 		try {
318 318
 			$share->setId($id);
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 	public function getShareByToken($token) {
538 538
 		$qb = $this->dbConnection->getQueryBuilder();
539 539
 
540
-		$this->miscService->log("Opening share by token '#" . $token . "'", 0);
540
+		$this->miscService->log("Opening share by token '#".$token."'", 0);
541 541
 
542 542
 		$cursor = $qb->select('*')
543 543
 					 ->from('share')
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 			try {
562 562
 				$data = $this->getShareByPersonalToken($token);
563 563
 			} catch (Exception $e) {
564
-				$this->miscService->log("Share '#" . $token . "' not found.", 0);
564
+				$this->miscService->log("Share '#".$token."' not found.", 0);
565 565
 				throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
566 566
 			}
567 567
 		}
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 			$share = $this->createShareObject($data);
571 571
 		} catch (InvalidShare $e) {
572 572
 			$this->miscService->log(
573
-				"Share Object '#" . $token . "' not created. " . json_encode($data), 0
573
+				"Share Object '#".$token."' not created. ".json_encode($data), 0
574 574
 			);
575 575
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
576 576
 		}
Please login to merge, or discard this patch.
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/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
@@ -349,8 +349,8 @@  discard block
 block discarded – undo
349 349
 	/**
350 350
 	 * Verify if a local account is valid.
351 351
 	 *
352
-	 * @param $ident
353
-	 * @param $type
352
+	 * @param string $ident
353
+	 * @param integer $type
354 354
 	 *
355 355
 	 * @param string $instance
356 356
 	 *
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
 	/**
402 402
 	 * Verify if a contact exist in current user address books.
403 403
 	 *
404
-	 * @param $ident
405
-	 * @param $type
404
+	 * @param string $ident
405
+	 * @param integer $type
406 406
 	 *
407 407
 	 * @throws NoUserException
408 408
 	 * @throws EmailAccountInvalidFormatException
@@ -494,8 +494,8 @@  discard block
 block discarded – undo
494 494
 	 * Will return any data of a user related to a circle (as a Member). User can be a 'non-member'
495 495
 	 * Viewer needs to be at least Member of the Circle
496 496
 	 *
497
-	 * @param $circleId
498
-	 * @param $userId
497
+	 * @param string $circleId
498
+	 * @param string $userId
499 499
 	 * @param $type
500 500
 	 * @param bool $forceAll
501 501
 	 *
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 * @param int $level
552 552
 	 * @param bool $force
553 553
 	 *
554
-	 * @return array
554
+	 * @return DeprecatedMember[]
555 555
 	 * @throws CircleDoesNotExistException
556 556
 	 * @throws CircleTypeNotValidException
557 557
 	 * @throws ConfigNoCircleAvailableException
Please login to merge, or discard this patch.