Completed
Pull Request — master (#594)
by Maxence
02:28
created
lib/Db/FileSharesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 		$expr = $qb->expr();
106 106
 
107 107
 		$this->limitToShareType($qb, self::SHARE_TYPE);
108
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
108
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
109 109
 
110 110
 		$shares = [];
111 111
 		$cursor = $qb->execute();
Please login to merge, or discard this patch.
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.
tests/unit/lib/Api/CirclesTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 			} catch (Exception $e) {
332 332
 				$this->assertSame(
333 333
 					true, false,
334
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
334
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
335 335
 				);
336 336
 			}
337 337
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			} catch (Exception $e) {
346 346
 				$this->assertSame(
347 347
 					true, false,
348
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
348
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
349 349
 				);
350 350
 			}
351 351
 
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
 	define('PHPUNIT_RUN', 1);
8 8
 }
9 9
 
10
-require_once __DIR__ . '/../../../lib/base.php';
10
+require_once __DIR__.'/../../../lib/base.php';
11 11
 
12 12
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
13
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
13
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
14 14
 
15 15
 \OC_App::loadApp(Application::APP_ID);
16 16
 
Please login to merge, or discard this patch.
templates/files/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@
 block discarded – undo
18 18
 		<tr>
19 19
 			<th id='headerName' class="hidden column-name">
20 20
 				<div id="headerName-container">
21
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
21
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
22 22
 				</div>
23 23
 			</th>
24 24
 			<th id="headerSize" class="hidden column-size">
25 25
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
26 26
 			</th>
27 27
 			<th id="headerDate" class="hidden column-mtime">
28
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
28
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
29 29
 			</th>
30 30
 		</tr>
31 31
 	</thead>
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
 	 * @throws RequestBuilderException
297 297
 	 */
