Completed
Pull Request — master (#745)
by Maxence
01:15 queued 10s
created
lib/Service/ConfigService.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 			return $value;
200 200
 		}
201 201
 
202
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
202
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
203 203
 			return $value;
204 204
 		}
205 205
 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	 */
419 419
 	public function getTrustedDomains(): array {
420 420
 		return array_map(
421
-			function (string $address) {
421
+			function(string $address) {
422 422
 				return strtolower($address);
423 423
 			}, $this->config->getSystemValue('trusted_domains', [])
424 424
 		);
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 		}
455 455
 
456 456
 		if (array_key_exists('port', $loopback)) {
457
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
457
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
458 458
 		} else {
459 459
 			$loopbackCloudId = $loopback['host'];
460 460
 		}
@@ -483,12 +483,12 @@  discard block
 block discarded – undo
483 483
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
484 484
 		}
485 485
 
486
-		$base = $scheme . '://' . $instance;
486
+		$base = $scheme.'://'.$instance;
487 487
 		if ($route === '') {
488 488
 			return $base;
489 489
 		}
490 490
 
491
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
491
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
492 492
 	}
493 493
 
494 494
 
@@ -589,10 +589,10 @@  discard block
 block discarded – undo
589 589
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
590 590
 
591 591
 		if ($federatedUser->getUserType() === Member::TYPE_MAIL) {
592
-			return $name . ' (' . $this->displayInstance($federatedUser->getInstance(), false) . ')';
592
+			return $name.' ('.$this->displayInstance($federatedUser->getInstance(), false).')';
593 593
 		}
594 594
 
595
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
595
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
596 596
 	}
597 597
 
598 598
 	/**
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 			return '';
607 607
 		}
608 608
 
609
-		return (($showAt) ? '@' : '') . $instance;
609
+		return (($showAt) ? '@' : '').$instance;
610 610
 	}
611 611
 
612 612
 
Please login to merge, or discard this patch.
lib/Service/MigrationService.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 				try {
254 254
 					$data = new SimpleDataStore($row);
255 255
 					$this->outputService->output(
256
-						'Migrating Circle \'' . $data->g('name') . '\' (' . $data->g('unique_id') . ')',
256
+						'Migrating Circle \''.$data->g('name').'\' ('.$data->g('unique_id').')',
257 257
 						true
258 258
 					);
259 259
 
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 				try {
358 358
 					$data = new SimpleDataStore($row);
359 359
 					$this->outputService->output(
360
-						'Migrating Member \'' . $data->g('user_id') . '\' from \'' . $data->g('circle_id')
360
+						'Migrating Member \''.$data->g('user_id').'\' from \''.$data->g('circle_id')
361 361
 						. '\'',
362 362
 						true
363 363
 					);
@@ -472,8 +472,8 @@  discard block
 block discarded – undo
472 472
 					$federatedUser =
473 473
 						$this->federatedUserService->getLocalFederatedUser($data->g('share_with'));
474 474
 					$this->outputService->output(
475
-						'Migrating child share #' . $data->gInt('id') . ' owner: ' . $data->g('share_with')
476
-						. ' -> ' . $federatedUser->getSingleId(),
475
+						'Migrating child share #'.$data->gInt('id').' owner: '.$data->g('share_with')
476
+						. ' -> '.$federatedUser->getSingleId(),
477 477
 						true
478 478
 					);
479 479
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 			$addressBook =
540 540
 				$this->contactService->getAddressBoxById($cm, $this->get('addressbook-key', $entry));
541 541
 
542
-			$member->setUserId($userId . '/' . $addressBook->getUri() . '/' . $contactId);
542
+			$member->setUserId($userId.'/'.$addressBook->getUri().'/'.$contactId);
543 543
 		}
544 544
 	}
545 545
 
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 				try {
575 575
 					$data = new SimpleDataStore($row);
576 576
 					$this->outputService->output(
577
-						'Migrating ShareToken \'' . $data->g('token') . '\' for \'' . $data->g('user_id')
577
+						'Migrating ShareToken \''.$data->g('token').'\' for \''.$data->g('user_id')
578 578
 						. '\'',
579 579
 						true
580 580
 					);
Please login to merge, or discard this patch.