nextcloud / server

apps/files_external/lib/Command/ListCommand.php

Indentation +210 added lines, -210 removed lines

@@ -37,239 +37,239 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	const ALL = -1;
+    const ALL = -1;
 
-	function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:list')
-			->setDescription('List configured admin or personal mounts')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL,
-				'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
-			)->addOption(
-				'show-password',
-				null,
-				InputOption::VALUE_NONE,
-				'show passwords and secrets'
-			)->addOption(
-				'full',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t truncate long values in table output'
-			)->addOption(
-				'all',
-				'a',
-				InputOption::VALUE_NONE,
-				'show both system wide mounts and all personal mounts'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:list')
+            ->setDescription('List configured admin or personal mounts')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL,
+                'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
+            )->addOption(
+                'show-password',
+                null,
+                InputOption::VALUE_NONE,
+                'show passwords and secrets'
+            )->addOption(
+                'full',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t truncate long values in table output'
+            )->addOption(
+                'all',
+                'a',
+                InputOption::VALUE_NONE,
+                'show both system wide mounts and all personal mounts'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($input->getOption('all')) {
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $this->globalService->getStorageForAllUsers();
-			$userId = self::ALL;
-		} else {
-			$userId = $input->getArgument('user_id');
-			$storageService = $this->getStorageService($userId);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($input->getOption('all')) {
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $this->globalService->getStorageForAllUsers();
+            $userId = self::ALL;
+        } else {
+            $userId = $input->getArgument('user_id');
+            $storageService = $this->getStorageService($userId);
 
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $storageService->getAllStorages();
-		}
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $storageService->getAllStorages();
+        }
 
-		$this->listMounts($userId, $mounts, $input, $output);
-	}
+        $this->listMounts($userId, $mounts, $input, $output);
+    }
 