298 298
 	public function move(IShare $share, $recipient): IShare {
299
-		OC::$server->getLogger()->log(3, 'CSP > move' . $share->getId() . ' ' . $recipient);
299
+		OC::$server->getLogger()->log(3, 'CSP > move'.$share->getId().' '.$recipient);
300 300
 
301 301
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($recipient);
302 302
 		$child = $this->shareWrapperService->getChild($share, $federatedUser);
Please login to merge, or discard this patch.
lib/Command/CirclesDestroy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesSync.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		if (($userId = $input->getOption('user')) !== '') {
124 124
 			$federatedUser = $this->syncService->syncNextcloudUser($userId);
125 125
 			$output->writeln(
126
-				'- Nextcloud User <info>' . $userId . '</info>/<info>' . $federatedUser->getSingleId()
126
+				'- Nextcloud User <info>'.$userId.'</info>/<info>'.$federatedUser->getSingleId()
127 127
 				. '</info> synced'
128 128
 			);
129 129
 		}
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		if (($groupId = $input->getOption('group')) !== '') {
137 137
 			$circle = $this->syncService->syncNextcloudGroup($groupId);
138 138
 			$output->writeln(
139
-				'- Nextcloud Group <info>' . $groupId . '</info>/<info>' . $circle->getSingleId()
139
+				'- Nextcloud Group <info>'.$groupId.'</info>/<info>'.$circle->getSingleId()
140 140
 				. '</info> synced'
141 141
 			);
142 142
 		}
Please login to merge, or discard this patch.
lib/Command/CirclesTest.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 			} catch (Exception $e) {
160 160
 				if ($this->pOn) {
161 161
 					$message = ($e->getMessage() !== '') ? $e->getMessage() : get_class($e);
162
-					$this->output->writeln('<error>' . $message . '</error>');
162
+					$this->output->writeln('<error>'.$message.'</error>');
163 163
 				} else {
164 164
 					throw $e;
165 165
 				}
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 */
244 244
 	private function loadConfiguration() {
245 245
 		$this->p('Loading configuration');
246
-		$configuration = file_get_contents(__DIR__ . '/../../testConfiguration.json');
246
+		$configuration = file_get_contents(__DIR__.'/../../testConfiguration.json');
247 247
 		$this->config = json_decode($configuration, true);
248 248
 		$this->r(true, 'testConfiguration.json');
249 249
 
@@ -276,22 +276,22 @@  discard block
 block discarded – undo
276 276
 		$this->r();
277 277
 
278 278
 		foreach ($this->getInstances() as $instance) {
279
-			$this->p('Creating users on ' . $instance);
279
+			$this->p('Creating users on '.$instance);
280 280
 			foreach ($this->getConfigArray($instance, 'users') as $userId) {
281 281
 				$this->pm($userId);
282 282
 				$this->occ(
283
-					$instance, 'user:add --password-from-env ' . $userId, false, false,
283
+					$instance, 'user:add --password-from-env '.$userId, false, false,
284 284
 					['OC_PASS' => 'testtest']
285 285
 				);
286 286
 			}
287 287
 			$this->r();
288 288
 
289 289
 			foreach ($this->getConfigArray($instance, 'groups') as $groupId => $users) {
290
-				$this->p('Creating group <info>' . $groupId . '</info> on <info>' . $instance . '</info>');
291
-				$this->occ($instance, 'group:add ' . $groupId, false, false);
290
+				$this->p('Creating group <info>'.$groupId.'</info> on <info>'.$instance.'</info>');
291
+				$this->occ($instance, 'group:add '.$groupId, false, false);
292 292
 				foreach ($users as $userId) {
293 293
 					$this->pm($userId);
294
-					$this->occ($instance, 'group:adduser ' . $groupId . ' ' . $userId, true, false);
294
+					$this->occ($instance, 'group:adduser '.$groupId.' '.$userId, true, false);
295 295
 				}
296 296
 				$this->r();
297 297
 			}
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 		foreach ($this->getInstances(true) as $instance) {
327 327
 			$this->pm($instance);
328 328
 			foreach ($this->getConfigArray($instance, 'config') as $k => $v) {
329
-				$this->occ($instance, 'config:app:set --value ' . $v . ' circles ' . $k, true, false);
329
+				$this->occ($instance, 'config:app:set --value '.$v.' circles '.$k, true, false);
330 330
 			}
331 331
 		}
332 332
 		$this->r();
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 */
340 340
 	private function confirmVersion() {
341 341
 		$version = $this->configService->getAppValue('installed_version');
342
-		$this->p('Confirming version <info>' . $version . '</info>');
342
+		$this->p('Confirming version <info>'.$version.'</info>');
343 343
 		foreach ($this->getInstances(false) as $instance) {
344 344
 			$this->pm($instance);
345 345
 			$capabilities = $this->occ($instance, 'circles:check --capabilities');
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	 */
391 391
 	private function statusFreshInstances() {
392 392
 		foreach ($this->getInstances() as $instanceId) {
393
-			$this->p('Circles on ' . $instanceId);
393
+			$this->p('Circles on '.$instanceId);
394 394
 			$result = $this->occ($instanceId, 'circles:manage:list --all');
395 395
 			$expectedSize = sizeof($this->getConfigArray($instanceId, 'groups'))
396 396
 							+ sizeof($this->getConfigArray($instanceId, 'users'))
397 397
 							+ 1;
398
-			$this->r((sizeof($result) === $expectedSize), sizeof($result) . ' circles');
398
+			$this->r((sizeof($result) === $expectedSize), sizeof($result).' circles');
399 399
 
400 400
 			$membersList = $groupsList = [];
401 401
 			foreach ($result as $item) {
@@ -414,12 +414,12 @@  discard block
 block discarded – undo
414 414
 			$instance = $this->getConfig($instanceId, 'config.frontal_cloud_id');
415 415
 
416 416
 			foreach ($this->getConfigArray($instanceId, 'users') as $userId) {
417
-				$this->p('Checking Single Circle for <comment>' . $userId . '@' . $instance . '</comment>');
417
+				$this->p('Checking Single Circle for <comment>'.$userId.'@'.$instance.'</comment>');
418 418
 				$circle = $this->getSingleCircleForMember($membersList, $userId, $instance);
419 419
 
420 420
 				$compareToOwnerBasedOn = new Circle();
421 421
 				$compareToOwnerBasedOn->setConfig(Circle::CFG_SINGLE)
422
-									  ->setName('user:' . $userId . ':{CIRCLEID}')
422
+									  ->setName('user:'.$userId.':{CIRCLEID}')
423 423
 									  ->setDisplayName($userId);
424 424
 
425 425
 				$compareToOwner = new Member();
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 				$compareTo = new Circle();
438 438
 				$compareTo->setOwner($compareToOwner)
439 439
 						  ->setConfig(Circle::CFG_SINGLE)
440
-						  ->setName('user:' . $userId . ':{CIRCLEID}')
440
+						  ->setName('user:'.$userId.':{CIRCLEID}')
441 441
 						  ->setDisplayName($userId);
442 442
 
443 443
 				$this->confirmCircleData($circle, $compareTo);
@@ -474,8 +474,8 @@  discard block
 block discarded – undo
474 474
 			$this->r(true, $circle->getSingleId());
475 475
 
476 476
 			foreach ($this->getConfigArray($instanceId, 'groups') as $groupId => $members) {
477
-				$this->p('Checking Circle for <comment>' . $groupId . '@' . $instance . '</comment>');
478
-				$circle = $this->getCircleFromList($groupsList, 'group:' . $groupId);
477
+				$this->p('Checking Circle for <comment>'.$groupId.'@'.$instance.'</comment>');
478
+				$circle = $this->getCircleFromList($groupsList, 'group:'.$groupId);
479 479
 
480 480
 				$appCircle = $this->getSingleCircleForMember($membersList, 'circles', $instance);
481 481
 				$appOwner = $appCircle->getOwner();
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 				$compareTo = new Circle();
500 500
 				$compareTo->setOwner($compareToOwner)
501 501
 						  ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
502
-						  ->setName('group:' . $groupId)
502
+						  ->setName('group:'.$groupId)
503 503
 						  ->setDisplayName($groupId);
504 504
 
505 505
 				$this->confirmCircleData($circle, $compareTo);
@@ -516,12 +516,12 @@  discard block
 block discarded – undo
516 516
 	 */
517 517
 	private function createRemoteLink() {
518 518
 		foreach ($this->getInstances() as $instanceId) {
519
-			$this->p('Init remote link from ' . $instanceId);
519
+			$this->p('Init remote link from '.$instanceId);
520 520
 			$links = $this->getConfigArray($instanceId, 'remote');
521 521
 			foreach ($links as $link => $type) {
522 522
 				$remote = $this->getConfig($link, 'config.frontal_cloud_id');
523
-				$this->pm($remote . '(' . $type . ')');
524
-				$this->occ($instanceId, 'circles:remote ' . $remote . ' --type ' . $type . ' --yes');
523
+				$this->pm($remote.'('.$type.')');
524
+				$this->occ($instanceId, 'circles:remote '.$remote.' --type '.$type.' --yes');
525 525
 			}
526 526
 			$this->r();
527 527
 		}
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 	private function buildingLocalDatabase() {
536 536
 		$this->circles = $this->federatedUsers = [];
537 537
 		foreach ($this->getInstances() as $instanceId) {
538
-			$this->p('Retrieving Circles from ' . $instanceId);
538
+			$this->p('Retrieving Circles from '.$instanceId);
539 539
 			$circles = $this->occ($instanceId, 'circles:manage:list --all');
540 540
 			foreach ($circles as $item) {
541 541
 				/** @var Circle $circle */
@@ -570,11 +570,11 @@  discard block
 block discarded – undo
570 570
 		$name = self::$TEST_CIRCLES[0];
571 571
 		$owner = $this->getInstanceUsers($localInstanceId)[1];
572 572
 		$dataCreatedCircle001 =
573
-			$this->occ($localInstanceId, 'circles:manage:create --type user ' . $owner . ' ' . $name);
573
+			$this->occ($localInstanceId, 'circles:manage:create --type user '.$owner.' '.$name);
574 574
 		/** @var Circle $createdCircle */
575 575
 		$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
576 576
 		$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
577
-		$this->r(true, $createdCircle->getSingleId());;
577
+		$this->r(true, $createdCircle->getSingleId()); ;
578 578
 
579 579
 		$this->p('Comparing data returned at creation');
580 580
 		if ($createdCircle->getSingleId() === '' || $createdCircle->getOwner()->getId() === '') {
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
 
602 602
 
603 603
 		$this->p('Comparing local stored data');
604
-		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details ' . $createdCircle->getSingleId());
604
+		$dataCircle = $this->occ($localInstanceId, 'circle:manage:details '.$createdCircle->getSingleId());
605 605
 
606 606
 		/** @var Circle $tmpCircle */
607 607
 		$tmpCircle = $this->deserialize($dataCircle, Circle::class);
@@ -610,9 +610,9 @@  discard block
 block discarded – undo
610 610
 
611 611
 		$links = $this->getConfigArray('global-scale-1', 'remote');
612 612
 		foreach ($this->getInstances(false) as $instanceId) {
613
-			$this->p('Comparing data stored on ' . $instanceId);
613
+			$this->p('Comparing data stored on '.$instanceId);
614 614
 			$dataCircle =
615
-				$this->occ($instanceId, 'circle:manage:details ' . $createdCircle->getSingleId(), false);
615
+				$this->occ($instanceId, 'circle:manage:details '.$createdCircle->getSingleId(), false);
616 616
 
617 617
 			if ($instanceId === $localInstanceId || $links[$instanceId] === 'GlobalScale') {
618 618
 				/** @var Circle $tmpCircle */
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 		$member = $this->getInstanceUsers($instanceId)[2];
647 647
 
648 648
 		$addedMember = $this->processMemberAdd($instanceId, $circleName, $member, 'user');
649
-		$this->r(true, $addedMember->getId());;
649
+		$this->r(true, $addedMember->getId()); ;
650 650
 
651 651
 		// check test2
652 652
 	}
@@ -664,15 +664,15 @@  discard block
 block discarded – undo
664 664
 		$name = self::$TEST_CIRCLES[0];
665 665
 		$circle = $this->getCircleByName($localInstanceId, $name);
666 666
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
667
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
667
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
668 668
 		$user = $userCircle->getOwner();
669 669
 		$dataAddedMember =
670 670
 			$this->occ(
671
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
671
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
672 672
 			);
673 673
 		/** @var Member $addedMember */
674 674
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
675
-		$this->r(true, $addedMember->getId());;
675
+		$this->r(true, $addedMember->getId()); ;
676 676
 
677 677
 		// check test6
678 678
 	}
@@ -687,15 +687,15 @@  discard block
 block discarded – undo
687 687
 
688 688
 		$circle = $this->getCircleByName($localInstanceId, $circleName);
689 689
 		$userId = $this->getInstanceUsers($localInstanceId)[6];
690
-		$userCircle = $this->getCircleByName($localInstanceId, 'user:' . $userId);
690
+		$userCircle = $this->getCircleByName($localInstanceId, 'user:'.$userId);
691 691
 		$user = $userCircle->getOwner();
692 692
 		$dataAddedMember =
693 693
 			$this->occ(
694
-				$localInstanceId, 'circles:members:add ' . $circle->getSingleId() . ' ' . $user->getSingleId()
694
+				$localInstanceId, 'circles:members:add '.$circle->getSingleId().' '.$user->getSingleId()
695 695
 			);
696 696
 		/** @var Member $addedMember */
697 697
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
698
-		$this->r(true, $addedMember->getId());;
698
+		$this->r(true, $addedMember->getId()); ;
699 699
 	}
700 700
 
701 701
 	private function levelLocalMemberToModerator() {
@@ -785,13 +785,13 @@  discard block
 block discarded – undo
785 785
 			];
786 786
 		}
787 787
 
788
-		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix . '.id', $params);
789
-		$this->compare($compareTo->getName(), $circle->getName(), $prefix . '.name', $params);
788
+		$this->compare($compareTo->getSingleId(), $circle->getSingleId(), $prefix.'.id', $params);
789
+		$this->compare($compareTo->getName(), $circle->getName(), $prefix.'.name', $params);
790 790
 		$this->compare(
791
-			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix . '.displayName', $params
791
+			$compareTo->getDisplayName(), $circle->getDisplayName(), $prefix.'.displayName', $params
792 792
 		);
793
-		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix . '.config', true);
794
-		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix . '.source');
793
+		$this->compareInt($compareTo->getConfig(), $circle->getConfig(), $prefix.'.config', true);
794
+		$this->compareInt($compareTo->getSource(), $circle->getSource(), $prefix.'.source');
795 795
 
796 796
 		if ($compareTo->hasOwner()) {
797 797
 			$compareToOwner = $compareTo->getOwner();
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
801 801
 					throw new Exception('empty owner');
802 802
 				}
803 803
 				if ($owner->getCircleId() !== $circle->getSingleId()) {
804
-					throw new Exception($prefix . '.owner.circleId is different than ' . $prefix . '.id');
804
+					throw new Exception($prefix.'.owner.circleId is different than '.$prefix.'.id');
805 805
 				}
806 806
 				$this->confirmMemberData($owner, $compareToOwner, 'owner', false, $params);
807 807
 			}
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 				}
815 815
 				$initiator = $circle->getInitiator();
816 816
 				if ($initiator->getCircleId() !== $circle->getSingleId()) {
817
-					throw new Exception($prefix . '.initiator.circleId is different than ' . $prefix . '.id');
817
+					throw new Exception($prefix.'.initiator.circleId is different than '.$prefix.'.id');
818 818
 				}
819 819
 				$this->confirmMemberData($initiator, $compareToInitiator, 'owner', false, $params);
820 820
 			}
@@ -841,25 +841,25 @@  discard block
 block discarded – undo
841 841
 		bool $versa = false,
842 842
 		array $params = []
843 843
 	) {
844
-		$this->compare($compareTo->getId(), $member->getId(), $prefix . '.id', $params);
845
-		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix . '.circleId', $params);
846
-		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix . '.singleId', $params);
847
-		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix . '.userId', $params);
844
+		$this->compare($compareTo->getId(), $member->getId(), $prefix.'.id', $params);
845
+		$this->compare($compareTo->getCircleId(), $member->getCircleId(), $prefix.'.circleId', $params);
846
+		$this->compare($compareTo->getSingleId(), $member->getSingleId(), $prefix.'.singleId', $params);
847
+		$this->compare($compareTo->getUserId(), $member->getUserId(), $prefix.'.userId', $params);
848 848
 		$this->compare(
849
-			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix . '.displayName', $params
849
+			$compareTo->getDisplayName(), $member->getDisplayName(), $prefix.'.displayName', $params
850 850
 		);
851
-		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix . '.userType');
852
-		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix . '.instance', $params);
853
-		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix . '.level', true);
854
-		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix . '.status', $params);
851
+		$this->compareInt($compareTo->getUserType(), $member->getUserType(), $prefix.'.userType');
852
+		$this->compare($compareTo->getInstance(), $member->getInstance(), $prefix.'.instance', $params);
853
+		$this->compareInt($compareTo->getLevel(), $member->getLevel(), $prefix.'.level', true);
854
+		$this->compare($compareTo->getStatus(), $member->getStatus(), $prefix.'.status', $params);
855 855
 
