nextcloud / circles

lib/Tools/Traits/TStringTools.php

Spacing +17 added lines, -17 removed lines

@@ -109,7 +109,7 @@ 
 			return $line;
 		}
 
-		return substr($line, 0, $length - 5) . ' [..]';
+		return substr($line, 0, $length - 5).' [..]';
 	}
 
 
@@ -129,7 +129,7 @@ 
 		$length = $length + 5;
 
 		return array_map(
-			function ($value) use ($flag, $length, &$c) {
+			function($value) use ($flag, $length, &$c) {
 				$n = $value;
 				if (($flag & $c) !== 0) {
 					$n = $this->cut($value, $length);
@@ -177,7 +177,7 @@ 
 	protected function feedStringWithParams(string $line, array $params): string {
 		$ak = array_keys($params);
 		foreach ($ak as $k) {
-			$line = str_replace('{' . $k . '}', (string)$params[$k], $line);
+			$line = str_replace('{'.$k.'}', (string)$params[$k], $line);
 		}
 
 		return $line;
@@ -231,7 +231,7 @@ 
 		$s = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
 		$e = floor(log($bytes, 1024));
 
-		return round($bytes / pow(1024, $e), 2) . ' ' . $s[$e];
+		return round($bytes / pow(1024, $e), 2).' '.$s[$e];
 	}
 
 
@@ -254,8 +254,8 @@ 
 			$second = time();
 		}
 
-		$f = new DateTime('@' . $first);
-		$s = new DateTime('@' . $second);
+		$f = new DateTime('@'.$first);
+		$s = new DateTime('@'.$second);
 		$duration = $second - $first;
 		if ($short) {
 			$minutes = $this->get('minutes', $words, 'M');
@@ -263,16 +263,16 @@ 
 			$days = $this->get('days', $words, 'D');
 
 			if ($duration < 60) {
-				return $f->diff($s)->format('<1' . $minutes);
+				return $f->diff($s)->format('<1'.$minutes);
 			}
 			if ($duration < 3600) {
-				return $f->diff($s)->format('%i' . $minutes);
+				return $f->diff($s)->format('%i'.$minutes);
 			}
 			if ($duration < 86400) {
-				return $f->diff($s)->format('%h' . $hours . ', %i' . $minutes);
+				return $f->diff($s)->format('%h'.$hours.', %i'.$minutes);
 			}
 
-			return $f->diff($s)->format('%a' . $days . ', %h' . $hours . ', %i' . $minutes);
+			return $f->diff($s)->format('%a'.$days.', %h'.$hours.', %i'.$minutes);
 		}
 
 		$seconds = $this->get('seconds', $words, 'seconds');
@@ -280,22 +280,22 @@ 
 		$hours = $this->get('hours', $words, 'hours');
 		$days = $this->get('days', $words, 'days');
 		if ($duration < 60) {
-			return $f->diff($s)->format('%s ' . $seconds);
+			return $f->diff($s)->format('%s '.$seconds);
 		}
 
 		if ($duration < 3600) {
-			return $f->diff($s)->format('%i ' . $minutes . ' and %s ' . $seconds);
+			return $f->diff($s)->format('%i '.$minutes.' and %s '.$seconds);
 		}
 
 		if ($duration < 86400) {
-			return $f->diff($s)->format('%h ' . $hours . ', %i ' . $minutes . ' and %s ' . $seconds);
+			return $f->diff($s)->format('%h '.$hours.', %i '.$minutes.' and %s '.$seconds);
 		}
 
 		return $f->diff($s)->format(
-			'%a ' . $days .
-			', %h ' . $hours .
-			', %i ' . $minutes .
-			' and %s ' . $seconds
+			'%a '.$days.
+			', %h '.$hours.
+			', %i '.$minutes.
+			' and %s '.$seconds
 		);
 	}
 }

lib/Command/MembersList.php

Spacing +14 added lines, -15 removed lines

@@ -187,11 +187,11 @@ 
 			$this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true);
 			$circle = $this->circleService->getCircle($circleId);
 
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
+			$output->writeln('<info>Name</info>: '.$circle->getName());
 			$owner = $circle->getOwner();
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
 			$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -259,8 +259,7 @@ 
 							), 40
 						),
 						$this->configService->displayInstance($member->getInstance()),
-						($level > 0) ? Member::$DEF_LEVEL[$level] :
-							'(' . strtolower($member->getStatus()) . ')',
+						($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')',
 						($member->hasInvitedBy()) ? $this->configService->displayFederatedUser(
 							$member->getInvitedBy(), $this->input->getOption('display-name')
 						) : 'Unknown'
@@ -427,14 +426,14 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getSingleId() . '</info>';
+					$line .= '<info>'.$member->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
-						$line .= '@' . $member->getInstance();
+						$line .= '@'.$member->getInstance();
 					}
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
 
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Name</info>: ' . $this->configService->displayFederatedUser(
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Name</info>: '.$this->configService->displayFederatedUser(
 							$member,
 							$this->input->getOption('display-name')
 						);
@@ -442,7 +441,7 @@ 
 						$line .= ' <info>Source</info>: '
 								 . Circle::$DEF_SOURCE[$member->getBasedOn()->getSource()];
 					} else {
-						$line .= ' <info>Type</info>: ' . Member::$TYPE[$member->getUserType()];
+						$line .= ' <info>Type</info>: '.Member::$TYPE[$member->getUserType()];
 					}
 				}
 
@@ -455,15 +454,15 @@ 
 						return $line;
 					}
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}