-	/**
-	 * @param $userId $userId
-	 * @param StorageConfig[] $mounts
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if (count($mounts) === 0) {
-			if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-				$output->writeln('[]');
-			} else {
-				if ($userId === self::ALL) {
-					$output->writeln("<info>No mounts configured</info>");
-				} else if ($userId) {
-					$output->writeln("<info>No mounts configured by $userId</info>");
-				} else {
-					$output->writeln("<info>No admin mounts configured</info>");
-				}
-			}
-			return;
-		}
+    /**
+     * @param $userId $userId
+     * @param StorageConfig[] $mounts
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if (count($mounts) === 0) {
+            if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+                $output->writeln('[]');
+            } else {
+                if ($userId === self::ALL) {
+                    $output->writeln("<info>No mounts configured</info>");
+                } else if ($userId) {
+                    $output->writeln("<info>No mounts configured by $userId</info>");
+                } else {
+                    $output->writeln("<info>No admin mounts configured</info>");
+                }
+            }
+            return;
+        }
 
-		$headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
+        $headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
 
-		if (!$userId || $userId === self::ALL) {
-			$headers[] = 'Applicable Users';
-			$headers[] = 'Applicable Groups';
-		}
-		if ($userId === self::ALL) {
-			$headers[] = 'Type';
-		}
+        if (!$userId || $userId === self::ALL) {
+            $headers[] = 'Applicable Users';
+            $headers[] = 'Applicable Groups';
+        }
+        if ($userId === self::ALL) {
+            $headers[] = 'Type';
+        }
 
-		if (!$input->getOption('show-password')) {
-			$hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
-			foreach ($mounts as $mount) {
-				$config = $mount->getBackendOptions();
-				foreach ($config as $key => $value) {
-					if (in_array($key, $hideKeys)) {
-						$mount->setBackendOption($key, '***');
-					}
-				}
-			}
-		}
+        if (!$input->getOption('show-password')) {
+            $hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
+            foreach ($mounts as $mount) {
+                $config = $mount->getBackendOptions();
+                foreach ($config as $key => $value) {
+                    if (in_array($key, $hideKeys)) {
+                        $mount->setBackendOption($key, '***');
+                    }
+                }
+            }
+        }
 
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
-				return strtolower(str_replace(' ', '_', $header));
-			}, $headers);
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $keys = array_map(function ($header) {
+                return strtolower(str_replace(' ', '_', $header));
+            }, $headers);
 
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getStorageClass(),
-					$config->getAuthMechanism()->getIdentifier(),
-					$config->getBackendOptions(),
-					$config->getMountOptions()
-				];
-				if (!$userId || $userId === self::ALL) {
-					$values[] = $config->getApplicableUsers();
-					$values[] = $config->getApplicableGroups();
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
-				}
+            $pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getStorageClass(),
+                    $config->getAuthMechanism()->getIdentifier(),
+                    $config->getBackendOptions(),
+                    $config->getMountOptions()
+                ];
+                if (!$userId || $userId === self::ALL) {
+                    $values[] = $config->getApplicableUsers();
+                    $values[] = $config->getApplicableGroups();
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
+                }
 
-				return array_combine($keys, $values);
-			}, $mounts);
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($pairs)));
-			} else {
-				$output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$full = $input->getOption('full');
-			$defaultMountOptions = [
-				'encrypt' => true,
-				'previews' => true,
-				'filesystem_check_changes' => 1,
-				'enable_sharing' => false,
-				'encoding_compatibility' => false
-			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
-				$storageConfig = $config->getBackendOptions();
-				$keys = array_keys($storageConfig);
-				$values = array_values($storageConfig);
+                return array_combine($keys, $values);
+            }, $mounts);
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($pairs)));
+            } else {
+                $output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $full = $input->getOption('full');
+            $defaultMountOptions = [
+                'encrypt' => true,
+                'previews' => true,
+                'filesystem_check_changes' => 1,
+                'enable_sharing' => false,
+                'encoding_compatibility' => false
+            ];
+            $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) {
-						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
-						} else {
-							return $value;
-						}
-					}, $values);
-				}
+                if (!$full) {
+                    $values = array_map(function ($value) {
+                        if (is_string($value) && strlen($value) > 32) {
+                            return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+                        } else {
+                            return $value;
+                        }
+                    }, $values);
+                }
 
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$configString = implode(', ', $configStrings);
+                $configStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $configString = implode(', ', $configStrings);
 
-				$mountOptions = $config->getMountOptions();
-				// hide defaults
-				foreach ($mountOptions as $key => $value) {
-					if ($value === $defaultMountOptions[$key]) {
-						unset($mountOptions[$key]);
-					}
-				}
-				$keys = array_keys($mountOptions);
-				$values = array_values($mountOptions);
+                $mountOptions = $config->getMountOptions();
+                // hide defaults
+                foreach ($mountOptions as $key => $value) {
+                    if ($value === $defaultMountOptions[$key]) {
+                        unset($mountOptions[$key]);
+                    }
+                }
+                $keys = array_keys($mountOptions);
+                $values = array_values($mountOptions);
 
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$optionsString = implode(', ', $optionsStrings);
+                $optionsStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $optionsString = implode(', ', $optionsStrings);
 
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getText(),
-					$config->getAuthMechanism()->getText(),
-					$configString,
-					$optionsString
-				];
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getText(),
+                    $config->getAuthMechanism()->getText(),
+                    $configString,
+                    $optionsString
+                ];
 
-				if (!$userId || $userId === self::ALL) {
-					$applicableUsers = implode(', ', $config->getApplicableUsers());
-					$applicableGroups = implode(', ', $config->getApplicableGroups());
-					if ($applicableUsers === '' && $applicableGroups === '') {
-						$applicableUsers = 'All';
-					}
-					$values[] = $applicableUsers;
-					$values[] = $applicableGroups;
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
-				}
+                if (!$userId || $userId === self::ALL) {
+                    $applicableUsers = implode(', ', $config->getApplicableUsers());
+                    $applicableGroups = implode(', ', $config->getApplicableGroups());
+                    if ($applicableUsers === '' && $applicableGroups === '') {
+                        $applicableUsers = 'All';
+                    }
+                    $values[] = $applicableUsers;
+                    $values[] = $applicableGroups;
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
+                }
 
-				return $values;
-			}, $mounts);
+                return $values;
+            }, $mounts);
 
-			$table = new Table($output);
-			$table->setHeaders($headers);
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $table = new Table($output);
+            $table->setHeaders($headers);
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

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;
 		}
 

Indentation +77 added lines, -77 removed lines

@@ -32,87 +32,87 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:config')
-			->setDescription('Manage backend configuration for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the config option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the config option to, when no value is provided the existing value will be printed'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:config')
+            ->setDescription('Manage backend configuration for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the config option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the config option to, when no value is provided the existing value will be printed'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		$key = $input->getArgument('key');
-		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>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        $key = $input->getArgument('key');
+        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>');
+            return 404;
+        }
 
-		$value = $input->getArgument('value');
-		if ($value) {
-			$this->setOption($mount, $key, $value, $output);
-		} else {
-			$this->getOption($mount, $key, $output);
-		}
-	}
+        $value = $input->getArgument('value');
+        if ($value) {
+            $this->setOption($mount, $key, $value, $output);
+        } else {
+            $this->getOption($mount, $key, $output);
+        }
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$value = $mount->getMountPoint();
-		} else {
-			$value = $mount->getBackendOption($key);
-		}
-		if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
- 			$value = json_encode($value);
- 		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $value = $mount->getMountPoint();
+        } else {
+            $value = $mount->getBackendOption($key);
+        }
+        if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
+                $value = json_encode($value);
+            }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
- 		if (!is_null($decoded) && json_encode($decoded) === $value) {
- 			$value = $decoded;
- 		}
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$mount->setMountPoint($value);
-		} else {
-			$mount->setBackendOption($key, $value);
-		}
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+            if (!is_null($decoded) && json_encode($decoded) === $value) {
+                $value = $decoded;
+            }
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $mount->setMountPoint($value);
+        } else {
+            $mount->setBackendOption($key, $value);
+        }
+        $this->globalService->updateStorage($mount);
+    }
 }

apps/files_external/lib/Command/Verify.php

Indentation +94 added lines, -94 removed lines

@@ -37,108 +37,108 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Verify extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:verify')
-			->setDescription('Verify mount configuration')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to check'
-			)->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:verify')
+            ->setDescription('Verify mount configuration')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to check'
+            )->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		$configInput = $input->getOption('config');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        $configInput = $input->getOption('config');
 
-		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>');
-			return 404;
-		}
+        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>');
+            return 404;
+        }
 
-		$this->updateStorageStatus($mount, $configInput, $output);
+        $this->updateStorageStatus($mount, $configInput, $output);
 
-		$this->writeArrayInOutputFormat($input, $output, [
-			'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
-			'code' => $mount->getStatus(),
-			'message' => $mount->getStatusMessage()
-		]);
-	}
+        $this->writeArrayInOutputFormat($input, $output, [
+            'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()),
+            'code' => $mount->getStatus(),
+            'message' => $mount->getStatusMessage()
+        ]);
+    }
 
-	private function manipulateStorageConfig(StorageConfig $storage) {
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-		$authMechanism->manipulateStorageConfig($storage);
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		$backend->manipulateStorageConfig($storage);
-	}
+    private function manipulateStorageConfig(StorageConfig $storage) {
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+        $authMechanism->manipulateStorageConfig($storage);
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        $backend->manipulateStorageConfig($storage);
+    }
 
-	private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
-		try {
-			try {
-				$this->manipulateStorageConfig($storage);
-			} catch (InsufficientDataForMeaningfulAnswerException $e) {
-				if (count($configInput) === 0) { // extra config options might solve the error
-					throw $e;
-				}
-			}
+    private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
+        try {
+            try {
+                $this->manipulateStorageConfig($storage);
+            } catch (InsufficientDataForMeaningfulAnswerException $e) {
+                if (count($configInput) === 0) { // extra config options might solve the error
+                    throw $e;
+                }
+            }
 
-			foreach ($configInput as $configOption) {
-				if (!strpos($configOption, '=')) {
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
-					return;
-				}
-				list($key, $value) = explode('=', $configOption, 2);
-				$storage->setBackendOption($key, $value);
-			}
+            foreach ($configInput as $configOption) {
+                if (!strpos($configOption, '=')) {
+                    $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
+                    return;
+                }
+                list($key, $value) = explode('=', $configOption, 2);
+                $storage->setBackendOption($key, $value);
+            }
 
-			/** @var Backend */
-			$backend = $storage->getBackend();
-			// update status (can be time-consuming)
-			$storage->setStatus(
-				\OC_Mount_Config::getBackendStatus(
-					$backend->getStorageClass(),
-					$storage->getBackendOptions(),
-					false
-				)
-			);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
-			$storage->setStatus(
-				$status,
-				$e->getMessage()
-			);
-		} catch (StorageNotAvailableException $e) {
-			$storage->setStatus(
-				$e->getCode(),
-				$e->getMessage()
-			);
-		} catch (\Exception $e) {
-			// FIXME: convert storage exceptions to StorageNotAvailableException
-			$storage->setStatus(
-				StorageNotAvailableException::STATUS_ERROR,
-				get_class($e) . ': ' . $e->getMessage()
-			);
-		}
-	}
+            /** @var Backend */
+            $backend = $storage->getBackend();
+            // update status (can be time-consuming)
+            $storage->setStatus(
+                \OC_Mount_Config::getBackendStatus(
+                    $backend->getStorageClass(),
+                    $storage->getBackendOptions(),
+                    false
+                )
+            );
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE;
+            $storage->setStatus(
+                $status,
+                $e->getMessage()
+            );
+        } catch (StorageNotAvailableException $e) {
+            $storage->setStatus(
+                $e->getCode(),
+                $e->getMessage()
+            );
+        } catch (\Exception $e) {
+            // FIXME: convert storage exceptions to StorageNotAvailableException
+            $storage->setStatus(
+                StorageNotAvailableException::STATUS_ERROR,
+                get_class($e) . ': ' . $e->getMessage()
+            );
+        }
+    }
 }

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/Option.php