856 856
 		$compareToBasedOn = $compareTo->getBasedOn();
857 857
 		if ($compareToBasedOn !== null) {
858 858
 			$basedOn = $member->getBasedOn();
859 859
 			if ($basedOn === null) {
860
-				throw new Exception('empty ' . $prefix . '.basedOn');
860
+				throw new Exception('empty '.$prefix.'.basedOn');
861 861
 			}
862
-			$this->confirmCircleData($basedOn, $compareToBasedOn, $prefix . '.basedOn', false, $params);
862
+			$this->confirmCircleData($basedOn, $compareToBasedOn, $prefix.'.basedOn', false, $params);
863 863
 		}
864 864
 
865 865
 	}
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 	private function compare(string $expected, string $compare, string $def, array $params) {
877 877
 		if ($expected !== ''
878 878
 			&& $this->feedStringWithParams($expected, $params) !== $compare) {
879
-			throw new Exception($def . ': ' . $compare . ' (' . $expected . ')');
879
+			throw new Exception($def.': '.$compare.' ('.$expected.')');
880 880
 		}
881 881
 	}
882 882
 
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 	private function compareInt(int $expected, int $compare, string $def, bool $force = false) {
893 893
 		if (($expected > 0 || ($force && $expected >= 0))
894 894
 			&& $expected !== $compare) {
895
-			throw new Exception('wrong ' . $def . ': ' . $compare . ' (' . $expected . ')');
895
+			throw new Exception('wrong '.$def.': '.$compare.' ('.$expected.')');
896 896
 		}
897 897
 	}
