Completed
Push — master ( 2ed78e...f31342 )
by
unknown
32s queued 28s
created
tests/stubs/oc_group_group.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @param string $search
99 99
 	 * @return int|bool
100 100
 	 */
101
-	public function count($search = ''): int|bool
101
+	public function count($search = ''): int | bool
102 102
  {
103 103
  }
104 104
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 *
108 108
 	 * @return int|bool
109 109
 	 */
110
-	public function countDisabled(): int|bool
110
+	public function countDisabled(): int | bool
111 111
  {
112 112
  }
113 113
 
Please login to merge, or discard this patch.
tests/stubs/symfony_component_process_process.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,8 @@
 block discarded – undo
46 46
     public const TIMEOUT_PRECISION = 0.2;
47 47
 
48 48
     public const ITER_NON_BLOCKING = 1; // By default, iterating over outputs is a blocking call, use this flag to make it non-blocking
49
-    public const ITER_KEEP_OUTPUT = 2;  // By default, outputs are cleared while iterating, use this flag to keep them in memory
50
-    public const ITER_SKIP_OUT = 4;     // Use this flag to skip STDOUT while iterating
49
+    public const ITER_KEEP_OUTPUT = 2; // By default, outputs are cleared while iterating, use this flag to keep them in memory
50
+    public const ITER_SKIP_OUT = 4; // Use this flag to skip STDOUT while iterating
51 51
     public const ITER_SKIP_ERR = 8;
52 52
 
53 53
     /**
Please login to merge, or discard this patch.
tests/stubs/symfony_component_console_output_outputinterface.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
      *
40 40
      * @return void
41 41
      */
42
-    public function write(string|iterable $messages, bool $newline = false, int $options = 0)
42
+    public function write(string | iterable $messages, bool $newline = false, int $options = 0)
43 43
     {
44 44
     }
45 45
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      *
52 52
      * @return void
53 53
      */
54
-    public function writeln(string|iterable $messages, int $options = 0)
54
+    public function writeln(string | iterable $messages, int $options = 0)
55 55
     {
56 56
     }