Indentation +44 added lines, -44 removed lines

@@ -28,50 +28,50 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Option extends Config {
-	protected function configure() {
-		$this
-			->setName('files_external:option')
-			->setDescription('Manage mount options for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the mount option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the mount option to, when no value is provided the existing value will be printed'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:option')
+            ->setDescription('Manage mount options for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the mount option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the mount option to, when no value is provided the existing value will be printed'
+            );
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		$value = $mount->getMountOption($key);
-		if (!is_string($value)) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        $value = $mount->getMountOption($key);
+        if (!is_string($value)) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded)) {
-			$value = $decoded;
-		}
-		$mount->setMountOption($key, $value);
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded)) {
+            $value = $decoded;
+        }
+        $mount->setMountOption($key, $value);
+        $this->globalService->updateStorage($mount);
+    }
 }

apps/files_external/lib/Command/Notify.php

Indentation +172 added lines, -172 removed lines

@@ -40,178 +40,178 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Notify extends Base {
-	/** @var GlobalStoragesService */
-	private $globalService;
-	/** @var IDBConnection */
-	private $connection;
-	/** @var \OCP\DB\QueryBuilder\IQueryBuilder */
-	private $updateQuery;
-
-	function __construct(GlobalStoragesService $globalService, IDBConnection $connection) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->connection = $connection;
-		// the query builder doesn't really like subqueries with parameters
-		$this->updateQuery = $this->connection->prepare(
-			'UPDATE *PREFIX*filecache SET size = -1
+    /** @var GlobalStoragesService */
+    private $globalService;
+    /** @var IDBConnection */
+    private $connection;
+    /** @var \OCP\DB\QueryBuilder\IQueryBuilder */
+    private $updateQuery;
+
+    function __construct(GlobalStoragesService $globalService, IDBConnection $connection) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->connection = $connection;
+        // the query builder doesn't really like subqueries with parameters
+        $this->updateQuery = $this->connection->prepare(
+            'UPDATE *PREFIX*filecache SET size = -1
 			WHERE `path` = ?
 			AND `storage` IN (SELECT storage_id FROM *PREFIX*mounts WHERE mount_id = ?)'
-		);
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:notify')
-			->setDescription('Listen for active update notifications for a configured external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'the mount id of the mount to listen to'
-			)->addOption(
-				'user',
-				'u',
-				InputOption::VALUE_REQUIRED,
-				'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'password',
-				'p',
-				InputOption::VALUE_REQUIRED,
-				'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
-			)->addOption(
-				'path',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The directory in the storage to listen for updates in',
-				'/'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mount = $this->globalService->getStorage($input->getArgument('mount_id'));
-		if (is_null($mount)) {
-			$output->writeln('<error>Mount not found</error>');
-			return 1;
-		}
-		$noAuth = false;
-		try {
-			$authBackend = $mount->getAuthMechanism();
-			$authBackend->manipulateStorageConfig($mount);
-		} catch (InsufficientDataForMeaningfulAnswerException $e) {
-			$noAuth = true;
-		} catch (StorageNotAvailableException $e) {
-			$noAuth = true;
-		}
-
-		if ($input->getOption('user')) {
-			$mount->setBackendOption('user', $input->getOption('user'));
-		}
-		if ($input->getOption('password')) {
-			$mount->setBackendOption('password', $input->getOption('password'));
-		}
-
-		try {
-			$storage = $this->createStorage($mount);
-		} catch (\Exception $e) {
-			$output->writeln('<error>Error while trying to create storage</error>');
-			if ($noAuth) {
-				$output->writeln('<error>Username and/or password required</error>');
-			}
-			return 1;
-		}
-		if (!$storage instanceof INotifyStorage) {
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
-			return 1;
-		}
-
-		$verbose = $input->getOption('verbose');
-
-		$path = trim($input->getOption('path'), '/');
-		$notifyHandler = $storage->notify($path);
-		$this->selfTest($storage, $notifyHandler, $verbose, $output);
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
-			if ($verbose) {
-				$this->logUpdate($change, $output);
-			}
-			if ($change instanceof IRenameChange) {
-				$this->markParentAsOutdated($mount->getId(), $change->getTargetPath());
-			}
-			$this->markParentAsOutdated($mount->getId(), $change->getPath());
-		});
-	}
-
-	private function createStorage(StorageConfig $mount) {
-		$class = $mount->getBackend()->getStorageClass();
-		return new $class($mount->getBackendOptions());
-	}
-
-	private function markParentAsOutdated($mountId, $path) {
-		$parent = dirname($path);
-		if ($parent === '.') {
-			$parent = '';
-		}
-		$this->updateQuery->execute([$parent, $mountId]);
-	}
-
-	private function logUpdate(IChange $change, OutputInterface $output) {
-		switch ($change->getType()) {
-			case INotifyStorage::NOTIFY_ADDED:
-				$text = 'added';
-				break;
-			case INotifyStorage::NOTIFY_MODIFIED:
-				$text = 'modified';
-				break;
-			case INotifyStorage::NOTIFY_REMOVED:
-				$text = 'removed';
-				break;
-			case INotifyStorage::NOTIFY_RENAMED:
-				$text = 'renamed';
-				break;
-			default:
-				return;
-		}
-
-		$text .= ' ' . $change->getPath();
-		if ($change instanceof IRenameChange) {
-			$text .= ' to ' . $change->getTargetPath();
-		}
-
-		$output->writeln($text);
-	}
-
-	private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
-		usleep(100 * 1000); //give time for the notify to start
-		$storage->file_put_contents('/.nc_test_file.txt', 'test content');
-		$storage->mkdir('/.nc_test_folder');
-		$storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
-
-		usleep(100 * 1000); //time for all changes to be processed
-		$changes = $notifyHandler->getChanges();
-
-		$storage->unlink('/.nc_test_file.txt');
-		$storage->unlink('/.nc_test_folder/subfile.txt');
-		$storage->rmdir('/.nc_test_folder');
-
-		usleep(100 * 1000); //time for all changes to be processed
-		$notifyHandler->getChanges(); // flush
-
-		$foundRootChange = false;
-		$foundSubfolderChange = false;
-
-		foreach ($changes as $change) {
-			if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
-				$foundRootChange = true;
-			} else if ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
-				$foundSubfolderChange = true;
-			}
-		}
-
-		if ($foundRootChange && $foundSubfolderChange && $verbose) {
-			$output->writeln('<info>Self-test successful</info>');
-		} else if ($foundRootChange && !$foundSubfolderChange) {
-			$output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
-		} else if (!$foundRootChange) {
-			$output->writeln('<error>Error while running self-test, no changes detected</error>');
-		}
-	}
+        );
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:notify')
+            ->setDescription('Listen for active update notifications for a configured external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'the mount id of the mount to listen to'
+            )->addOption(
+                'user',
+                'u',
+                InputOption::VALUE_REQUIRED,
+                'The username for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'password',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'The password for the remote mount (required only for some mount configuration that don\'t store credentials)'
+            )->addOption(
+                'path',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The directory in the storage to listen for updates in',
+                '/'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mount = $this->globalService->getStorage($input->getArgument('mount_id'));
+        if (is_null($mount)) {
+            $output->writeln('<error>Mount not found</error>');
+            return 1;
+        }
+        $noAuth = false;
+        try {
+            $authBackend = $mount->getAuthMechanism();
+            $authBackend->manipulateStorageConfig($mount);
+        } catch (InsufficientDataForMeaningfulAnswerException $e) {
+            $noAuth = true;
+        } catch (StorageNotAvailableException $e) {
+            $noAuth = true;
+        }
+
+        if ($input->getOption('user')) {
+            $mount->setBackendOption('user', $input->getOption('user'));
+        }
+        if ($input->getOption('password')) {
+            $mount->setBackendOption('password', $input->getOption('password'));
+        }
+
+        try {
+            $storage = $this->createStorage($mount);
+        } catch (\Exception $e) {
+            $output->writeln('<error>Error while trying to create storage</error>');
+            if ($noAuth) {
+                $output->writeln('<error>Username and/or password required</error>');
+            }
+            return 1;
+        }
+        if (!$storage instanceof INotifyStorage) {
+            $output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
+            return 1;
+        }
+
+        $verbose = $input->getOption('verbose');
+
+        $path = trim($input->getOption('path'), '/');
+        $notifyHandler = $storage->notify($path);
+        $this->selfTest($storage, $notifyHandler, $verbose, $output);
+        $notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
+            if ($verbose) {
+                $this->logUpdate($change, $output);
+            }
+            if ($change instanceof IRenameChange) {
+                $this->markParentAsOutdated($mount->getId(), $change->getTargetPath());
+            }
+            $this->markParentAsOutdated($mount->getId(), $change->getPath());
+        });
+    }
+
+    private function createStorage(StorageConfig $mount) {
+        $class = $mount->getBackend()->getStorageClass();
+        return new $class($mount->getBackendOptions());
+    }
+
+    private function markParentAsOutdated($mountId, $path) {
+        $parent = dirname($path);
+        if ($parent === '.') {
+            $parent = '';
+        }
+        $this->updateQuery->execute([$parent, $mountId]);
+    }
+
+    private function logUpdate(IChange $change, OutputInterface $output) {
+        switch ($change->getType()) {
+            case INotifyStorage::NOTIFY_ADDED:
+                $text = 'added';
+                break;
+            case INotifyStorage::NOTIFY_MODIFIED:
+                $text = 'modified';
+                break;
+            case INotifyStorage::NOTIFY_REMOVED:
+                $text = 'removed';
+                break;
+            case INotifyStorage::NOTIFY_RENAMED:
+                $text = 'renamed';
+                break;
+            default:
+                return;
+        }
+
+        $text .= ' ' . $change->getPath();
+        if ($change instanceof IRenameChange) {
+            $text .= ' to ' . $change->getTargetPath();
+        }
+
+        $output->writeln($text);
+    }
+
+    private function selfTest(IStorage $storage, INotifyHandler $notifyHandler, $verbose, OutputInterface $output) {
+        usleep(100 * 1000); //give time for the notify to start
+        $storage->file_put_contents('/.nc_test_file.txt', 'test content');
+        $storage->mkdir('/.nc_test_folder');
+        $storage->file_put_contents('/.nc_test_folder/subfile.txt', 'test content');
+
+        usleep(100 * 1000); //time for all changes to be processed
+        $changes = $notifyHandler->getChanges();
+
+        $storage->unlink('/.nc_test_file.txt');
+        $storage->unlink('/.nc_test_folder/subfile.txt');
+        $storage->rmdir('/.nc_test_folder');
+
+        usleep(100 * 1000); //time for all changes to be processed
+        $notifyHandler->getChanges(); // flush
+
+        $foundRootChange = false;
+        $foundSubfolderChange = false;
+
+        foreach ($changes as $change) {
+            if ($change->getPath() === '/.nc_test_file.txt' || $change->getPath() === '.nc_test_file.txt') {
+                $foundRootChange = true;
+            } else if ($change->getPath() === '/.nc_test_folder/subfile.txt' || $change->getPath() === '.nc_test_folder/subfile.txt') {
+                $foundSubfolderChange = true;
+            }
+        }
+
+        if ($foundRootChange && $foundSubfolderChange && $verbose) {
+            $output->writeln('<info>Self-test successful</info>');
+        } else if ($foundRootChange && !$foundSubfolderChange) {
+            $output->writeln('<error>Error while running self-test, change is subfolder not detected</error>');
+        } else if (!$foundRootChange) {
+            $output->writeln('<error>Error while running self-test, no changes detected</error>');
+        }
+    }
 }

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

