nextcloud / server

core/Command/Config/Import.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Import extends Command implements CompletionAwareInterface  {
+class Import extends Command implements CompletionAwareInterface {
 	protected $validRootKeys = ['system', 'apps'];
 
 	/** @var IConfig */
@@ -69,7 +69,7 @@ 
 		try {
 			$configs = $this->validateFileContent($content);
 		} catch (\UnexpectedValueException $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return;
 		}
 
@@ -89,7 +89,7 @@ 
 			}
 		}
 
-		$output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
+		$output->writeln('<info>Config successfully imported from: '.$importFile.'</info>');
 	}
 
 	/**
@@ -143,10 +143,10 @@ 
 		$additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
 		$commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
 		if (!empty($additionalKeys)) {
-			throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
+			throw new \UnexpectedValueException('Found invalid entries in root: '.implode(', ', $additionalKeys));
 		}
 		if (empty($commonKeys)) {
-			throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
+			throw new \UnexpectedValueException('At least one key of the following is expected: '.implode(', ', $this->validRootKeys));
 		}
 
 		if (isset($array['system'])) {
@@ -174,7 +174,7 @@ 
 	 */
 	protected function checkTypeRecursively($configValue, $configName) {
 		if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
-			throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
+			throw new \UnexpectedValueException('Invalid system config value for "'.$configName.'". Only arrays, bools, integers, strings and null (delete) are allowed.');
 		}
 		if (is_array($configValue)) {
 			foreach ($configValue as $key => $value) {
@@ -192,7 +192,7 @@ 
 		foreach ($array as $app => $configs) {
 			foreach ($configs as $name => $value) {
 				if (!is_int($value) && !is_string($value) && !is_null($value)) {
-					throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
+					throw new \UnexpectedValueException('Invalid app config value for "'.$app.'":"'.$name.'". Only integers, strings and null (delete) are allowed.');
 				}
 			}
 		}

core/Command/Maintenance/Repair.php

Spacing +4 added lines, -4 removed lines

@@ -132,16 +132,16 @@
 				$this->output->writeln('');
 				break;
 			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
+				$this->output->writeln(' - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
+				$this->output->writeln('     - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+				$this->output->writeln('     - WARNING: '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+				$this->output->writeln('     - ERROR: '.$event->getArgument(0));
 				break;
 		}
 	}

core/Command/App/Enable.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		$appId = $input->getArgument('app-id');
 
 		if (!\OC_App::getAppPath($appId)) {
-			$output->writeln($appId . ' not found');
+			$output->writeln($appId.' not found');
 			return 1;
 		}
 
@@ -78,10 +78,10 @@ 
 		$appClass = new \OC_App();
 		if (empty($groups)) {
 			$appClass->enable($appId);
-			$output->writeln($appId . ' enabled');
+			$output->writeln($appId.' enabled');
 		} else {
 			$appClass->enable($appId, $groups);
-			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
+			$output->writeln($appId.' enabled for groups: '.implode(', ', $groups));
 		}
 		return 0;
 	}

core/Command/App/Disable.php

Spacing +3 added lines, -3 removed lines

@@ -62,13 +62,13 @@
 		if ($this->manager->isInstalled($appId)) {
 			try {
 				$this->manager->disableApp($appId);
-				$output->writeln($appId . ' disabled');
-			} catch(\Exception $e) {
+				$output->writeln($appId.' disabled');
+			} catch (\Exception $e) {
 				$output->writeln($e->getMessage());
 				return 2;
 			}
 		} else {
-			$output->writeln('No such app enabled: ' . $appId);
+			$output->writeln('No such app enabled: '.$appId);
 		}
 	}
 

core/Command/Encryption/ShowKeyStorageRoot.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ShowKeyStorageRoot extends Command{
+class ShowKeyStorageRoot extends Command {
 
 	/** @var Util  */
 	protected $util;

core/Command/Encryption/Enable.php

Spacing +2 added lines, -2 removed lines

@@ -70,9 +70,9 @@
 			if ($defaultModule === null) {
 				$output->writeln('<error>No default module is set</error>');
 			} else if (!isset($modules[$defaultModule])) {
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
+				$output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>');
 			} else {
-				$output->writeln('Default module: ' . $defaultModule);
+				$output->writeln('Default module: '.$defaultModule);
 			}
 		}
 	}

core/Command/Encryption/ListModules.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 				if (!$item['default']) {
 					$item = $item['displayName'];
 				} else {
-					$item = $item['displayName'] . ' [default*]';
+					$item = $item['displayName'].' [default*]';
 				}
 			});
 		}

core/Command/Encryption/ChangeKeyStorageRoot.php

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'ownCloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -161,10 +161,10 @@ 
 	 */
 	protected function moveSystemKeys($oldRoot, $newRoot) {
 		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
+			$this->targetExists($newRoot.'/files_encryption') === false
 		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
 		}
 	}
 
@@ -193,7 +193,7 @@ 
 		$progress->start();
 
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -204,7 +204,7 @@ 
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 		$progress->finish();
 	}
@@ -221,13 +221,13 @@ 
 
 		if ($this->userManager->userExists($user)) {
 
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
+			$source = $oldRoot.'/'.$user.'/files_encryption';
+			$target = $newRoot.'/'.$user.'/files_encryption';
 			if (
 				$this->rootView->is_dir($source) &&
 				$this->targetExists($target) === false
 			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->prepareParentFolder($newRoot.'/'.$user);
 				$this->rootView->rename($source, $target);
 			}
 		}
@@ -245,7 +245,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if ($this->rootView->file_exists($dir) === false) {
 					$this->rootView->mkdir($dir);
 				}

core/Command/Encryption/SetDefaultModule.php

Spacing +3 added lines, -3 removed lines

@@ -59,11 +59,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 		}
 	}
 }