Completed
Pull Request — master (#1511)
by Julius
40s
created
lib/Db/CircleRequestBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 		$qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias);
81 81
 
82 82
 		if (!$single) {
83
-			$qb->orderBy($alias . '.creation', 'asc');
83
+			$qb->orderBy($alias.'.creation', 'asc');
84 84
 		}
85 85
 
86 86
 		return $qb;
Please login to merge, or discard this patch.
lib/Db/RemoteRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 			$qb->leftJoin(
199 199
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
200 200
 				$expr->andX(
201
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
202
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
201
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
202
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
203 203
 					$expr->gte(
204
-						$aliasMember . '.level',
204
+						$aliasMember.'.level',
205 205
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
206 206
 					)
207 207
 				)
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 			$external = $expr->andX();
211 211
 			$external->add($qb->exprLimit('type', RemoteInstance::TYPE_EXTERNAL, '', false));
212
-			$external->add($expr->isNotNull($aliasMember . '.instance'));
212
+			$external->add($expr->isNotNull($aliasMember.'.instance'));
213 213
 			$orX->add($external);
214 214
 		}
215 215
 
Please login to merge, or discard this patch.
lib/Db/MemberRequestBuilder.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
 			self::$tables[self::TABLE_MEMBER],
87 87
 			CoreQueryBuilder::MEMBER
88 88
 		)
89
-		   ->orderBy(CoreQueryBuilder::MEMBER . '.joined');
89
+		   ->orderBy(CoreQueryBuilder::MEMBER.'.joined');
90 90
 
91 91
 		if ($getBasedOn) {
92 92
 			$qb->leftJoinBasedOn(CoreQueryBuilder::MEMBER, $initiator);
Please login to merge, or discard this patch.
lib/Tools/Traits/TNCRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -169,10 +169,10 @@
 block discarded – undo
169 169
 				return $client->delete($request->getCompleteUrl(), $request->getClientOptions());
170 170
 			case Request::TYPE_GET:
171 171
 				return $client->get(
172
-					$request->getCompleteUrl() . $request->getQueryString(), $request->getClientOptions()
172
+					$request->getCompleteUrl().$request->getQueryString(), $request->getClientOptions()
173 173
 				);
174 174
 			default:
175
-				throw new Exception('unknown request type ' . json_encode($request));
175
+				throw new Exception('unknown request type '.json_encode($request));
176 176
 		}
177 177
 	}
178 178
 }
Please login to merge, or discard this patch.
lib/Service/ShareWrapperService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -324,8 +324,8 @@
 block discarded – undo
324 324
 		int $nodeId,
325 325
 		string $probeSum
326 326
 	): string {
327
-		return $federatedUser->getSingleId() . '#'
328
-			   . $nodeId . '#'
327
+		return $federatedUser->getSingleId().'#'
328
+			   . $nodeId.'#'
329 329
 			   . $probeSum;
330 330
 	}
331 331
 }
Please login to merge, or discard this patch.
lib/Command/CirclesList.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -257,9 +257,9 @@
 block discarded – undo
257 257
 					Circle::$DEF_SOURCE[$circle->getSource()],
258 258
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
259 259
 					$this->configService->displayInstance($owner->getInstance()),
260
-					$circle->getPopulation() . '/'
260
+					$circle->getPopulation().'/'
261 261
 					. $this->getInt('members_limit', $circle->getSettings(), -1)
262
-					. ' (' . $circle->getPopulationInherited() . ')'
262
+					. ' ('.$circle->getPopulationInherited().')'
263 263
 				]
264 264
 			);
265 265
 		}
Please login to merge, or discard this patch.
lib/Service/GSUpstreamService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 			}
146 146
 		} catch (Exception $e) {
147 147
 			$this->miscService->log(
148
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
148
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
149 149
 			);
150 150
 			throw $e;
151 151
 		}
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 * @throws RequestResultNotJsonException
216 216
 	 * @throws GlobalScaleEventException