Indentation +178 added lines, -178 removed lines

@@ -42,182 +42,182 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Create extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var BackendService */
-	private $backendService;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserManager $userManager,
-						 IUserSession $userSession,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:create')
-			->setDescription('Create a new mount configuration')
-			->addOption(
-				'user',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configuration for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'mount_point',
-				InputArgument::REQUIRED,
-				'mount point for the new mount'
-			)
-			->addArgument(
-				'storage_backend',
-				InputArgument::REQUIRED,
-				'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addArgument(
-				'authentication_backend',
-				InputArgument::REQUIRED,
-				'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
-			)
-			->addOption(
-				'config',
-				'c',
-				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-				'Mount configuration option in key=value format'
-			)
-			->addOption(
-				'dry',
-				null,
-				InputOption::VALUE_NONE,
-				'Don\'t save the created mount, only list the new mount'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getOption('user');
-		$mountPoint = $input->getArgument('mount_point');
-		$storageIdentifier = $input->getArgument('storage_backend');
-		$authIdentifier = $input->getArgument('authentication_backend');
-		$configInput = $input->getOption('config');
-
-		$storageBackend = $this->backendService->getBackend($storageIdentifier);
-		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
-
-		if (!Filesystem::isValidPath($mountPoint)) {
-			$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>');
-			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>');
-			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>');
-			return 1;
-		}
-
-		$config = [];
-		foreach ($configInput as $configOption) {
-			if (!strpos($configOption, '=')) {
-				$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>');
-				return 1;
-			}
-			$config[$key] = $value;
-		}
-
-		$mount = new StorageConfig();
-		$mount->setMountPoint($mountPoint);
-		$mount->setBackend($storageBackend);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($config);
-
-		if ($user) {
-			if (!$this->userManager->userExists($user)) {
-				$output->writeln('<error>User "' . $user . '" not found</error>');
-				return 1;
-			}
-			$mount->setApplicableUsers([$user]);
-		}
-
-		if ($input->getOption('dry')) {
-			$this->showMount($user, $mount, $input, $output);
-		} else {
-			$this->getStorageService($user)->addStorage($mount);
-			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
-			} else {
-				$output->writeln($mount->getId());
-			}
-		}
-		return 0;
-	}
-
-	private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
-		$params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
-		foreach ($params as $param) {
-			/** @var DefinitionParameter $param */
-			if ($param->getName() === $key) {
-				if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
-					$value = ($value === 'true');
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
-		$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-		$listInput = new ArrayInput([], $listCommand->getDefinition());
-		$listInput->setOption('output', $input->getOption('output'));
-		$listInput->setOption('show-password', true);
-		$listCommand->listMounts($user, [$mount], $listInput, $output);
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var BackendService */
+    private $backendService;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserManager $userManager,
+                            IUserSession $userSession,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:create')
+            ->setDescription('Create a new mount configuration')
+            ->addOption(
+                'user',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configuration for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'mount_point',
+                InputArgument::REQUIRED,
+                'mount point for the new mount'
+            )
+            ->addArgument(
+                'storage_backend',
+                InputArgument::REQUIRED,
+                'storage backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addArgument(
+                'authentication_backend',
+                InputArgument::REQUIRED,
+                'authentication backend identifier for the new mount, see `occ files_external:backends` for possible values'
+            )
+            ->addOption(
+                'config',
+                'c',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'Mount configuration option in key=value format'
+            )
+            ->addOption(
+                'dry',
+                null,
+                InputOption::VALUE_NONE,
+                'Don\'t save the created mount, only list the new mount'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getOption('user');
+        $mountPoint = $input->getArgument('mount_point');
+        $storageIdentifier = $input->getArgument('storage_backend');
+        $authIdentifier = $input->getArgument('authentication_backend');
+        $configInput = $input->getOption('config');
+
+        $storageBackend = $this->backendService->getBackend($storageIdentifier);
+        $authBackend = $this->backendService->getAuthMechanism($authIdentifier);
+
+        if (!Filesystem::isValidPath($mountPoint)) {
+            $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>');
+            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>');
+            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>');
+            return 1;
+        }
+
+        $config = [];
+        foreach ($configInput as $configOption) {
+            if (!strpos($configOption, '=')) {
+                $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>');
+                return 1;
+            }
+            $config[$key] = $value;
+        }
+
+        $mount = new StorageConfig();
+        $mount->setMountPoint($mountPoint);
+        $mount->setBackend($storageBackend);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($config);
+
+        if ($user) {
+            if (!$this->userManager->userExists($user)) {
+                $output->writeln('<error>User "' . $user . '" not found</error>');
+                return 1;
+            }
+            $mount->setApplicableUsers([$user]);
+        }
+
+        if ($input->getOption('dry')) {
+            $this->showMount($user, $mount, $input, $output);
+        } else {
+            $this->getStorageService($user)->addStorage($mount);
+            if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
+                $output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
+            } else {
+                $output->writeln($mount->getId());
+            }
+        }
+        return 0;
+    }
+
+    private function validateParam($key, &$value, Backend $storageBackend, AuthMechanism $authBackend) {
+        $params = array_merge($storageBackend->getParameters(), $authBackend->getParameters());
+        foreach ($params as $param) {
+            /** @var DefinitionParameter $param */
+            if ($param->getName() === $key) {
+                if ($param->getType() === DefinitionParameter::VALUE_BOOLEAN) {
+                    $value = ($value === 'true');
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private function showMount($user, StorageConfig $mount, InputInterface $input, OutputInterface $output) {
+        $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+        $listInput = new ArrayInput([], $listCommand->getDefinition());
+        $listInput->setOption('output', $input->getOption('output'));
+        $listInput->setOption('show-password', true);
+        $listCommand->listMounts($user, [$mount], $listInput, $output);
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

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

Indentation +77 added lines, -77 removed lines

@@ -32,91 +32,91 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Backends extends Base {
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	function __construct(BackendService $backendService
-	) {
-		parent::__construct();
+    function __construct(BackendService $backendService
+    ) {
+        parent::__construct();
 
-		$this->backendService = $backendService;
-	}
+        $this->backendService = $backendService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:backends')
-			->setDescription('Show available authentication and storage backends')
-			->addArgument(
-				'type',
-				InputArgument::OPTIONAL,
-				'only show backends of a certain type. Possible values are "authentication" or "storage"'
-			)->addArgument(
-				'backend',
-				InputArgument::OPTIONAL,
-				'only show information of a specific backend'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:backends')
+            ->setDescription('Show available authentication and storage backends')
+            ->addArgument(
+                'type',
+                InputArgument::OPTIONAL,
+                'only show backends of a certain type. Possible values are "authentication" or "storage"'
+            )->addArgument(
+                'backend',
+                InputArgument::OPTIONAL,
+                'only show information of a specific backend'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$authBackends = $this->backendService->getAuthMechanisms();
-		$storageBackends = $this->backendService->getBackends();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $authBackends = $this->backendService->getAuthMechanisms();
+        $storageBackends = $this->backendService->getBackends();
 
-		$data = [
-			'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
-			'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
-		];
+        $data = [
+            'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
+            'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
+        ];
 
-		$type = $input->getArgument('type');
-		$backend = $input->getArgument('backend');
-		if ($type) {
-			if (!isset($data[$type])) {
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
-				return 1;
-			}
-			$data = $data[$type];
+        $type = $input->getArgument('type');
+        $backend = $input->getArgument('backend');
+        if ($type) {
+            if (!isset($data[$type])) {
+                $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>');
-					return 1;
-				}
-				$data = $data[$backend];
-			}
-		}
+            if ($backend) {
+                if (!isset($data[$backend])) {
+                    $output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
+                    return 1;
+                }
+                $data = $data[$backend];
+            }
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, $data);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $data);
+    }
 
-	private function serializeAuthBackend(\JsonSerializable $backend) {
-		$data = $backend->jsonSerialize();
-		$result = [
-			'name' => $data['name'],
-			'identifier' => $data['identifier'],
-			'configuration' => $this->formatConfiguration($data['configuration'])
-		];
-		if ($backend instanceof Backend) {
-			$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) {
-				return $this->serializeAuthBackend($auth)['configuration'];
-			}, $authBackends);
-			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
-		}
-		return $result;
-	}
+    private function serializeAuthBackend(\JsonSerializable $backend) {
+        $data = $backend->jsonSerialize();
+        $result = [
+            'name' => $data['name'],
+            'identifier' => $data['identifier'],
+            'configuration' => $this->formatConfiguration($data['configuration'])
+        ];
+        if ($backend instanceof Backend) {
+            $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) {
+                return $this->serializeAuthBackend($auth)['configuration'];
+            }, $authBackends);
+            $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return string[]
-	 */
-	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
-			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
-		});
-		return array_map(function (DefinitionParameter $parameter) {
-			return $parameter->getTypeName();
-		}, $configuration);
-	}
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return string[]
+     */
+    private function formatConfiguration(array $parameters) {
+        $configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
+            return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
+        });
+        return array_map(function (DefinitionParameter $parameter) {
+            return $parameter->getTypeName();
+        }, $configuration);
+    }
 }

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);
 	}

