Completed
Push — master ( fb5007...9bba10 )
by Maxence
02:15
created
lib/Circles/FileSharingBroadcaster.php 1 patch
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	 * @param $fileName
307 307
 	 * @param string $link
308 308
 	 * @param string $author
309
-	 * @param $circleName
309
+	 * @param string $circleName
310 310
 	 * @param string $email
311 311
 	 *
312 312
 	 * @throws Exception
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 	 * @param string $circleName
344 344
 	 * @param string $email
345 345
 	 *
346
-	 * @param $password
346
+	 * @param string $password
347 347
 	 *
348 348
 	 * @throws NotFoundException
349 349
 	 * @throws Exception
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 	 * @param $subject
425 425
 	 * @param $text
426 426
 	 * @param $fileName
427
-	 * @param $link
427
+	 * @param string $link
428 428
 	 * @param string $author
429 429
 	 * @param string $circleName
430 430
 	 *
@@ -491,10 +491,10 @@  discard block
 block discarded – undo
491 491
 
492 492
 
493 493
 	/**
494
-	 * @param $author
494
+	 * @param string $author
495 495
 	 * @param string $email
496 496
 	 *
497
-	 * @param $password
497
+	 * @param string $password
498 498
 	 *
499 499
 	 * @throws Exception
500 500
 	 */
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 
589 589
 
590 590
 	/**
591
-	 * @param $author
591
+	 * @param string $author
592 592
 	 * @param string $circleName
593 593
 	 *
594 594
 	 * @return IEMailTemplate
@@ -631,8 +631,8 @@  discard block
 block discarded – undo
631 631
 
632 632
 	/**
633 633
 	 * @param IEMailTemplate $emailTemplate
634
-	 * @param $author
635
-	 * @param $recipient
634
+	 * @param string $author
635
+	 * @param string $recipient
636 636
 	 *
637 637
 	 * @throws Exception
638 638
 	 */
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -467,7 +467,7 @@
 block discarded – undo
467 467
 	/**
468 468
 	 * @param string $type
469 469
 	 *
470
-	 * @return array|bool|mixed
470
+	 * @return string
471 471
 	 * @throws GSStatusException
472 472
 	 */
