nextcloud / server

apps/files_external/lib/Config/ConfigAdapter.php

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
 	 * @param StorageConfig $storage
 	 * @param IUser $user
 	 */
-	private function prepareStorageConfig(StorageConfig &$storage, IUser $user) {
+	private function prepareStorageConfig(StorageConfig & $storage, IUser $user) {
 		foreach ($storage->getBackendOptions() as $option => $value) {
 			$storage->setBackendOption($option, \OC_Mount_Config::setUserVars(
 				$user->getUID(), $value
@@ -141,12 +141,12 @@ 
 			return $storage->getId();
 		}, $storages));
 
-		$availableStorages = array_map(function (Storage\IStorage $storage, StorageConfig $storageConfig) {
+		$availableStorages = array_map(function(Storage\IStorage $storage, StorageConfig $storageConfig) {
 			try {
 				$availability = $storage->getAvailability();
 				if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
 					$storage = new FailedStorage([
-						'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available')
+						'exception' => new StorageNotAvailableException('Storage with mount id '.$storageConfig->getId().' is not available')
 					]);
 				}
 			} catch (\Exception $e) {
@@ -162,7 +162,7 @@ 
 					$this->userStoragesService,
 					$storageConfig->getId(),
 					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions()
@@ -170,7 +170,7 @@ 
 			} else {
 				return new MountPoint(
 					$storage,
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
 					null,
 					$loader,
 					$storageConfig->getMountOptions(),

apps/files_external/lib/config.php

Spacing +10 added lines, -10 removed lines

@@ -255,11 +255,11 @@ 
 	 */
 	public static function readData($user = null) {
 		if (isset($user)) {
-			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome() . '/mount.json';
+			$jsonFile = \OC::$server->getUserManager()->get($user)->getHome().'/mount.json';
 		} else {
 			$config = \OC::$server->getConfig();
-			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
-			$jsonFile = $config->getSystemValue('mount_file', $datadir . '/mount.json');
+			$datadir = $config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data/');
+			$jsonFile = $config->getSystemValue('mount_file', $datadir.'/mount.json');
 		}
 		if (is_file($jsonFile)) {
 			$mountPoints = json_decode(file_get_contents($jsonFile), true);
@@ -285,7 +285,7 @@ 
 		foreach ($backends as $backend) {
 			foreach ($backend->checkDependencies() as $dependency) {
 				if ($message = $dependency->getMessage()) {
-					$message .= '<p>' . $message . '</p>';
+					$message .= '<p>'.$message.'</p>';
 				} else {
 					$dependencyGroups[$dependency->getDependency()][] = $backend;
 				}
@@ -294,9 +294,9 @@ 
 
 		foreach ($dependencyGroups as $module => $dependants) {
 			$backends = implode(', ', array_map(function($backend) {
-				return '"' . $backend->getText() . '"';
+				return '"'.$backend->getText().'"';
 			}, $dependants));
-			$message .= '<p>' . OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends) . '</p>';
+			$message .= '<p>'.OC_Mount_Config::getSingleDependencyMessage($l, $module, $backends).'</p>';
 		}
 
 		return $message;
@@ -313,11 +313,11 @@ 
 	private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
 		switch (strtolower($module)) {
 			case 'curl':
-				return (string)$l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
+				return (string) $l->t('The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
 			case 'ftp':
-				return (string)$l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
+				return (string) $l->t('The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
 			default:
-				return (string)$l->t('"%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
+				return (string) $l->t('"%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
 		}
 	}
 
@@ -362,7 +362,7 @@ 
 		$cipher = self::getCipher();
 		$iv = \OCP\Util::generateRandomBytes(16);
 		$cipher->setIV($iv);
-		return base64_encode($iv . $cipher->encrypt($password));
+		return base64_encode($iv.$cipher->encrypt($password));
 	}
 
 	/**

apps/files_external/lib/Command/Applicable.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>');
 			return 404;
 		}
 
@@ -123,13 +123,13 @@ 
 		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
 			foreach ($addUsers as $addUser) {
 				if (!$this->userManager->userExists($addUser)) {
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
+					$output->writeln('<error>User "'.$addUser.'" not found</error>');
 					return 404;
 				}
 			}
 			foreach ($addGroups as $addGroup) {
 				if (!$this->groupManager->groupExists($addGroup)) {
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
+					$output->writeln('<error>Group "'.$addGroup.'" not found</error>');
 					return 404;
 				}
 			}

apps/files_external/lib/Command/ListCommand.php

Spacing +9 added lines, -9 removed lines

@@ -156,11 +156,11 @@ 
 		}
 
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
+			$keys = array_map(function($header) {
 				return strtolower(str_replace(' ', '_', $header));
 			}, $headers);
 
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+			$pairs = array_map(function(StorageConfig $config) use ($keys, $userId) {
 				$values = [
 					$config->getId(),
 					$config->getMountPoint(),
@@ -193,23 +193,23 @@ 
 				'enable_sharing' => false,
 				'encoding_compatibility' => false
 			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
+			$rows = array_map(function(StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
 				$storageConfig = $config->getBackendOptions();
 				$keys = array_keys($storageConfig);
 				$values = array_values($storageConfig);
 
 				if (!$full) {
-					$values = array_map(function ($value) {
+					$values = array_map(function($value) {
 						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+							return substr($value, 0, 6).'...'.substr($value, -6, 6);
 						} else {
 							return $value;
 						}
 					}, $values);
 				}
 
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
+				$configStrings = array_map(function($key, $value) {
+					return $key.': '.json_encode($value);
 				}, $keys, $values);
 				$configString = implode(', ', $configStrings);
 
@@ -223,8 +223,8 @@ 
 				$keys = array_keys($mountOptions);
 				$values = array_values($mountOptions);
 
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
+				$optionsStrings = array_map(function($key, $value) {
+					return $key.': '.json_encode($value);
 				}, $keys, $values);
 				$optionsString = implode(', ', $optionsStrings);
 

apps/files_external/lib/Command/Config.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

apps/files_external/lib/Command/Verify.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 
@@ -93,7 +93,7 @@ 
 		$backend->manipulateStorageConfig($storage);
 	}
 
-	private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
+	private function updateStorageStatus(StorageConfig & $storage, $configInput, OutputInterface $output) {
 		try {
 			try {
 				$this->manipulateStorageConfig($storage);
@@ -105,7 +105,7 @@ 
 
 			foreach ($configInput as $configOption) {
 				if (!strpos($configOption, '=')) {
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+					$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
 					return;
 				}
 				list($key, $value) = explode('=', $configOption, 2);
@@ -137,7 +137,7 @@ 
 			// FIXME: convert storage exceptions to StorageNotAvailableException
 			$storage->setStatus(
 				StorageNotAvailableException::STATUS_ERROR,
-				get_class($e) . ': ' . $e->getMessage()
+				get_class($e).': '.$e->getMessage()
 			);
 		}
 	}

apps/files_external/lib/Command/Notify.php

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
 			return 1;
 		}
 		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+			$output->writeln('<error>Mount of type "'.$mount->getBackend()->getText().'" does not support active update notifications</error>');
 			return 1;
 		}
 
@@ -129,7 +129,7 @@ 
 		$path = trim($input->getOption('path'), '/');
 		$notifyHandler = $storage->notify($path);
 		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+		$notifyHandler->listen(function(IChange $change) use ($mount, $verbose, $output) {
 			if ($verbose) {
 				$this->logUpdate($change, $output);
 			}
@@ -171,9 +171,9 @@ 
 				return;
 		}
 
-		$text .= ' ' . $change->getPath();
+		$text .= ' '.$change->getPath();
 		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
+			$text .= ' to '.$change->getTargetPath();
 		}
 
 		$output->writeln($text);

apps/files_external/lib/Command/Create.php

Spacing +8 added lines, -8 removed lines

@@ -128,32 +128,32 @@ 
 		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
 
 		if (!Filesystem::isValidPath($mountPoint)) {
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
+			$output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>');
 			return 1;
 		}
 		if (is_null($storageBackend)) {
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		if (is_null($authBackend)) {
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
+			$output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
 			return 404;
 		}
 		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
 		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
+			$output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>');
 			return 1;
 		}
 
 		$config = [];
 		foreach ($configInput as $configOption) {
 			if (!strpos($configOption, '=')) {
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+				$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
 				return 1;
 			}
 			list($key, $value) = explode('=', $configOption, 2);
 			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
+				$output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>');
 				return 1;
 			}
 			$config[$key] = $value;
@@ -167,7 +167,7 @@ 
 
 		if ($user) {
 			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
+				$output->writeln('<error>User "'.$user.'" not found</error>');
 				return 1;
 			}
 			$mount->setApplicableUsers([$user]);
@@ -178,7 +178,7 @@ 
 		} else {
 			$this->getStorageService($user)->addStorage($mount);
 			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+				$output->writeln('<info>Storage created with id '.$mount->getId().'</info>');
 			} else {
 				$output->writeln($mount->getId());
 			}

apps/files_external/lib/Command/Backends.php

Spacing +5 added lines, -5 removed lines

@@ -71,14 +71,14 @@ 
 		$backend = $input->getArgument('backend');
 		if ($type) {
 			if (!isset($data[$type])) {
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
+				$output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>');
 				return 1;
 			}
 			$data = $data[$type];
 
 			if ($backend) {
 				if (!isset($data[$backend])) {
-					$output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
+					$output->writeln('<error>Unknown backend "'.$backend.'" of type  "'.$type.'"</error>');
 					return 1;
 				}
 				$data = $data[$backend];
@@ -99,7 +99,7 @@ 
 			$result['storage_class'] = $backend->getStorageClass();
 			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
 			$result['supported_authentication_backends'] = array_keys($authBackends);
-			$authConfig = array_map(function (AuthMechanism $auth) {
+			$authConfig = array_map(function(AuthMechanism $auth) {
 				return $this->serializeAuthBackend($auth)['configuration'];
 			}, $authBackends);
 			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
@@ -112,10 +112,10 @@ 
 	 * @return string[]
 	 */
 	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
+		$configuration = array_filter($parameters, function(DefinitionParameter $parameter) {
 			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
 		});
-		return array_map(function (DefinitionParameter $parameter) {
+		return array_map(function(DefinitionParameter $parameter) {
 			return $parameter->getTypeName();
 		}, $configuration);
 	}