apps/files_external/lib/Command/Delete.php

Indentation +61 added lines, -61 removed lines

@@ -37,76 +37,76 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:delete')
-			->setDescription('Delete an external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'yes',
-				'y',
-				InputOption::VALUE_NONE,
-				'Skip confirmation'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:delete')
+            ->setDescription('Delete an external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'yes',
+                'y',
+                InputOption::VALUE_NONE,
+                'Skip confirmation'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		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>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        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>');
+            return 404;
+        }
 
-		$noConfirm = $input->getOption('yes');
+        $noConfirm = $input->getOption('yes');
 
-		if (!$noConfirm) {
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listCommand->listMounts(null, [$mount], $listInput, $output);
+        if (!$noConfirm) {
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listCommand->listMounts(null, [$mount], $listInput, $output);
 
-			$questionHelper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
+            $questionHelper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
-			if (!$questionHelper->ask($input, $output, $question)) {
-				return;
-			}
-		}
+            if (!$questionHelper->ask($input, $output, $question)) {
+                return;
+            }
+        }
 
-		$this->globalService->removeStorage($mountId);
-	}
+        $this->globalService->removeStorage($mountId);
+    }
 }

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/Import.php

Indentation +183 added lines, -183 removed lines

@@ -39,187 +39,187 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var ImportLegacyStoragesService */
-	private $importLegacyStorageService;
-
-	/** @var BackendService */
-	private $backendService;
-
-	function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserSession $userSession,
-						 IUserManager $userManager,
-						 ImportLegacyStoragesService $importLegacyStorageService,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->importLegacyStorageService = $importLegacyStorageService;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:import')
-			->setDescription('Import mount configurations')
-			->addOption(
-				'user',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configurations for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to a json file containing the mounts to import, use "-" to read from stdin'
-			)
-			->addOption(
-				'dry',
-				null,
-				InputOption::VALUE_NONE,
-				'Don\'t save the imported mounts, only list the new mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getOption('user');
-		$path = $input->getArgument('path');
-		if ($path === '-') {
-			$json = file_get_contents('php://stdin');
-		} else {
-			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
-				return 1;
-			}
-			$json = file_get_contents($path);
-		}
-		if (!is_string($json) || strlen($json) < 2) {
-			$output->writeln('<error>Error while reading json</error>');
-			return 1;
-		}
-		$data = json_decode($json, true);
-		if (!is_array($data)) {
-			$output->writeln('<error>Error while parsing json</error>');
-			return 1;
-		}
-
-		$isLegacy = isset($data['user']) || isset($data['group']);
-		if ($isLegacy) {
-			$this->importLegacyStorageService->setData($data);
-			$mounts = $this->importLegacyStorageService->getAllStorages();
-			foreach ($mounts as $mount) {
-				if ($mount->getBackendOption('password') === false) {
-					$output->writeln('<error>Failed to decrypt password</error>');
-					return 1;
-				}
-			}
-		} else {
-			if (!isset($data[0])) { //normalize to an array of mounts
-				$data = [$data];
-			}
-			$mounts = array_map([$this, 'parseData'], $data);
-		}
-
-		if ($user) {
-			// ensure applicables are correct for personal mounts
-			foreach ($mounts as $mount) {
-				$mount->setApplicableGroups([]);
-				$mount->setApplicableUsers([$user]);
-			}
-		}
-
-		$storageService = $this->getStorageService($user);
-
-		$existingMounts = $storageService->getAllStorages();
-
-		foreach ($mounts as $mount) {
-			foreach ($existingMounts as $existingMount) {
-				if (
-					$existingMount->getMountPoint() === $mount->getMountPoint() &&
-					$existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
-					$existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
-					$existingMount->getBackendOptions() == $mount->getBackendOptions()
-				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
-					return 1;
-				}
-			}
-		}
-
-		if ($input->getOption('dry')) {
-			if (count($mounts) === 0) {
-				$output->writeln('<error>No mounts to be imported</error>');
-				return 1;
-			}
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listInput->setOption('show-password', true);
-			$listCommand->listMounts($user, $mounts, $listInput, $output);
-		} else {
-			foreach ($mounts as $mount) {
-				$storageService->addStorage($mount);
-			}
-		}
-		return 0;
-	}
-
-	private function parseData(array $data) {
-		$mount = new StorageConfig($data['mount_id']);
-		$mount->setMountPoint($data['mount_point']);
-		$mount->setBackend($this->getBackendByClass($data['storage']));
-		$authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($data['configuration']);
-		$mount->setMountOptions($data['options']);
-		$mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
-		$mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
-		return $mount;
-	}
-
-	private function getBackendByClass($className) {
-		$backends = $this->backendService->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->getStorageClass() === $className) {
-				return $backend;
-			}
-		}
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var ImportLegacyStoragesService */
+    private $importLegacyStorageService;
+
+    /** @var BackendService */
+    private $backendService;
+
+    function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserSession $userSession,
+                            IUserManager $userManager,
+                            ImportLegacyStoragesService $importLegacyStorageService,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->importLegacyStorageService = $importLegacyStorageService;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:import')
+            ->setDescription('Import mount configurations')
+            ->addOption(
+                'user',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configurations for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to a json file containing the mounts to import, use "-" to read from stdin'
+            )
+            ->addOption(
+                'dry',
+                null,
+                InputOption::VALUE_NONE,
+                'Don\'t save the imported mounts, only list the new mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getOption('user');
+        $path = $input->getArgument('path');
+        if ($path === '-') {
+            $json = file_get_contents('php://stdin');
+        } else {
+            if (!file_exists($path)) {
+                $output->writeln('<error>File not found: ' . $path . '</error>');
+                return 1;
+            }
+            $json = file_get_contents($path);
+        }
+        if (!is_string($json) || strlen($json) < 2) {
+            $output->writeln('<error>Error while reading json</error>');
+            return 1;
+        }
+        $data = json_decode($json, true);
+        if (!is_array($data)) {
+            $output->writeln('<error>Error while parsing json</error>');
+            return 1;
+        }
+
+        $isLegacy = isset($data['user']) || isset($data['group']);
+        if ($isLegacy) {
+            $this->importLegacyStorageService->setData($data);
+            $mounts = $this->importLegacyStorageService->getAllStorages();
+            foreach ($mounts as $mount) {
+                if ($mount->getBackendOption('password') === false) {
+                    $output->writeln('<error>Failed to decrypt password</error>');
+                    return 1;
+                }
+            }
+        } else {
+            if (!isset($data[0])) { //normalize to an array of mounts
+                $data = [$data];
+            }
+            $mounts = array_map([$this, 'parseData'], $data);
+        }
+
+        if ($user) {
+            // ensure applicables are correct for personal mounts
+            foreach ($mounts as $mount) {
+                $mount->setApplicableGroups([]);
+                $mount->setApplicableUsers([$user]);
+            }
+        }
+
+        $storageService = $this->getStorageService($user);
+
+        $existingMounts = $storageService->getAllStorages();
+
+        foreach ($mounts as $mount) {
+            foreach ($existingMounts as $existingMount) {
+                if (
+                    $existingMount->getMountPoint() === $mount->getMountPoint() &&
+                    $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
+                    $existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
+                    $existingMount->getBackendOptions() == $mount->getBackendOptions()
+                ) {
+                    $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+                    return 1;
+                }
+            }
+        }
+
+        if ($input->getOption('dry')) {
+            if (count($mounts) === 0) {
+                $output->writeln('<error>No mounts to be imported</error>');
+                return 1;
+            }
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listInput->setOption('show-password', true);
+            $listCommand->listMounts($user, $mounts, $listInput, $output);
+        } else {
+            foreach ($mounts as $mount) {
+                $storageService->addStorage($mount);
+            }
+        }
+        return 0;
+    }
+
+    private function parseData(array $data) {
+        $mount = new StorageConfig($data['mount_id']);
+        $mount->setMountPoint($data['mount_point']);
+        $mount->setBackend($this->getBackendByClass($data['storage']));
+        $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($data['configuration']);
+        $mount->setMountOptions($data['options']);
+        $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
+        $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
+        return $mount;
+    }
+
+    private function getBackendByClass($className) {
+        $backends = $this->backendService->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->getStorageClass() === $className) {
+                return $backend;
+            }
+        }
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 			$json = file_get_contents('php://stdin');
 		} else {
 			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
+				$output->writeln('<error>File not found: '.$path.'</error>');
 				return 1;
 			}
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@ 
 					$existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
 					$existingMount->getBackendOptions() == $mount->getBackendOptions()
 				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
 					return 1;
 				}
 			}