57 57
 
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
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		} catch (FederatedItemException $e) {
159 159
 			if ($input->getOption('status-code')) {
160 160
 				throw new FederatedItemException(
161
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
161
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
162 162
 				);
163 163
 			}
164 164
 
Please login to merge, or discard this patch.
lib/Command/CirclesRemote.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -154,19 +154,19 @@  discard block
 block discarded – undo
154 154
 
155 155
 		$webfinger = $this->getWebfinger($host, Application::APP_SUBJECT);
156 156
 		if ($this->input->getOption('all')) {
157
-			$this->output->writeln('- Webfinger on <info>' . $host . '</info>');
157
+			$this->output->writeln('- Webfinger on <info>'.$host.'</info>');
158 158
 			$this->output->writeln(json_encode($webfinger, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
159 159
 			$this->output->writeln('');
160 160
 		}
161 161
 
162 162
 		if ($this->input->getOption('all')) {
163 163
 			$circleLink = $this->extractLink(Application::APP_REL, $webfinger);
164
-			$this->output->writeln('- Information about Circles app on <info>' . $host . '</info>');
164
+			$this->output->writeln('- Information about Circles app on <info>'.$host.'</info>');
165 165
 			$this->output->writeln(json_encode($circleLink, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
166 166
 			$this->output->writeln('');
167 167
 		}
168 168
 
169
-		$this->output->writeln('- Available services on <info>' . $host . '</info>');
169
+		$this->output->writeln('- Available services on <info>'.$host.'</info>');
170 170
 		foreach ($webfinger->getLinks() as $link) {
171 171
 			$app = $link->getProperty('name');
172 172
 			$ver = $link->getProperty('version');
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
 				$app .= ' ';
175 175
 			}
176 176
 			if ($ver !== '') {
177
-				$ver = 'v' . $ver;
177
+				$ver = 'v'.$ver;
178 178
 			}
179 179
 
180
-			$this->output->writeln(' * ' . $link->getRel() . ' ' . $app . $ver);
180
+			$this->output->writeln(' * '.$link->getRel().' '.$app.$ver);
181 181
 		}
182 182
 		$this->output->writeln('');
183 183
 
184
-		$this->output->writeln('- Resources related to Circles on <info>' . $host . '</info>');
184
+		$this->output->writeln('- Resources related to Circles on <info>'.$host.'</info>');
185 185
 		$resource = $this->getResourceData($host, Application::APP_SUBJECT, Application::APP_REL);
186 186
 		$this->output->writeln(json_encode($resource, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
187 187
 		$this->output->writeln('');
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 		$tempUid = $resource->g('uid');
191 191
 		$this->output->writeln(
192
-			'- Confirming UID=' . $tempUid . ' from parsed Signatory at <info>' . $host . '</info>'
192
+			'- Confirming UID='.$tempUid.' from parsed Signatory at <info>'.$host.'</info>'
193 193
 		);
194 194
 
195 195
 		try {
@@ -198,15 +198,15 @@  discard block
 block discarded – undo
198 198
 			$this->output->writeln(' * No SignatureException: <info>Identity authed</info>');
199 199
 		} catch (SignatureException $e) {
200 200
 			$this->output->writeln(
201
-				'<error>' . $host . ' cannot auth its identity: ' . $e->getMessage() . '</error>'
201
+				'<error>'.$host.' cannot auth its identity: '.$e->getMessage().'</error>'
202 202
 			);
203 203
 
204 204
 			return;
205 205
 		}
206 206
 
207
-		$this->output->writeln(' * Found <info>' . $remoteSignatory->getUid() . '</info>');
207
+		$this->output->writeln(' * Found <info>'.$remoteSignatory->getUid().'</info>');
208 208
 		if ($remoteSignatory->getUid(true) !== $tempUid) {
209
-			$this->output->writeln('<error>looks like ' . $host . ' is faking its identity');
209
+			$this->output->writeln('<error>looks like '.$host.' is faking its identity');
210 210
 
211 211
 			return;
212 212
 		}
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		$this->output->writeln('');
215 215
 
216 216
 		$testUrl = $resource->g('test');
217
-		$this->output->writeln('- Testing signed payload on <info>' . $testUrl . '</info>');
217
+		$this->output->writeln('- Testing signed payload on <info>'.$testUrl.'</info>');
218 218
 
219 219
 		try {
220 220
 			$localSignatory = $this->remoteStreamService->getAppSignatory();
@@ -236,18 +236,18 @@  discard block
 block discarded – undo
236 236
 		$this->output->writeln('');
237 237
 
238 238
 		$this->output->writeln(' * Clear Signature: ');
239
-		$this->output->writeln('<comment>' . $signedRequest->getClearSignature() . '</comment>');
239
+		$this->output->writeln('<comment>'.$signedRequest->getClearSignature().'</comment>');
240 240
 		$this->output->writeln('');
241 241
 
242 242
 		$this->output->writeln(' * Signed Signature (base64 encoded): ');
243 243
 		$this->output->writeln(
244
-			'<comment>' . base64_encode($signedRequest->getSignedSignature()) . '</comment>'
244
+			'<comment>'.base64_encode($signedRequest->getSignedSignature()).'</comment>'
245 245
 		);
246 246
 		$this->output->writeln('');
247 247
 
248 248
 		$result = $signedRequest->getOutgoingRequest()->getResult();
249 249
 		$code = $result->getStatusCode();
250
-		$this->output->writeln(' * Result: ' . (($code === 200) ? '<info>' . ((string)$code) . '</info>' : $code));
250
+		$this->output->writeln(' * Result: '.(($code === 200) ? '<info>'.((string)$code).'</info>' : $code));
251 251
 		$this->output->writeln(
252 252
 			json_encode(json_decode($result->getContent(), true), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
253 253
 		);
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 				$stored = new RemoteInstance();
270 270
 				$this->remoteStreamService->confirmValidRemote($remoteSignatory, $stored);
271 271
 				$this->output->writeln(
272
-					'<info>The remote instance ' . $host
272
+					'<info>The remote instance '.$host
273 273
 					. ' is already known with this current identity</info>'
274 274
 				);
275 275
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 
280 280
 				if ($remoteSignatory->getType() !== $stored->getType()) {
281 281
 					$this->output->writeln(
282
-						'- updating type from ' . $stored->getType() . ' to '
282
+						'- updating type from '.$stored->getType().' to '
283 283
 						. $remoteSignatory->getType()
284 284
 					);
285 285
 					$this->remoteStreamService->update(
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 
290 290
 				if ($remoteSignatory->getInstance() !== $stored->getInstance()) {
291 291
 					$this->output->writeln(
292
-						'- updating host from ' . $stored->getInstance() . ' to '
292
+						'- updating host from '.$stored->getInstance().' to '
293 293
 						. $remoteSignatory->getInstance()
294 294
 					);
295 295
 					$this->remoteStreamService->update(
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 				}
299 299
 				if ($remoteSignatory->getId() !== $stored->getId()) {
300 300
 					$this->output->writeln(
301
-						'- updating href/Id from ' . $stored->getId() . ' to '
301
+						'- updating href/Id from '.$stored->getId().' to '
302 302
 						. $remoteSignatory->getId()
303 303
 					);
304 304
 					$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
@@ -323,10 +323,10 @@  discard block
 block discarded – undo
323 323
 		$helper = $this->getHelper('question');
324 324
 
325 325
 		$this->output->writeln(
326
-			'The remote instance <info>' . $remoteSignatory->getInstance() . '</info> looks good.'
326
+			'The remote instance <info>'.$remoteSignatory->getInstance().'</info> looks good.'
327 327
 		);
328 328
 		$question = new ConfirmationQuestion(
329
-			'Would you like to identify this remote instance as \'<comment>' . $remoteSignatory->getType()
329
+			'Would you like to identify this remote instance as \'<comment>'.$remoteSignatory->getType()
330 330
 			. '</comment>\' using interface \'<comment>'
331 331
 			. InterfaceService::$LIST_IFACE[$remoteSignatory->getInterface()]
332 332
 			. '</comment>\' ? (y/N) ',
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 		$helper = $this->getHelper('question');
356 356
 
357 357
 		$this->output->writeln(
358
-			'The remote instance <info>' . $remoteSignatory->getInstance()
358
+			'The remote instance <info>'.$remoteSignatory->getInstance()
359 359
 			. '</info> is known but <error>its identity has changed.</error>'
360 360
 		);
361 361
 		$this->output->writeln(
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 	private function verifyGSInstances(): void {
418 418
 		$instances = $this->globalScaleService->getGlobalScaleInstances();
419 419
 		$known = array_map(
420
-			function (RemoteInstance $instance): string {
420
+			function(RemoteInstance $instance): string {
421 421
 				return $instance->getInstance();
422 422
 			}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
423 423
 		);
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 	 * @param string $instance
434 434
 	 */
435 435
 	private function syncGSInstance(string $instance): void {
436
-		$this->output->write('Adding <comment>' . $instance . '</comment>: ');
436
+		$this->output->write('Adding <comment>'.$instance.'</comment>: ');
437 437
 		if ($this->configService->isLocalInstance($instance)) {
438 438
 			$this->output->writeln('<comment>instance is local</comment>');
439 439
 			return;
@@ -448,8 +448,8 @@  discard block
 block discarded – undo
448 448
 			);
449 449
 			$this->output->writeln('<info>ok</info>');
450 450
 		} catch (Exception $e) {
451
-			$msg = ($e->getMessage() === '') ? '' : ' (' . $e->getMessage() . ')';
452
-			$this->output->writeln('<error>' . get_class($e) . $msg . '</error>');
451
+			$msg = ($e->getMessage() === '') ? '' : ' ('.$e->getMessage().')';
452
+			$this->output->writeln('<error>'.get_class($e).$msg.'</error>');
453 453
 		}
454 454
 	}
455 455
 
@@ -467,12 +467,12 @@  discard block
 block discarded – undo
467 467
 			try {
468 468
 				$current = $this->remoteStreamService->retrieveRemoteInstance($instance->getInstance());
469 469
 				if ($current->getUid(true) === $instance->getUid(true)) {
470
-					$currentUid = '<info>' . $current->getUid(true) . '</info>';
470
+					$currentUid = '<info>'.$current->getUid(true).'</info>';
471 471
 				} else {
472
-					$currentUid = '<error>' . $current->getUid(true) . '</error>';
472
+					$currentUid = '<error>'.$current->getUid(true).'</error>';
473 473
 				}
474 474
 			} catch (Exception $e) {
475
-				$currentUid = '<error>' . $e->getMessage() . '</error>';
475
+				$currentUid = '<error>'.$e->getMessage().'</error>';
476 476
 			}
477 477
 
478 478
 			$table->appendRow(
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 			}
500 500
 		}
501 501
 
502
-		throw new Exception('Unknown type: ' . implode(', ', RemoteInstance::$LIST_TYPE));
502
+		throw new Exception('Unknown type: '.implode(', ', RemoteInstance::$LIST_TYPE));
503 503
 	}
504 504
 
505 505
 	/**
@@ -512,6 +512,6 @@  discard block
 block discarded – undo
512 512
 			}
513 513
 		}
514 514
 
515
-		throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
515
+		throw new Exception('Unknown interface: '.implode(', ', InterfaceService::$LIST_IFACE));
516 516
 	}
517 517
 }
Please login to merge, or discard this patch.
lib/Command/CirclesCreate.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		} catch (FederatedItemException $e) {
105 105
 			if ($input->getOption('status-code')) {
106 106
 				throw new FederatedItemException(
107
-					' [' . get_class($e) . ', ' . ((string)$e->getStatus()) . ']' . "\n" . $e->getMessage()
107
+					' ['.get_class($e).', '.((string)$e->getStatus()).']'."\n".$e->getMessage()
108 108
 				);
109 109
 			}
110 110
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 		} elseif (strtolower($input->getOption('output')) !== 'none') {
117 117
 			/** @var Circle $circle */
118 118
 			$circle = $this->deserialize($outcome, Circle::class);
119
-			$output->writeln('Id: <info>' . $circle->getSingleId() . '</info>');
120
-			$output->writeln('Name: <info>' . $circle->getDisplayName() . '</info>');
121
-			$output->writeln('Owner: <info>' . $circle->getOwner()->getDisplayName() . '</info>');
119
+			$output->writeln('Id: <info>'.$circle->getSingleId().'</info>');
120
+			$output->writeln('Name: <info>'.$circle->getDisplayName().'</info>');
121
+			$output->writeln('Owner: <info>'.$circle->getOwner()->getDisplayName().'</info>');
122 122
 		}
123 123
 
124 124
 		return 0;
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
@@ -237,9 +237,9 @@
 block discarded – undo
237 237
 					Circle::$DEF_SOURCE[$circle->getSource()],
238 238
 					$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
239 239
 					$this->configService->displayInstance($owner->getInstance()),
240
-					((string)$circle->getPopulation()) . '/'
240
+					((string)$circle->getPopulation()).'/'
241 241
 					. ((string)$this->getInt('members_limit', $circle->getSettings(), -1))
242
-					. ' (' . ((string)$circle->getPopulationInherited()) . ')'
242
+					. ' ('.((string)$circle->getPopulationInherited()).')'
243 243
 				]
244 244
 			);
245 245
 		}
Please login to merge, or discard this patch.
lib/Command/MigrateCustomGroups.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -78,18 +78,18 @@  discard block
 block discarded – undo
78 78
 
79 79
 			$name = $rowCG['display_name'];
80 80
 			while (strlen($name) < 3) {
81
-				$name = '_' . $name;
81
+				$name = '_'.$name;
82 82
 			}
83 83
 
84 84
 			// based on owner's userid, we create federateduser and a new circle
85
-			$this->output->writeln('+ New Team <info>' . $name . '</info>, owner by <info>' . $ownerId . '</info>');
85
+			$this->output->writeln('+ New Team <info>'.$name.'</info>, owner by <info>'.$ownerId.'</info>');
86 86
 			$owner = $this->cachedFed($ownerId);
87 87
 
88 88
 			$this->circlesManager->startSession($owner);
89 89
 			try {
90 90
 				$circle = $this->circlesManager->createCircle($name);
91 91
 			} catch (\Exception $e) {
92
-				$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error> with data ' . json_encode($rowCG));
92
+				$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error> with data '.json_encode($rowCG));
93 93
 				$this->logger->log(2, 'error while creating circle', ['exception' => $e]);
94 94
 				$this->circlesManager->stopSession();
95 95
 				continue;
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 						continue; // owner is already in the circles
117 117
 					}
118 118
 
119
-					$this->output->writeln(' - new member <info>' . $userId . '</info>');
119
+					$this->output->writeln(' - new member <info>'.$userId.'</info>');
120 120
 					$member = $this->circlesManager->addMember($circle->getSingleId(), $this->cachedFed($userId));
121 121
 					if ($rowM['role'] === '1') {
122 122
 						$this->circlesManager->levelMember($member->getId(), Member::LEVEL_ADMIN);
123 123
 					}
124 124
 				} catch (\Exception $e) {
125
-					$this->output->writeln('<error>' . get_class($e) . ' ' . $e->getMessage() . '</error>');
125
+					$this->output->writeln('<error>'.get_class($e).' '.$e->getMessage().'</error>');
126 126
 					$this->logger->log(2, 'error while migrating custom group member', ['exception' => $e]);
127 127
 				}
128 128
 			}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			->where($update->expr()->in('id', $update->createNamedParameter($shareIds, IQueryBuilder::PARAM_INT_ARRAY)));
159 159
 
160 160
 		$count = $update->executeStatement();
161
-		$this->output->writeln('> ' . ((string)$count) . ' shares updated');
161
+		$this->output->writeln('> '.((string)$count).' shares updated');
162 162
 
163 163
 		$this->fixShareChildren($shareIds, $memberIds);
164 164
 	}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 			$count += $update->executeStatement();
199 199
 		}
200 200
 
201
-		$this->output->writeln('> ' . ((string)$count) . ' children shares updated');
201
+		$this->output->writeln('> '.((string)$count).' children shares updated');
202 202
 	}
203 203
 
204 204
 
Please login to merge, or discard this patch.
lib/Command/CirclesTest.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 
184 184
 		// get the singleId of a Group
185 185
 		$federatedUser = $circlesManager->getFederatedUser('testGroup', Member::TYPE_GROUP);
186
-		echo 'singleId: ' . $federatedUser->getSingleId() . "\n";
186
+		echo 'singleId: '.$federatedUser->getSingleId()."\n";
187 187
 
188 188
 		//		$federatedUser->getMemberships();
189 189
 
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
 
223 223
 
224 224
 		$members = array_map(
225
-			function (Member $member): string {
226
-				return $member->getUserId() . ' ' . $member->getSingleId() . '   - ' . $member->getUserType();
225
+			function(Member $member): string {
226
+				return $member->getUserId().' '.$member->getSingleId().'   - '.$member->getUserType();
227 227
 			}, $circle->getInheritedMembers()
228 228
 		);
229 229
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 			} catch (Exception $e) {
310 310
 				if ($this->pOn) {
311 311
 					$message = ($e->getMessage() !== '') ? $e->getMessage() : get_class($e);
312
-					$this->output->writeln('<error>' . $message . '</error>');
312
+					$this->output->writeln('<error>'.$message.'</error>');
313 313
 				} else {
314 314
 					throw $e;
315 315
 				}
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 	 */
394 394
 	private function loadConfiguration() {
395 395
 		$this->p('Loading configuration');
396
-		$configuration = file_get_contents(__DIR__ . '/../../testConfiguration.json');
396
+		$configuration = file_get_contents(__DIR__.'/../../testConfiguration.json');
397 397
 		$this->config = json_decode($configuration, true);
398 398
 		$this->r(true, 'testConfiguration.json');
399 399
 
@@ -426,22 +426,22 @@  discard block
 block discarded – undo
426 426
 		$this->r();
427 427
 
428 428
 		foreach ($this->getInstances() as $instance) {
429
-			$this->p('Creating users on ' . $instance);
429
+			$this->p('Creating users on '.$instance);
430 430
 			foreach ($this->getConfigArray($instance, 'users') as $userId) {
431 431
 				$this->pm($userId);
432 432
 				$this->occ(
433
-					$instance, 'user:add --password-from-env ' . $userId, false, false,
433
+					$instance, 'user:add --password-from-env '.$userId, false, false,
434 434
 					['OC_PASS' => 'testtest']
435 435
 				);
436 436
 			}
437 437
 			$this->r();
438 438
 
439 439
 			foreach ($this->getConfigArray($instance, 'groups') as $groupId => $users) {
440
-				$this->p('Creating group <info>' . $groupId . '</info> on <info>' . $instance . '</info>');
441
-				$this->occ($instance, 'group:add ' . $groupId, false, false);
440
+				$this->p('Creating group <info>'.$groupId.'</info> on <info>'.$instance.'</info>');
441
+				$this->occ($instance, 'group:add '.$groupId, false, false);
442 442
 				foreach ($users as $userId) {
443 443
 					$this->pm($userId);
444
-					$this->occ($instance, 'group:adduser ' . $groupId . ' ' . $userId, true, false);
444
+					$this->occ($instance, 'group:adduser '.$groupId.' '.$userId, true, false);
445 445
 				}
446 446
 				$this->r();
447 447
 			}
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		foreach ($this->getInstances(true) as $instance) {
476 476
 			$this->pm($instance);
477 477
 			foreach ($this->getConfigArray($instance, 'config') as $k => $v) {
478
-				$this->occ($instance, 'config:app:set --value ' . $v . ' circles ' . $k, true, false);
478
+				$this->occ($instance, 'config:app:set --value '.$v.' circles '.$k, true, false);
479 479
 			}
480 480
 		}
481 481
 		$this->r();
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
 	 */
489 489
 	private function confirmVersion() {
490 490
 		$version = $this->configService->getAppValue('installed_version');
491
-		$this->p('Confirming version <info>' . $version . '</info>');
491
+		$this->p('Confirming version <info>'.$version.'</info>');
492 492
 		foreach ($this->getInstances(false) as $instance) {
493 493
 			$this->pm($instance);
494 494
 			$capabilities = $this->occ($instance, 'circles:check --capabilities');
@@ -539,12 +539,12 @@  discard block
 block discarded – undo
539 539
 	 */
540 540
 	private function statusFreshInstances() {
541 541
 		foreach ($this->getInstances() as $instanceId) {
542
-			$this->p('Circles on ' . $instanceId);
542
+			$this->p('Circles on '.$instanceId);
543 543
 			$result = $this->occ($instanceId, 'circles:manage:list --all');
544 544
 			$expectedSize = sizeof($this->getConfigArray($instanceId, 'groups'))
545 545
 							+ sizeof($this->getConfigArray($instanceId, 'users'))
546 546
 							+ 1;
547
-			$this->r((sizeof($result) === $expectedSize), ((string)sizeof($result)) . ' circles');
547
+			$this->r((sizeof($result) === $expectedSize), ((string)sizeof($result)).' circles');
548 548
 
549 549
 			$membersList = $groupsList = [];
550 550
 			foreach ($result as $item) {
@@ -563,12 +563,12 @@  discard block
 block discarded – undo
563 563
 			$instance = $this->getConfig($instanceId, 'config.frontal_cloud_id');
564 564
 
565 565
 			foreach ($this->getConfigArray($instanceId, 'users') as $userId) {
566
-				$this->p('Checking Single Circle for <comment>' . $userId . '@' . $instance . '</comment>');
566
+				$this->p('Checking Single Circle for <comment>'.$userId.'@'.$instance.'</comment>');
567 567
 				$circle = $this->getSingleCircleForMember($membersList, $userId, $instance);
568 568
 
569 569
 				$compareToOwnerBasedOn = new Circle();
570 570
 				$compareToOwnerBasedOn->setConfig(Circle::CFG_SINGLE)
571
-					->setName('user:' . $userId . ':{CIRCLEID}')
571
+					->setName('user:'.$userId.':{CIRCLEID}')
572 572
 					->setDisplayName($userId);
573 573
 
574 574
 				$compareToOwner = new Member();
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 				$compareTo = new Circle();
587 587
 				$compareTo->setOwner($compareToOwner)
588 588
 					->setConfig(Circle::CFG_SINGLE)
589
-					->setName('user:' . $userId . ':{CIRCLEID}')
589
+					->setName('user:'.$userId.':{CIRCLEID}')
590 590
 					->setDisplayName($userId);
591 591
 
592 592
 				$this->confirmCircleData($circle, $compareTo);
@@ -623,8 +623,8 @@  discard block
 block discarded – undo
623 623
 			$this->r(true, $circle->getSingleId());
624 624
 
625 625
 			foreach ($this->getConfigArray($instanceId, 'groups') as $groupId => $members) {
626
-				$this->p('Checking Circle for <comment>' . $groupId . '@' . $instance . '</comment>');
627
-				$circle = $this->getCircleFromList($groupsList, 'group:' . $groupId);
626
+				$this->p('Checking Circle for <comment>'.$groupId.'@'.$instance.'</comment>');
627
+				$circle = $this->getCircleFromList($groupsList, 'group:'.$groupId);
628 628
 
629 629
 				$appCircle = $this->getSingleCircleForMember($membersList, 'circles', $instance);
630 630
 				$appOwner = $appCircle->getOwner();
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 				$compareTo = new Circle();
649 649
 				$compareTo->setOwner($compareToOwner)
650 650
 					->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
651
-					->setName('group:' . $groupId)
651
+					->setName('group:'.$groupId)
652 652
 					->setDisplayName($groupId);
653 653
 
654 654
 				$this->confirmCircleData($circle, $compareTo);
@@ -665,12 +665,12 @@  discard block
 block discarded – undo
665 665
 	 */
666 666
 	private function createRemoteLink() {
667 667
 		foreach ($this->getInstances() as $instanceId) {
668
-			$this->p('Init remote link from ' . $instanceId);
668
+			$this->p('Init remote link from '.$instanceId);
669 669
 			$links = $this->getConfigArray($instanceId, 'remote');
670 670
 			foreach ($links as $link => $type) {
671 671
 				$remote = $this->getConfig($link, 'config.frontal_cloud_id');
672
-				$this->pm($remote . '(' . $type . ')');
673
-				$this->occ($instanceId, 'circles:remote ' . $remote . ' --type ' . $type . ' --yes');
672
+				$this->pm($remote.'('.$type.')');
673
+				$this->occ($instanceId, 'circles:remote '.$remote.' --type '.$type.' --yes');
674 674
 			}
675 675
 			$this->r();
676 676
 		}
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	private function buildingLocalDatabase() {
685 685
 		$this->circles = $this->federatedUsers = [];
686 686
 		foreach ($this->getInstances() as $instanceId) {
687
-			$this->p('Retrieving Circles from ' . $instanceId);
687
+			$this->p('Retrieving Circles from '.$instanceId);
688 688
 			$circles = $this->occ($instanceId, 'circles:manage:list --all');
689 689
 			foreach ($circles as $item) {
690 690
 				/** @var Circle $circle */
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		$name = self::$TEST_CIRCLES[0];
720 720
 		$owner = $this->getInstanceUsers($localInstanceId)[1];
721 721
 		$dataCreatedCircle001 =
722
-			$this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name);
722
+			$this->occ($localInstanceId, 'circles:manage:create --type user '.$owner.' '.$name);
723 723
 		/** @var Circle $createdCircle */
724 724
 		$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
725 725
 		$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
 
752 752
 
753 753
 		$this->p('Comparing local stored data');
754
-		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details ' . $createdCircle->getSingleId());
754
+		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details '.$createdCircle->getSingleId());
755 755
 
756 756
 		/** @var Circle $tmpCircle */
757 757
 		$tmpCircle = $this->deserialize($dataCircle, Circle::class);
@@ -760,9 +760,9 @@  discard block
 block discarded – undo
760 760
 
761 761
 		$links = $this->getConfigArray('global-scale-1', 'remote');
762 762
 		foreach ($this->getInstances(false) as $instanceId) {
763
-			$this->p('Comparing data stored on ' . $instanceId);
763
+			$this->p('Comparing data stored on '.$instanceId);
764 764
 			$dataCircle =
765
-				$this->occ($instanceId, 'circle:manage:details ' . $createdCircle->getSingleId(), false);
765
+				$this->occ($instanceId, 'circle:manage:details '.$createdCircle->getSingleId(), false);
766 766
 
767 767
 			if ($instanceId === $localInstanceId || $links[$instanceId] === 'GlobalScale') {
768 768
 				/** @var Circle $tmpCircle */
@@ -815,11 +815,11 @@  discard block
 block discarded – undo
815 815
 		$name = self::$TEST_CIRCLES[0];
816 816
 		$circle = $this->getCircleByName($localInstanceId, $name);
817 817
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
818
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
818
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
819 819
 		$user = $userCircle->getOwner();
820 820
 		$dataAddedMember =
821 821
 			$this->occ(
822
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
822
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
823 823
 			);
824 824
 		/** @var Member $addedMember */
825 825
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -839,11 +839,11 @@  discard block
 block discarded – undo
839 839
 
840 840
 		$circle = $this->getCircleByName($localInstanceId, $circleName);
841 841
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
842
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
842
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
843 843
 		$user = $userCircle->getOwner();
844 844
 		$dataAddedMember =
845 845
 			$this->occ(
846
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
846
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
847 847
 			);
848 848
 		/** @var Member $addedMember */
849 849
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
@@ -937,19 +937,19 @@  discard block
 block discarded – undo
937 937
 			];
938 938
 		}
939 939
 
940
-		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix . '.id', $params);
941
-		$this->compare($compareTo->getName(), $circle->getName(), $prefix . '.name', $params);
940
+		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix.'.id', $params);
941
+		$this->compare($compareTo->getName(), $circle->getName(), $prefix.'.name', $params);
942 942
 		$this->compare(
943
-			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix . '.displayName', $params
943
+			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix.'.displayName', $params
944 944
 		);
945
-		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix . '.config', true);
946
-		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix . '.source');
945
+		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix.'.config', true);
946
+		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix.'.source');
947 947
 
948 948
 		if ($compareTo->hasOwner()) {
949 949
 			$compareToOwner = $compareTo->getOwner();
950 950
 			$owner = $circle->getOwner();
951 951
 			if ($owner->getCircleId() !== $circle->getSingleId()) {
952
-				throw new Exception($prefix . '.owner.circleId is different than ' . $prefix . '.id');
952
+				throw new Exception($prefix.'.owner.circleId is different than '.$prefix.'.id');
953 953
 			}
954 954
 			$this->confirmMemberData($owner, $compareToOwner, 'owner', false, $params);
955 955
 		}
@@ -960,7 +960,7 @@  discard block
 block discarded – undo
960 960
 			}
961 961
 			$initiator = $circle->getInitiator();
962 962
 			if ($initiator->getCircleId() !== $circle->getSingleId()) {
963
-				throw new Exception($prefix . '.initiator.circleId is different than ' . $prefix . '.id');
963
+				throw new Exception($prefix.'.initiator.circleId is different than '.$prefix.'.id');
964 964
 			}
965 965
 			$this->confirmMemberData($initiator, $compareToInitiator, 'owner', false, $params);
966 966
 		}
@@ -986,27 +986,27 @@  discard block
 block discarded – undo
986 986
 		bool $versa = false,
987 987
 		array $params = [],
988 988
 	) {
989
-		$this->compare($compareTo->getId(), $member->getId(), $prefix . '.id', $params);
990
-		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix . '.circleId', $params);
991
-		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix . '.singleId', $params);
992
-		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix . '.userId', $params);
989
+		$this->compare($compareTo->getId(), $member->getId(), $prefix.'.id', $params);
990
+		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix.'.circleId', $params);
991
+		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix.'.singleId', $params);
992
+		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix.'.userId', $params);
993 993
 		$this->compare(
994
-			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix . '.displayName', $params
994
+			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix.'.displayName', $params
995 995
 		);
996
-		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix . '.userType');
997
-		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix . '.instance', $params);
998
-		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix . '.level', true);
999
-		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix . '.status', $params);
996
+		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix.'.userType');
997
+		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix.'.instance', $params);
998
+		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix.'.level', true);
999
+		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix.'.status', $params);
1000 1000
 
