Completed
Pull Request — master (#362)
by Maxence
02:13
created
lib/ShareByCircleProvider.php 1 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/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/Db/CirclesRequest.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,6 @@
 block discarded – undo
130 130
 
131 131
 	/**
132 132
 	 * @param string $userId
133
-	 * @param string $instanceId
134 133
 	 * @param int $type
135 134
 	 * @param string $name
136 135
 	 * @param int $level
Please login to merge, or discard this patch.
lib/Db/CirclesRequestBuilder.php 1 patch
Doc Comments   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -92,7 +92,6 @@  discard block
 block discarded – undo
92 92
 	/**
93 93
 	 * @param IQueryBuilder $qb
94 94
 	 * @param $userId
95
-	 * @param string $instanceId
96 95
 	 * @param string $circleUniqueId
97 96
 	 * @param $type
98 97
 	 * @param $name
@@ -126,9 +125,9 @@  discard block
 block discarded – undo
126 125
 	/**
127 126
 	 * @param IQueryBuilder $qb
128 127
 	 * @param string $circleUniqueId
129
-	 * @param $userId
130
-	 * @param $type
131
-	 * @param $name
128
+	 * @param string $userId
129
+	 * @param integer $type
130
+	 * @param string $name
132 131
 	 * @param bool $forceAll
133 132
 	 *
134 133
 	 * @return array
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
213 213
 			&& strpos($remote, 'https://') !== 0
214 214
 		) {
215
-			$remote = 'https://' . $remote;
215
+			$remote = 'https://'.$remote;
216 216
 		}
217 217
 
218 218
 		return rtrim($remote, '/');
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 				return false;
400 400
 			}
401 401
 
402
-			throw new GSStatusException('GS and lookup are not configured : ' . $lookup . ', ' . $enabled);
402
+			throw new GSStatusException('GS and lookup are not configured : '.$lookup.', '.$enabled);
403 403
 		}
404 404
 
405 405
 		$clef = $this->config->getSystemValue('gss.jwt.key', '');
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -440,6 +440,7 @@
 block discarded – undo
440 440
 	 * @param string $type
441 441
 	 *
442 442
 	 * @throws GSStatusException
443
+	 * @return string
443 444
 	 */
444 445
 	public function getGSStatus(string $type = '') {
445 446
 		$enabled = $this->config->getSystemValueBool('gs.enabled', false);
Please login to merge, or discard this patch.
lib/GlobalScale/MemberCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,13 +111,13 @@
 block discarded – undo
111 111
 	 * @throws MemberAlreadyExistsException
112 112
 	 */
113 113
 	public function manage(GSEvent $event): void {
114
-		$this->miscService->log('new event; ' . json_encode($event));
114
+		$this->miscService->log('new event; '.json_encode($event));
115 115
 		if (!$event->hasCircle() || !$event->hasMember()) {
116 116
 			return;
117 117
 		}
118 118
 
119 119
 		$member = $event->getMember();
120
-		$this->miscService->log('new event; ' . json_encode($member));
120
+		$this->miscService->log('new event; '.json_encode($member));
121 121
 
122 122
 //		if ($member->getInstance() === '') {
123 123
 //			$member->setInstance($event->getSource());
Please login to merge, or discard this patch.
lib/Search/GlobalScaleUsers.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 		RequestServerException |
99 99
 		RequestResultNotJsonException $e
100 100
 		) {
101
-			$this->miscService->log('Issue while retrieving instances from lookup: ' . $e->getMessage());
101
+			$this->miscService->log('Issue while retrieving instances from lookup: '.$e->getMessage());
102 102
 
103 103
 			return [];
104 104
 		}
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	 * @param int $type
146 146
 	 * @param string $instance
147 147
 	 *
148
-	 * @return array
148
+	 * @return Member[]
149 149
 	 * @throws Exception
150 150
 	 */
151 151
 	public function addMember($circleUniqueId, $ident, $type, string $instance) {
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
 	/**
315 315
 	 * Verify if a local account is valid.
316 316
 	 *
317
-	 * @param $ident
318
-	 * @param $type
317
+	 * @param string $ident
318
+	 * @param integer $type
319 319
 	 *
320 320
 	 * @param string $instance
321 321
 	 *
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	 * Verify if a mail have a valid format.
341 341
 	 *
342 342
 	 * @param $ident
343
-	 * @param $type
343
+	 * @param integer $type
344 344
 	 *
345 345
 	 * @throws EmailAccountInvalidFormatException
346 346
 	 */
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 	 * Verify if a contact exist in current user address books.
369 369
 	 *
370 370
 	 * @param $ident
371
-	 * @param $type
371
+	 * @param integer $type
372 372
 	 *
373 373
 	 * @throws NoUserException
374 374
 	 * @throws EmailAccountInvalidFormatException
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 	 * @param int $type
488 488
 	 * @param int $level
489 489
 	 *
490
-	 * @return array
490
+	 * @return Member[]
491 491
 	 * @throws Exception
492 492
 	 */
493 493
 	public function levelMember($circleUniqueId, $name, $type, $instance, $level) {
Please login to merge, or discard this patch.
lib/Controller/GlobalScaleController.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,6 @@
 block discarded – undo
111 111
 	 * @PublicPage
112 112
 	 * @NoCSRFRequired
113 113
 	 *
114
-	 * @param string $data
115 114
 	 *
116 115
 	 * @return DataResponse
117 116
 	 */
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
 			$wrappers = $this->gsUpstreamService->getEventsByToken($token);
92 92
 		} catch (Exception $e) {
93 93
 			$this->miscService->log(
94
-				'exception during async: ' . ['token' => $token, 'error' => $e->getMessage()]
94
+				'exception during async: '.['token' => $token, 'error' => $e->getMessage()]
95 95
 			);
96 96
 			$this->fail(['token' => $token, 'error' => $e->getMessage()]);
97 97
 		}
Please login to merge, or discard this patch.