217 217
 	 */
218
-	public function confirmEvent(GSEvent &$event): void {
218
+	public function confirmEvent(GSEvent & $event): void {
219 219
 		$this->signEvent($event);
220 220
 
221 221
 		$circle = $event->getDeprecatedCircle();
@@ -229,13 +229,13 @@  discard block
 block discarded – undo
229 229
 		$request->setDataSerialize($event);
230 230
 
231 231
 		$result = $this->retrieveJson($request);
232
-		$this->miscService->log('result ' . json_encode($result), 0);
232
+		$this->miscService->log('result '.json_encode($result), 0);
233 233
 		if ($this->getInt('status', $result) === 0) {
234 234
 			throw new GlobalScaleEventException($this->get('error', $result));
235 235
 		}
236 236
 
237 237
 		$updatedData = $this->getArray('event', $result);
238
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
238
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
239 239
 		if (!empty($updatedData)) {
240 240
 			$updated = new GSEvent();
241 241
 			try {
Please login to merge, or discard this patch.
lib/Service/RemoteStreamService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	public function getCachedRemoteInstance(string $instance): RemoteInstance {
331 331
 		$remoteInstance = $this->remoteRequest->getFromInstance($instance);
332 332
 		if ($remoteInstance->getType() === RemoteInstance::TYPE_UNKNOWN) {
333
-			throw new UnknownRemoteException($instance . ' is set as \'unknown\' in database');
333
+			throw new UnknownRemoteException($instance.' is set as \'unknown\' in database');
334 334
 		}
335 335
 
336 336
 		return $remoteInstance;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 	 * @throws RemoteNotFoundException
572 572
 	 * @throws RemoteUidException
573 573
 	 */
574
-	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance &$stored = null): void {
574
+	public function confirmValidRemote(RemoteInstance $remote, ?RemoteInstance & $stored = null): void {
575 575
 		try {
576 576
 			$stored = $this->remoteRequest->getFromHref($remote->getId());
577 577
 		} catch (RemoteNotFoundException $e) {
Please login to merge, or discard this patch.
lib/Service/MaintenanceService.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 
62 62
 	public static $DELAY =
63 63
 		[
64
-			1 => 60,    // every minute
65
-			2 => 300,   // every 5 minutes
66
-			3 => 3600,  // every hour
64
+			1 => 60, // every minute
65
+			2 => 300, // every 5 minutes
66
+			3 => 3600, // every hour
67 67
 			4 => 75400, // every day
68 68
 			5 => 432000 // evey week
69 69
 		];
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		$this->federatedUserService->bypassCurrentUserCondition(true);
179 179
 
180 180
 		$this->lockMaintenanceRun();
181
-		$this->debug('running maintenance (' . $level . ')');
181
+		$this->debug('running maintenance ('.$level.')');
182 182
 
183 183
 		switch ($level) {
184 184
 			case 1:
@@ -349,14 +349,14 @@  discard block
 block discarded – undo
349 349
 			  ->includeSystemCircles();
350 350
 
351 351
 		$circles = array_map(
352
-			function (Circle $circle) {
352
+			function(Circle $circle) {
353 353
 				return $circle->getSingleId();
354 354
 			}, $this->circleRequest->getCircles(null, $probe)
355 355
 		);
356 356
 
357 357
 		$shares = array_unique(
358 358
 			array_map(
359
-				function (ShareWrapper $share) {
359
+				function(ShareWrapper $share) {
360 360
 					return $share->getSharedWith();
361 361
 				}, $this->shareWrapperRequest->getShares()
362 362
 			)
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	 */
502 502
 	private function output(string $message): void {
503 503
 		if (!is_null($this->output)) {
504
-			$this->output->writeln('- ' . $message);
504
+			$this->output->writeln('- '.$message);
505 505
 		}
506 506
 	}
507 507
 }
Please login to merge, or discard this patch.