1001 1001
 		if ($compareTo->hasBasedOn()) {
1002 1002
 			if (!$member->hasBasedOn()) {
1003
-				throw new Exception('empty ' . $prefix . '.basedOn');
1003
+				throw new Exception('empty '.$prefix.'.basedOn');
1004 1004
 			}
1005 1005
 			$basedOn = $member->getBasedOn();
1006 1006
 			$this->confirmCircleData(
1007 1007
 				$basedOn,
1008 1008
 				$compareTo->getBasedOn(),
1009
-				$prefix . '.basedOn',
1009
+				$prefix.'.basedOn',
1010 1010
 				false,
1011 1011
 				$params
1012 1012
 			);
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 	private function compare(string $expected, string $compare, string $def, array $params) {
1026 1026
 		if ($expected !== ''
1027 1027
 			&& $this->feedStringWithParams($expected, $params) !== $compare) {
1028
-			throw new Exception($def . ': ' . $compare . ' (' . $expected . ')');
1028
+			throw new Exception($def.': '.$compare.' ('.$expected.')');
1029 1029
 		}
1030 1030
 	}
1031 1031
 
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 	private function compareInt(int $expected, int $compare, string $def, bool $force = false) {
1042 1042
 		if (($expected > 0 || ($force && $expected >= 0))
1043 1043
 			&& $expected !== $compare) {
1044
-			throw new Exception('wrong ' . $def . ': ' . ((string)$compare) . ' (' . ((string)$expected) . ')');
1044
+			throw new Exception('wrong '.$def.': '.((string)$compare).' ('.((string)$expected).')');
1045 1045
 		}
1046 1046
 	}
1047 1047
 
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
 			}