473 473
 	public function getGSStatus(string $type = '') {
Please login to merge, or discard this patch.
lib/Service/FederatedLinkCreationService.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -249,8 +249,8 @@  discard block
 block discarded – undo
249 249
 
250 250
 
251 251
 	/**
252
-	 * @param $circleUniqueId
253
-	 * @param $remote
252
+	 * @param string $circleUniqueId
253
+	 * @param string $remote
254 254
 	 *
255 255
 	 * @return FederatedLink
256 256
 	 * @throws Exception
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 	 *
343 343
 	 * Will parse the error reason returned by requestLink() and throw an Exception
344 344
 	 *
345
-	 * @param $reason
345
+	 * @param string $reason
346 346
 	 *
347 347
 	 * @throws Exception
348 348
 	 * @throws FederatedRemoteDoesNotAllowException
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 *
150 150
 	 * @param bool $force
151 151
 	 *
152
-	 * @return array
152
+	 * @return Member[]
153 153
 	 * @throws Exception
154 154
 	 */
155 155
 	public function addMember($circleUniqueId, $ident, $type, string $instance, bool $force = false) {
@@ -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/Service/SharingFrameService.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 	 *
176 176
 	 * @param SharingFrame $frame
177 177
 	 * @param Circle $circle
178
-	 * @param $broadcast
178
+	 * @param string|null $broadcast
179 179
 	 */
180 180
 	private function generateHeaders(SharingFrame $frame, Circle $circle, $broadcast) {
181 181
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 * Please use getFrameFromCircle();
215 215
 	 *
216 216
 	 * @param string $circleUniqueId
217
-	 * @param $viewerId
217
+	 * @param string $viewerId
218 218
 	 *
219 219
 	 * @return SharingFrame[]
220 220
 	 * @throws CircleDoesNotExistException
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
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	 */
465 465
 	public static function generateLink($circleUniqueId) {
466 466
 		return OC::$server->getURLGenerator()
467
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
467
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
468 468
 	}
469 469
 
470 470
 
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 	 */
480 480
 	public static function generateAbsoluteLink($circleUniqueId) {
481 481
 		return OC::$server->getURLGenerator()
482
-						   ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
482
+						   ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId;
483 483
 	}
484 484
 
485 485
 
@@ -494,8 +494,8 @@  discard block
 block discarded – undo
494 494
 	 */
495 495
 	public static function generateRemoteLink(FederatedLink $link) {
496 496
 		return OC::$server->getURLGenerator()
497
-						   ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
498
-			   . '-' . $link->getToken();
497
+						   ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
498
+			   . '-'.$link->getToken();
499 499
 	}
500 500
 
501 501
 
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 	public static function generateUserParameter(SharingFrame $frame) {
508 508
 
509 509
 		if ($frame->getCloudId() !== null) {
510
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
510
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
511 511
 		} else {
512 512
 			$name = MiscService::getDisplay($frame->getAuthor(), self::TYPE_USER);
513 513
 		}
Please login to merge, or discard this patch.
lib/Controller/SharesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	public function create($circleUniqueId, $source, $type, $payload) {
134 134
 
135
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
135
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
136 136
 
137 137
 		try {
138 138
 			$share = new SharingFrame($source, $type);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
142 142
 		} catch (\Exception $e) {
143
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
143
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
144 144
 
145 145
 			return $this->fail(
146 146
 				[
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			);
154 154
 		}
155 155
 
156
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
156
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
157 157
 
158 158
 		return $this->success(
159 159
 			[
Please login to merge, or discard this patch.
lib/Db/CoreRequestBuilder.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -345,8 +345,8 @@  discard block
 block discarded – undo
345 345
 		$expr = $qb->expr();
346 346
 
347 347
 		if ($pf === '') {
348
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
349
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
348
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
349
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
350 350
 
351 351
 			return;
352 352
 		}
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
376 376
 				continue;
377 377
 			}
378
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
378
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
379 379
 		}
380 380
 
381 381
 		return $orX;
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	protected function limitToMembersAndAlmost(IQueryBuilder $qb) {
391 391
 		$expr = $qb->expr();
392 392
 
393
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
393
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
394 394
 
395 395
 		$orX = $expr->orX();
396
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
397
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
398
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
396
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
397
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
398
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
399 399
 
400 400
 		$qb->andWhere($orX);
401 401
 	}
@@ -408,8 +408,8 @@  discard block
 block discarded – undo
408 408
 	 */
409 409
 	private function limitToDBField(IQueryBuilder $qb, $field, $value) {
410 410
 		$expr = $qb->expr();
411
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
412
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
411
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
412
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
413 413
 	}
414 414
 
415 415
 
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
 	 */
421 421
 	private function limitToDBFieldOrGreater(IQueryBuilder $qb, $field, $value) {
422 422
 		$expr = $qb->expr();
423
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
424
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
423
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
424
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
425 425
 	}
426 426
 
427 427
 
@@ -436,9 +436,9 @@  discard block
 block discarded – undo
436 436
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
437 437
 		$expr = $qb->expr();
438 438
 
439
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
439
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
440 440
 
441
-		$and = $expr->andX($expr->eq($pf . 'user_id', 'ncgu.gid'));
441
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
442 442
 		if ($userId !== '') {
443 443
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
444 444
 		} else {
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 		}
462 462
 
463 463
 		$expr = $qb->expr();
464
-		$pf = $this->default_select_alias . '.';
464
+		$pf = $this->default_select_alias.'.';
465 465
 
466 466
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
467 467
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 		   ->selectAlias('lc.settings', 'circle_settings')
471 471
 		   ->leftJoin(
472 472
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
473
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
473
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
474 474
 		   );
475 475
 	}
476 476
 
Please login to merge, or discard this patch.