898 898
 
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
 			}
929 929
 		}
930 930
 
931
-		throw new CircleNotFoundException('cannot find ' . $userId . ' in the list of Single Circle');
931
+		throw new CircleNotFoundException('cannot find '.$userId.' in the list of Single Circle');
932 932
 	}
933 933
 
934 934
 
@@ -946,7 +946,7 @@  discard block
 block discarded – undo
946 946
 		}
947 947
 
948 948
 		throw new CircleNotFoundException(
949
-			'cannot extract \'' . $name . '\' from the list of generated Circles'
949
+			'cannot extract \''.$name.'\' from the list of generated Circles'
950 950
 		);
951 951
 	}
952 952
 
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
 		}
967 967
 
968 968
 		throw new CircleNotFoundException(
969
-			'cannot extract  \'' . $name . '\' from the list of provided Circles'
969
+			'cannot extract  \''.$name.'\' from the list of provided Circles'
970 970
 		);
971 971
 	}
972 972
 
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 			}
1012 1012
 		}
1013 1013
 
1014
-		throw new ItemNotFoundException($instance . ' not found');
1014
+		throw new ItemNotFoundException($instance.' not found');
1015 1015
 	}
1016 1016
 
1017 1017
 
@@ -1046,7 +1046,7 @@  discard block
 block discarded – undo