1078 1078
 		}
1079 1079
 
1080
-		throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Circle');
1080
+		throw new CircleNotFoundException('cannot find '.$userId.' in the list of Single Circle');
1081 1081
 	}
1082 1082
 
1083 1083
 
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
1095 1095
 		}
1096 1096
 
1097 1097
 		throw new CircleNotFoundException(
1098
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
1098
+			'cannot extract \''.$name.'\' from the list of generated Circles'
1099 1099
 		);
1100 1100
 	}
1101 1101
 
@@ -1115,7 +1115,7 @@  discard block
 block discarded – undo
1115 1115
 		}
1116 1116
 
1117 1117
 		throw new CircleNotFoundException(
1118
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
1118
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
1119 1119
 		);
1120 1120
 	}
1121 1121
 
@@ -1160,7 +1160,7 @@  discard block
 block discarded – undo
1160 1160
 			}
1161 1161
 		}
1162 1162
 
1163
-		throw new ItemNotFoundException($instance . ' not found');
1163
+		throw new ItemNotFoundException($instance.' not found');
1164 1164
 	}
1165 1165
 
1166 1166
 
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 	): ?array {
1196 1196
 		$configInstance = $this->getConfigInstance($instance);
1197 1197
 		$path = $this->get('path', $configInstance);
1198
-		$occ = rtrim($path, '/') . '/occ';
1198
+		$occ = rtrim($path, '/').'/occ';
1199 1199
 
1200 1200
 		$command = array_merge([$occ], explode(' ', $cmd));
1201 1201
 		if ($jsonAsOutput) {
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
1205 1205
 		$process->run(null, $env);
1206 1206
 
1207 1207
 		if ($exceptionOnFail && !$process->isSuccessful()) {
1208
-			throw new Exception(implode(' ', $command) . ' failed');
1208
+			throw new Exception(implode(' ', $command).' failed');
1209 1209
 		}
1210 1210
 
1211 1211
 		$output = json_decode($process->getOutput(), true);
@@ -1228,7 +1228,7 @@  discard block
 block discarded – undo
1228 1228
 	 */
1229 1229
 	private function t(string $title): void {
1230 1230
 		$this->output->writeln('');
1231
-		$this->output->writeln('<comment>### ' . $title . '</comment>');
1231
+		$this->output->writeln('<comment>### '.$title.'</comment>');
1232 1232
 		$this->output->writeln('');
1233 1233
 	}
1234 1234
 
@@ -1237,14 +1237,14 @@  discard block
 block discarded – undo
1237 1237
 	 */
1238 1238
 	private function p(string $processing): void {
1239 1239
 		$this->pOn = true;
1240
-		$this->output->write('- ' . $processing . ': ');
1240
+		$this->output->write('- '.$processing.': ');
1241 1241
 	}
1242 1242
 
1243 1243
 	/**
1244 1244
 	 * @param string $more
1245 1245
 	 */
1246 1246
 	private function pm(string $more): void {
1247
-		$this->output->write($more . ' ');
1247
+		$this->output->write($more.' ');
1248 1248
 	}
1249 1249
 
1250 1250
 	/**
@@ -1254,9 +1254,9 @@  discard block
 block discarded – undo
1254 1254
 	private function r(bool $result = true, string $info = ''): void {
1255 1255
 		$this->pOn = false;
1256 1256
 		if ($result) {
1257
-			$this->output->writeln('<info>' . (($info !== '') ? $info : 'done') . '</info>');
1257
+			$this->output->writeln('<info>'.(($info !== '') ? $info : 'done').'</info>');
1258 1258
 		} else {
1259
-			$this->output->writeln('<error>' . (($info !== '') ? $info : 'done') . '</error>');
1259
+			$this->output->writeln('<error>'.(($info !== '') ? $info : 'done').'</error>');
1260 1260
 		}
1261 1261
 	}
1262 1262
 
@@ -1278,16 +1278,16 @@  discard block
 block discarded – undo
1278 1278
 		$dataAddedMember =
1279 1279
 			$this->occ(
1280 1280
 				$instanceId,
1281
-				'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type
1281
+				'circles:members:add '.$circle->getSingleId().' '.$userId.' --type '.$type
1282 1282
 			);
1283 1283
 		/** @var Member $addedMember */
1284 1284
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
1285 1285
 
1286 1286
 
1287
-		echo 'ADDEDMEMBER: ' . json_encode($addedMember, JSON_PRETTY_PRINT) . "\n";
1287
+		echo 'ADDEDMEMBER: '.json_encode($addedMember, JSON_PRETTY_PRINT)."\n";
1288 1288
 
1289 1289
 		$federatedUser = $this->federatedUsers[$instanceId][$userId];
1290
-		echo 'FEDERATEDUER: ' . json_encode($federatedUser, JSON_PRETTY_PRINT) . "\n";
1290
+		echo 'FEDERATEDUER: '.json_encode($federatedUser, JSON_PRETTY_PRINT)."\n";
1291 1291
 
1292 1292
 		return $addedMember;
1293 1293
 	}
Please login to merge, or discard this patch.