1046 1046
 	): ?array {
1047 1047
 		$configInstance = $this->getConfigInstance($instance);
1048 1048
 		$path = $this->get('path', $configInstance);
1049
-		$occ = rtrim($path, '/') . '/occ';
1049
+		$occ = rtrim($path, '/').'/occ';
1050 1050
 
1051 1051
 		$command = array_merge([$occ], explode(' ', $cmd));
1052 1052
 		if ($jsonAsOutput) {
@@ -1056,7 +1056,7 @@  discard block
 block discarded – undo
1056 1056
 		$process->run(null, $env);
1057 1057
 
1058 1058
 		if ($exceptionOnFail && !$process->isSuccessful()) {
1059
-			throw new Exception(implode(' ', $command) . ' failed');
1059
+			throw new Exception(implode(' ', $command).' failed');
1060 1060
 		}
1061 1061
 
1062 1062
 		$output = json_decode($process->getOutput(), true);
@@ -1079,7 +1079,7 @@  discard block
 block discarded – undo
1079 1079
 	 */
1080 1080
 	private function t(string $title): void {
1081 1081
 		$this->output->writeln('');
1082
-		$this->output->writeln('<comment>### ' . $title . '</comment>');
1082
+		$this->output->writeln('<comment>### '.$title.'</comment>');
1083 1083
 		$this->output->writeln('');
1084 1084
 	}
1085 1085
 
@@ -1088,14 +1088,14 @@  discard block
 block discarded – undo
1088 1088
 	 */
1089 1089
 	private function p(string $processing): void {
1090 1090
 		$this->pOn = true;
1091
-		$this->output->write('- ' . $processing . ': ');
1091
+		$this->output->write('- '.$processing.': ');
1092 1092
 	}
1093 1093
 
1094 1094
 	/**
1095 1095
 	 * @param string $more
1096 1096
 	 */
1097 1097
 	private function pm(string $more): void {
1098
-		$this->output->write($more . ' ');
1098
+		$this->output->write($more.' ');
1099 1099
 	}
1100 1100
 
1101 1101
 	/**
@@ -1105,9 +1105,9 @@  discard block
 block discarded – undo
1105 1105
 	private function r(bool $result = true, string $info = ''): void {
1106 1106
 		$this->pOn = false;
1107 1107
 		if ($result) {
1108
-			$this->output->writeln('<info>' . (($info !== '') ? $info : 'done') . '</info>');
1108
+			$this->output->writeln('<info>'.(($info !== '') ? $info : 'done').'</info>');
1109 1109
 		} else {
1110
-			$this->output->writeln('<error>' . (($info !== '') ? $info : 'done') . '</error>');
1110
+			$this->output->writeln('<error>'.(($info !== '') ? $info : 'done').'</error>');
1111 1111
 		}
1112 1112
 	}
1113 1113
 
@@ -1129,16 +1129,16 @@  discard block
 block discarded – undo
1129 1129
 		$dataAddedMember =
1130 1130
 			$this->occ(
1131 1131
 				$instanceId,
1132
-				'circles:members:add ' . $circle->getSingleId() . ' ' . $userId . ' --type ' . $type
1132
+				'circles:members:add '.$circle->getSingleId().' '.$userId.' --type '.$type
1133 1133
 			);
1134 1134
 		/** @var Member $addedMember */
1135 1135
 		$addedMember = $this->deserialize($dataAddedMember, Member::class);
1136 1136
 
1137 1137
 
1138
-		echo 'ADDEDMEMBER: ' . json_encode($addedMember, JSON_PRETTY_PRINT) . "\n";
1138
+		echo 'ADDEDMEMBER: '.json_encode($addedMember, JSON_PRETTY_PRINT)."\n";
1139 1139
 
1140 1140
 		$federatedUser = $this->federatedUsers[$instanceId][$userId];
1141
-		echo 'FEDERATEDUER: ' . json_encode($federatedUser, JSON_PRETTY_PRINT) . "\n";
1141
+		echo 'FEDERATEDUER: '.json_encode($federatedUser, JSON_PRETTY_PRINT)."\n";
1142 1142
 
1143 1143
 		return $addedMember;
1144 1144
 	}
Please login to merge, or discard this patch.