nextcloud / server

lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php

Indentation +202 added lines, -202 removed lines

@@ -17,209 +17,209 @@
  * @psalm-type ObjectStoreConfig array{class: class-string<IObjectStore>, arguments: array{multibucket: bool, ...}}
  */
 class PrimaryObjectStoreConfig {
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly IAppManager $appManager,
-	) {
-	}
-
-	/**
-	 * @param ObjectStoreConfig $config
-	 */
-	public function buildObjectStore(array $config): IObjectStore {
-		return new $config['class']($config['arguments']);
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForRoot(): ?array {
-		if (!$this->hasObjectStore()) {
-			return null;
-		}
-
-		$config = $this->getObjectStoreConfiguration('root');
-
-		if ($config['arguments']['multibucket']) {
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-
-			// put the root FS always in first bucket for multibucket configuration
-			$config['arguments']['bucket'] .= '0';
-		}
-		return $config;
-	}
-
-	/**
-	 * @return ?ObjectStoreConfig
-	 */
-	public function getObjectStoreConfigForUser(IUser $user): ?array {
-		if (!$this->hasObjectStore()) {
-			return null;
-		}
-
-		$store = $this->getObjectStoreForUser($user);
-		$config = $this->getObjectStoreConfiguration($store);
-
-		if ($config['arguments']['multibucket']) {
-			$config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
-		}
-		return $config;
-	}
-
-	/**
-	 * @param string $name
-	 * @return ObjectStoreConfig
-	 */
-	public function getObjectStoreConfiguration(string $name): array {
-		$configs = $this->getObjectStoreConfigs();
-		$name = $this->resolveAlias($name);
-		if (!isset($configs[$name])) {
-			throw new \Exception("Object store configuration for '$name' not found");
-		}
-		if (is_string($configs[$name])) {
-			throw new \Exception("Object store configuration for '{$configs[$name]}' not found");
-		}
-		return $configs[$name];
-	}
-
-	public function resolveAlias(string $name): string {
-		$configs = $this->getObjectStoreConfigs();
-
-		while (isset($configs[$name]) && is_string($configs[$name])) {
-			$name = $configs[$name];
-		}
-		return $name;
-	}
-
-	public function hasObjectStore(): bool {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
-		return $objectStore || $objectStoreMultiBucket;
-	}
-
-	public function hasMultipleObjectStorages(): bool {
-		$objectStore = $this->config->getSystemValue('objectstore', []);
-		return isset($objectStore['default']);
-	}
-
-	/**
-	 * @return ?array<string, ObjectStoreConfig|string>
-	 * @throws InvalidObjectStoreConfigurationException
-	 */
-	public function getObjectStoreConfigs(): ?array {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
-
-		// new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
-		if ($objectStoreMultiBucket) {
-			$objectStoreMultiBucket['arguments']['multibucket'] = true;
-			return [
-				'default' => 'server1',
-				'server1' => $this->validateObjectStoreConfig($objectStoreMultiBucket),
-				'root' => 'server1',
-			];
-		} elseif ($objectStore) {
-			if (!isset($objectStore['default'])) {
-				$objectStore = [
-					'default' => 'server1',
-					'root' => 'server1',
-					'server1' => $objectStore,
-				];
-			}
-			if (!isset($objectStore['root'])) {
-				$objectStore['root'] = 'default';
-			}
-
-			if (!is_string($objectStore['default'])) {
-				throw new InvalidObjectStoreConfigurationException('The \'default\' object storage configuration is required to be a reference to another configuration.');
-			}
-			return array_map($this->validateObjectStoreConfig(...), $objectStore);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param array|string $config
-	 * @return string|ObjectStoreConfig
-	 */
-	private function validateObjectStoreConfig(array|string $config): array|string {
-		if (is_string($config)) {
-			return $config;
-		}
-		if (!isset($config['class'])) {
-			throw new InvalidObjectStoreConfigurationException('No class configured for object store');
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$class = $config['class'];
-		$arguments = $config['arguments'];
-		if (!is_array($arguments)) {
-			throw new InvalidObjectStoreConfigurationException('Configured object store arguments are not an array');
-		}
-		if (!isset($arguments['multibucket'])) {
-			$arguments['multibucket'] = false;
-		}
-		if (!is_bool($arguments['multibucket'])) {
-			throw new InvalidObjectStoreConfigurationException('arguments.multibucket must be a boolean in object store configuration');
-		}
-
-		if (!is_string($class)) {
-			throw new InvalidObjectStoreConfigurationException('Configured class for object store is not a string');
-		}
-
-		if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
-			[$appId] = explode('\\', $class);
-			$this->appManager->loadApp(strtolower($appId));
-		}
-
-		if (!is_a($class, IObjectStore::class, true)) {
-			throw new InvalidObjectStoreConfigurationException('Configured class for object store is not an object store');
-		}
-		return [
-			'class' => $class,
-			'arguments' => $arguments,
-		];
-	}
-
-	public function getBucketForUser(IUser $user, array $config): string {
-		$bucket = $this->getSetBucketForUser($user);
-
-		if ($bucket === null) {
-			/*
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly IAppManager $appManager,
+    ) {
+    }
+
+    /**
+     * @param ObjectStoreConfig $config
+     */
+    public function buildObjectStore(array $config): IObjectStore {
+        return new $config['class']($config['arguments']);
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForRoot(): ?array {
+        if (!$this->hasObjectStore()) {
+            return null;
+        }
+
+        $config = $this->getObjectStoreConfiguration('root');
+
+        if ($config['arguments']['multibucket']) {
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+
+            // put the root FS always in first bucket for multibucket configuration
+            $config['arguments']['bucket'] .= '0';
+        }
+        return $config;
+    }
+
+    /**
+     * @return ?ObjectStoreConfig
+     */
+    public function getObjectStoreConfigForUser(IUser $user): ?array {
+        if (!$this->hasObjectStore()) {
+            return null;
+        }
+
+        $store = $this->getObjectStoreForUser($user);
+        $config = $this->getObjectStoreConfiguration($store);
+
+        if ($config['arguments']['multibucket']) {
+            $config['arguments']['bucket'] = $this->getBucketForUser($user, $config);
+        }
+        return $config;
+    }
+
+    /**
+     * @param string $name
+     * @return ObjectStoreConfig
+     */
+    public function getObjectStoreConfiguration(string $name): array {
+        $configs = $this->getObjectStoreConfigs();
+        $name = $this->resolveAlias($name);
+        if (!isset($configs[$name])) {
+            throw new \Exception("Object store configuration for '$name' not found");
+        }
+        if (is_string($configs[$name])) {
+            throw new \Exception("Object store configuration for '{$configs[$name]}' not found");
+        }
+        return $configs[$name];
+    }
+
+    public function resolveAlias(string $name): string {
+        $configs = $this->getObjectStoreConfigs();
+
+        while (isset($configs[$name]) && is_string($configs[$name])) {
+            $name = $configs[$name];
+        }
+        return $name;
+    }
+
+    public function hasObjectStore(): bool {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
+        return $objectStore || $objectStoreMultiBucket;
+    }
+
+    public function hasMultipleObjectStorages(): bool {
+        $objectStore = $this->config->getSystemValue('objectstore', []);
+        return isset($objectStore['default']);
+    }
+
+    /**
+     * @return ?array<string, ObjectStoreConfig|string>
+     * @throws InvalidObjectStoreConfigurationException
+     */
+    public function getObjectStoreConfigs(): ?array {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultiBucket = $this->config->getSystemValue('objectstore_multibucket', null);
+
+        // new-style multibucket config uses the same 'objectstore' key but sets `'multibucket' => true`, transparently upgrade older style config
+        if ($objectStoreMultiBucket) {
+            $objectStoreMultiBucket['arguments']['multibucket'] = true;
+            return [
+                'default' => 'server1',
+                'server1' => $this->validateObjectStoreConfig($objectStoreMultiBucket),
+                'root' => 'server1',
+            ];
+        } elseif ($objectStore) {
+            if (!isset($objectStore['default'])) {
+                $objectStore = [
+                    'default' => 'server1',
+                    'root' => 'server1',
+                    'server1' => $objectStore,
+                ];
+            }
+            if (!isset($objectStore['root'])) {
+                $objectStore['root'] = 'default';
+            }
+
+            if (!is_string($objectStore['default'])) {
+                throw new InvalidObjectStoreConfigurationException('The \'default\' object storage configuration is required to be a reference to another configuration.');
+            }
+            return array_map($this->validateObjectStoreConfig(...), $objectStore);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @param array|string $config
+     * @return string|ObjectStoreConfig
+     */
+    private function validateObjectStoreConfig(array|string $config): array|string {
+        if (is_string($config)) {
+            return $config;
+        }
+        if (!isset($config['class'])) {
+            throw new InvalidObjectStoreConfigurationException('No class configured for object store');
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $class = $config['class'];
+        $arguments = $config['arguments'];
+        if (!is_array($arguments)) {
+            throw new InvalidObjectStoreConfigurationException('Configured object store arguments are not an array');
+        }
+        if (!isset($arguments['multibucket'])) {
+            $arguments['multibucket'] = false;
+        }
+        if (!is_bool($arguments['multibucket'])) {
+            throw new InvalidObjectStoreConfigurationException('arguments.multibucket must be a boolean in object store configuration');
+        }
+
+        if (!is_string($class)) {
+            throw new InvalidObjectStoreConfigurationException('Configured class for object store is not a string');
+        }
+
+        if (str_starts_with($class, 'OCA\\') && substr_count($class, '\\') >= 2) {
+            [$appId] = explode('\\', $class);
+            $this->appManager->loadApp(strtolower($appId));
+        }
+
+        if (!is_a($class, IObjectStore::class, true)) {
+            throw new InvalidObjectStoreConfigurationException('Configured class for object store is not an object store');
+        }
+        return [
+            'class' => $class,
+            'arguments' => $arguments,
+        ];
+    }
+
+    public function getBucketForUser(IUser $user, array $config): string {
+        $bucket = $this->getSetBucketForUser($user);
+
+        if ($bucket === null) {
+            /*
 			 * Use any provided bucket argument as prefix
 			 * and add the mapping from username => bucket
 			 */
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-			$mapper = new Mapper($user, $this->config);
-			$numBuckets = $config['arguments']['num_buckets'] ?? 64;
-			$bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
-
-			$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
-		}
-
-		return $bucket;
-	}
-
-	public function getSetBucketForUser(IUser $user): ?string {
-		return $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
-	}
-
-	public function getObjectStoreForUser(IUser $user): string {
-		if ($this->hasMultipleObjectStorages()) {
-			$value = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'objectstore', null);
-			if ($value === null) {
-				$value = $this->resolveAlias('default');
-				$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'objectstore', $value);
-			}
-			return $value;
-		} else {
-			return 'default';
-		}
-	}
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+            $mapper = new Mapper($user, $this->config);
+            $numBuckets = $config['arguments']['num_buckets'] ?? 64;
+            $bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);
+
+            $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $bucket);
+        }
+
+        return $bucket;
+    }
+
+    public function getSetBucketForUser(IUser $user): ?string {
+        return $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
+    }
+
+    public function getObjectStoreForUser(IUser $user): string {
+        if ($this->hasMultipleObjectStorages()) {
+            $value = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'objectstore', null);
+            if ($value === null) {
+                $value = $this->resolveAlias('default');
+                $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'objectstore', $value);
+            }
+            return $value;
+        } else {
+            return 'default';
+        }
+    }
 }

apps/files/lib/Command/Object/Multi/Users.php

Indentation +71 added lines, -71 removed lines

@@ -18,81 +18,81 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Users extends Base {
-	public function __construct(
-		private readonly IUserManager $userManager,
-		private readonly PrimaryObjectStoreConfig $objectStoreConfig,
-		private readonly IConfig $config,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private readonly IUserManager $userManager,
+        private readonly PrimaryObjectStoreConfig $objectStoreConfig,
+        private readonly IConfig $config,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		parent::configure();
-		$this
-			->setName('files:object:multi:users')
-			->setDescription('Get the mapping between users and object store buckets')
-			->addOption('bucket', 'b', InputOption::VALUE_REQUIRED, 'Only list users using the specified bucket')
-			->addOption('object-store', 'o', InputOption::VALUE_REQUIRED, 'Only list users using the specified object store configuration')
-			->addOption('user', 'u', InputOption::VALUE_REQUIRED, 'Only show the mapping for the specified user, ignores all other options');
-	}
+    protected function configure(): void {
+        parent::configure();
+        $this
+            ->setName('files:object:multi:users')
+            ->setDescription('Get the mapping between users and object store buckets')
+            ->addOption('bucket', 'b', InputOption::VALUE_REQUIRED, 'Only list users using the specified bucket')
+            ->addOption('object-store', 'o', InputOption::VALUE_REQUIRED, 'Only list users using the specified object store configuration')
+            ->addOption('user', 'u', InputOption::VALUE_REQUIRED, 'Only show the mapping for the specified user, ignores all other options');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		if ($userId = $input->getOption('user')) {
-			$user = $this->userManager->get($userId);
-			if (!$user) {
-				$output->writeln("<error>User $userId not found</error>");
-				return 1;
-			}
-			$users = new \ArrayIterator([$user]);
-		} else {
-			$bucket = (string)$input->getOption('bucket');
-			$objectStore = (string)$input->getOption('object-store');
-			if ($bucket !== '' && $objectStore === '') {
-				$users = $this->getUsers($this->config->getUsersForUserValue('homeobjectstore', 'bucket', $bucket));
-			} elseif ($bucket === '' && $objectStore !== '') {
-				$users = $this->getUsers($this->config->getUsersForUserValue('homeobjectstore', 'objectstore', $objectStore));
-			} elseif ($bucket) {
-				$users = $this->getUsers(array_intersect(
-					$this->config->getUsersForUserValue('homeobjectstore', 'bucket', $bucket),
-					$this->config->getUsersForUserValue('homeobjectstore', 'objectstore', $objectStore)
-				));
-			} else {
-				$users = $this->userManager->getSeenUsers();
-			}
-		}
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        if ($userId = $input->getOption('user')) {
+            $user = $this->userManager->get($userId);
+            if (!$user) {
+                $output->writeln("<error>User $userId not found</error>");
+                return 1;
+            }
+            $users = new \ArrayIterator([$user]);
+        } else {
+            $bucket = (string)$input->getOption('bucket');
+            $objectStore = (string)$input->getOption('object-store');
+            if ($bucket !== '' && $objectStore === '') {
+                $users = $this->getUsers($this->config->getUsersForUserValue('homeobjectstore', 'bucket', $bucket));
+            } elseif ($bucket === '' && $objectStore !== '') {
+                $users = $this->getUsers($this->config->getUsersForUserValue('homeobjectstore', 'objectstore', $objectStore));
+            } elseif ($bucket) {
+                $users = $this->getUsers(array_intersect(
+                    $this->config->getUsersForUserValue('homeobjectstore', 'bucket', $bucket),
+                    $this->config->getUsersForUserValue('homeobjectstore', 'objectstore', $objectStore)
+                ));
+            } else {
+                $users = $this->userManager->getSeenUsers();
+            }
+        }
 
-		$this->writeStreamingTableInOutputFormat($input, $output, $this->infoForUsers($users), 100);
-		return 0;
-	}
+        $this->writeStreamingTableInOutputFormat($input, $output, $this->infoForUsers($users), 100);
+        return 0;
+    }
 
-	/**
-	 * @param string[] $userIds
-	 * @return \Iterator<IUser>
-	 */
-	private function getUsers(array $userIds): \Iterator {
-		foreach ($userIds as $userId) {
-			$user = $this->userManager->get($userId);
-			if ($user) {
-				yield $user;
-			}
-		}
-	}
+    /**
+     * @param string[] $userIds
+     * @return \Iterator<IUser>
+     */
+    private function getUsers(array $userIds): \Iterator {
+        foreach ($userIds as $userId) {
+            $user = $this->userManager->get($userId);
+            if ($user) {
+                yield $user;
+            }
+        }
+    }
 
-	/**
-	 * @param \Iterator<IUser> $users
-	 * @return \Iterator<array>
-	 */
-	private function infoForUsers(\Iterator $users): \Iterator {
-		foreach ($users as $user) {
-			yield $this->infoForUser($user);
-		}
-	}
+    /**
+     * @param \Iterator<IUser> $users
+     * @return \Iterator<array>
+     */
+    private function infoForUsers(\Iterator $users): \Iterator {
+        foreach ($users as $user) {
+            yield $this->infoForUser($user);
+        }
+    }
 
-	private function infoForUser(IUser $user): array {
-		return [
-			'user' => $user->getUID(),
-			'object-store' => $this->objectStoreConfig->getObjectStoreForUser($user),
-			'bucket' => $this->objectStoreConfig->getSetBucketForUser($user) ?? 'unset',
-		];
-	}
+    private function infoForUser(IUser $user): array {
+        return [
+            'user' => $user->getUID(),
+            'object-store' => $this->objectStoreConfig->getObjectStoreForUser($user),
+            'bucket' => $this->objectStoreConfig->getSetBucketForUser($user) ?? 'unset',
+        ];
+    }
 }

apps/files/lib/Command/Object/Multi/Rename.php

Indentation +75 added lines, -75 removed lines

@@ -19,90 +19,90 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Rename extends Base {
-	public function __construct(
-		private readonly IDBConnection $connection,
-		private readonly PrimaryObjectStoreConfig $objectStoreConfig,
-		private readonly IConfig $config,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private readonly IDBConnection $connection,
+        private readonly PrimaryObjectStoreConfig $objectStoreConfig,
+        private readonly IConfig $config,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		parent::configure();
-		$this
-			->setName('files:object:multi:rename-config')
-			->setDescription('Rename an object store configuration and move all users over to the new configuration,')
-			->addArgument('source', InputArgument::REQUIRED, 'Object store configuration to rename')
-			->addArgument('target', InputArgument::REQUIRED, 'New name for the object store configuration');
-	}
+    protected function configure(): void {
+        parent::configure();
+        $this
+            ->setName('files:object:multi:rename-config')
+            ->setDescription('Rename an object store configuration and move all users over to the new configuration,')
+            ->addArgument('source', InputArgument::REQUIRED, 'Object store configuration to rename')
+            ->addArgument('target', InputArgument::REQUIRED, 'New name for the object store configuration');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$source = $input->getArgument('source');
-		$target = $input->getArgument('target');
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $source = $input->getArgument('source');
+        $target = $input->getArgument('target');
 
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		if (!isset($configs[$source])) {
-			$output->writeln('<error>Unknown object store configuration: ' . $source . '</error>');
-			return 1;
-		}
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        if (!isset($configs[$source])) {
+            $output->writeln('<error>Unknown object store configuration: ' . $source . '</error>');
+            return 1;
+        }
 
-		if ($source === 'root') {
-			$output->writeln('<error>Renaming the root configuration is not supported.</error>');
-			return 1;
-		}
+        if ($source === 'root') {
+            $output->writeln('<error>Renaming the root configuration is not supported.</error>');
+            return 1;
+        }
 
-		if ($source === 'default') {
-			$output->writeln('<error>Renaming the default configuration is not supported.</error>');
-			return 1;
-		}
+        if ($source === 'default') {
+            $output->writeln('<error>Renaming the default configuration is not supported.</error>');
+            return 1;
+        }
 
-		if (!isset($configs[$target])) {
-			$output->writeln('<comment>Target object store configuration ' . $target . ' doesn\'t exist yet.</comment>');
-			$output->writeln('The target configuration can be created automatically.');
-			$output->writeln('However, as this depends on modifying the config.php, this only works as long as the instance runs on a single node or all nodes in a clustered setup have a shared config file (such as from a shared network mount).');
-			$output->writeln('If the different nodes have a separate copy of the config.php file, the automatic object store configuration creation will lead to the configuration going out of sync.');
-			$output->writeln('If these requirements are not met, you can manually create the target object store configuration in each node\'s configuration before running the command.');
-			$output->writeln('');
-			$output->writeln('<error>Failure to check these requirements will lead to data loss for users.</error>');
+        if (!isset($configs[$target])) {
+            $output->writeln('<comment>Target object store configuration ' . $target . ' doesn\'t exist yet.</comment>');
+            $output->writeln('The target configuration can be created automatically.');
+            $output->writeln('However, as this depends on modifying the config.php, this only works as long as the instance runs on a single node or all nodes in a clustered setup have a shared config file (such as from a shared network mount).');
+            $output->writeln('If the different nodes have a separate copy of the config.php file, the automatic object store configuration creation will lead to the configuration going out of sync.');
+            $output->writeln('If these requirements are not met, you can manually create the target object store configuration in each node\'s configuration before running the command.');
+            $output->writeln('');
+            $output->writeln('<error>Failure to check these requirements will lead to data loss for users.</error>');
 
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Automatically create target object store configuration? [y/N] ', false);
-			if ($helper->ask($input, $output, $question)) {
-				$configs[$target] = $configs[$source];
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Automatically create target object store configuration? [y/N] ', false);
+            if ($helper->ask($input, $output, $question)) {
+                $configs[$target] = $configs[$source];
 
-				// update all aliases
-				foreach ($configs as &$config) {
-					if ($config === $source) {
-						$config = $target;
-					}
-				}
-				$this->config->setSystemValue('objectstore', $configs);
-			} else {
-				return 0;
-			}
-		} elseif (($configs[$source] !== $configs[$target]) || $configs[$source] !== $target) {
-			$output->writeln('<error>Source and target configuration differ.</error>');
-			$output->writeln('');
-			$output->writeln('To ensure proper migration of users, the source and target configuration must be the same to ensure that the objects for the moved users exist on the target configuration.');
-			$output->writeln('The usual migration process consists of creating a clone of the old configuration, moving the users from the old configuration to the new one, and then adjust the old configuration that is longer used.');
-			return 1;
-		}
+                // update all aliases
+                foreach ($configs as &$config) {
+                    if ($config === $source) {
+                        $config = $target;
+                    }
+                }
+                $this->config->setSystemValue('objectstore', $configs);
+            } else {
+                return 0;
+            }
+        } elseif (($configs[$source] !== $configs[$target]) || $configs[$source] !== $target) {
+            $output->writeln('<error>Source and target configuration differ.</error>');
+            $output->writeln('');
+            $output->writeln('To ensure proper migration of users, the source and target configuration must be the same to ensure that the objects for the moved users exist on the target configuration.');
+            $output->writeln('The usual migration process consists of creating a clone of the old configuration, moving the users from the old configuration to the new one, and then adjust the old configuration that is longer used.');
+            return 1;
+        }
 
-		$query = $this->connection->getQueryBuilder();
-		$query->update('preferences')
-			->set('configvalue', $query->createNamedParameter($target))
-			->where($query->expr()->eq('appid', $query->createNamedParameter('homeobjectstore')))
-			->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('objectstore')))
-			->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter($source)));
-		$count = $query->executeStatement();
+        $query = $this->connection->getQueryBuilder();
+        $query->update('preferences')
+            ->set('configvalue', $query->createNamedParameter($target))
+            ->where($query->expr()->eq('appid', $query->createNamedParameter('homeobjectstore')))
+            ->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('objectstore')))
+            ->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter($source)));
+        $count = $query->executeStatement();
 
-		if ($count > 0) {
-			$output->writeln('Moved <info>' . $count . '</info> users');
-		} else {
-			$output->writeln('No users moved');
-		}
+        if ($count > 0) {
+            $output->writeln('Moved <info>' . $count . '</info> users');
+        } else {
+            $output->writeln('No users moved');
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 }

tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php

Indentation +265 added lines, -265 removed lines

@@ -17,269 +17,269 @@
 use Test\TestCase;
 
 class PrimaryObjectStoreConfigTest extends TestCase {
-	private array $systemConfig = [];
-	private array $userConfig = [];
-	private IConfig&MockObject $config;
-	private IAppManager&MockObject $appManager;
-	private PrimaryObjectStoreConfig $objectStoreConfig;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->systemConfig = [];
-		$this->config = $this->createMock(IConfig::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default = '') {
-				if (isset($this->systemConfig[$key])) {
-					return $this->systemConfig[$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('getUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $default = '') {
-				if (isset($this->userConfig[$userId][$appName][$key])) {
-					return $this->userConfig[$userId][$appName][$key];
-				} else {
-					return $default;
-				}
-			});
-		$this->config->method('setUserValue')
-			->willReturnCallback(function ($userId, $appName, $key, $value) {
-				$this->userConfig[$userId][$appName][$key] = $value;
-			});
-
-		$this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
-	}
-
-	private function getUser(string $uid): IUser {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn($uid);
-		return $user;
-	}
-
-	private function setConfig(string $key, $value) {
-		$this->systemConfig[$key] = $value;
-	}
-
-	public function testNewUserGetsDefault() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-	}
-
-	public function testExistingUserKeepsStorage() {
-		// setup user with `server1` as storage
-		$this->testNewUserGetsDefault();
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
-
-	public function testNestedAliases() {
-		$this->setConfig('objectstore', [
-			'default' => 'a1',
-			'a1' => 'a2',
-			'a2' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-		]);
-		$this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
-	}
-
-	public function testMultibucketChangedConfig() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket-7', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket-40', $result['arguments']['bucket']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 64,
-					'bucket' => 'bucket-'
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-					'multibucket' => true,
-					'num_buckets' => 16,
-					'bucket' => 'bucket-'
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
-		$this->assertEquals('server1', $result['arguments']['host']);
-		$this->assertEquals('bucket-7', $result['arguments']['bucket']);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
-		$this->assertEquals('server2', $result['arguments']['host']);
-		$this->assertEquals('bucket-4', $result['arguments']['bucket']);
-	}
-
-	public function testMultibucketOldConfig() {
-		$this->setConfig('objectstore_multibucket', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-				'multibucket' => true,
-				'num_buckets' => 8,
-				'bucket' => 'bucket-'
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => true,
-					'num_buckets' => 8,
-					'bucket' => 'bucket-'
-				],
-			],
-		], $configs);
-	}
-
-	public function testSingleObjectStore() {
-		$this->setConfig('objectstore', [
-			'class' => StorageObjectStore::class,
-			'arguments' => [
-				'host' => 'server1',
-			],
-		]);
-		$configs = $this->objectStoreConfig->getObjectStoreConfigs();
-		$this->assertEquals([
-			'default' => 'server1',
-			'root' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-					'multibucket' => false,
-				],
-			],
-		], $configs);
-	}
-
-	public function testRoot() {
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server1', $result['arguments']['host']);
-
-		$this->setConfig('objectstore', [
-			'default' => 'server1',
-			'root' => 'server2',
-			'server1' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server1',
-				],
-			],
-			'server2' => [
-				'class' => StorageObjectStore::class,
-				'arguments' => [
-					'host' => 'server2',
-				],
-			],
-		]);
-
-		$result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
-		$this->assertEquals('server2', $result['arguments']['host']);
-	}
+    private array $systemConfig = [];
+    private array $userConfig = [];
+    private IConfig&MockObject $config;
+    private IAppManager&MockObject $appManager;
+    private PrimaryObjectStoreConfig $objectStoreConfig;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->systemConfig = [];
+        $this->config = $this->createMock(IConfig::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default = '') {
+                if (isset($this->systemConfig[$key])) {
+                    return $this->systemConfig[$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('getUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $default = '') {
+                if (isset($this->userConfig[$userId][$appName][$key])) {
+                    return $this->userConfig[$userId][$appName][$key];
+                } else {
+                    return $default;
+                }
+            });
+        $this->config->method('setUserValue')
+            ->willReturnCallback(function ($userId, $appName, $key, $value) {
+                $this->userConfig[$userId][$appName][$key] = $value;
+            });
+
+        $this->objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->appManager);
+    }
+
+    private function getUser(string $uid): IUser {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn($uid);
+        return $user;
+    }
+
+    private function setConfig(string $key, $value) {
+        $this->systemConfig[$key] = $value;
+    }
+
+    public function testNewUserGetsDefault() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+    }
+
+    public function testExistingUserKeepsStorage() {
+        // setup user with `server1` as storage
+        $this->testNewUserGetsDefault();
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->assertEquals('server1', $this->config->getUserValue('test', 'homeobjectstore', 'objectstore', null));
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('other-user'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
+
+    public function testNestedAliases() {
+        $this->setConfig('objectstore', [
+            'default' => 'a1',
+            'a1' => 'a2',
+            'a2' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+        ]);
+        $this->assertEquals('server1', $this->objectStoreConfig->resolveAlias('default'));
+    }
+
+    public function testMultibucketChangedConfig() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket-7', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-foo'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket-40', $result['arguments']['bucket']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 64,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                    'multibucket' => true,
+                    'num_buckets' => 16,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test'));
+        $this->assertEquals('server1', $result['arguments']['host']);
+        $this->assertEquals('bucket-7', $result['arguments']['bucket']);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForUser($this->getUser('test-bar'));
+        $this->assertEquals('server2', $result['arguments']['host']);
+        $this->assertEquals('bucket-4', $result['arguments']['bucket']);
+    }
+
+    public function testMultibucketOldConfig() {
+        $this->setConfig('objectstore_multibucket', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+                'multibucket' => true,
+                'num_buckets' => 8,
+                'bucket' => 'bucket-'
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => true,
+                    'num_buckets' => 8,
+                    'bucket' => 'bucket-'
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testSingleObjectStore() {
+        $this->setConfig('objectstore', [
+            'class' => StorageObjectStore::class,
+            'arguments' => [
+                'host' => 'server1',
+            ],
+        ]);
+        $configs = $this->objectStoreConfig->getObjectStoreConfigs();
+        $this->assertEquals([
+            'default' => 'server1',
+            'root' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                    'multibucket' => false,
+                ],
+            ],
+        ], $configs);
+    }
+
+    public function testRoot() {
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server1', $result['arguments']['host']);
+
+        $this->setConfig('objectstore', [
+            'default' => 'server1',
+            'root' => 'server2',
+            'server1' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server1',
+                ],
+            ],
+            'server2' => [
+                'class' => StorageObjectStore::class,
+                'arguments' => [
+                    'host' => 'server2',
+                ],
+            ],
+        ]);
+
+        $result = $this->objectStoreConfig->getObjectStoreConfigForRoot();
+        $this->assertEquals('server2', $result['arguments']['host']);
+    }
 }

tests/lib/Files/Mount/ObjectHomeMountProviderTest.php

Indentation +242 added lines, -242 removed lines

@@ -16,256 +16,256 @@
 use OCP\IUser;
 
 class ObjectHomeMountProviderTest extends \Test\TestCase {
-	/** @var ObjectHomeMountProvider */
-	protected $provider;
-
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
-
-	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-	protected $user;
-
-	/** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */
-	protected $loader;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->user = $this->createMock(IUser::class);
-		$this->loader = $this->createMock(IStorageFactory::class);
-
-		$objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->createMock(IAppManager::class));
-		$this->provider = new ObjectHomeMountProvider($objectStoreConfig);
-	}
-
-	public function testSingleBucket(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar'
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'multibucket' => false], $objectStore->getArguments());
-	}
-
-	public function testMultiBucket(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar'
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config->method('getUserValue')
-			->willReturn(null);
-
-		$this->config
-			->method('setUserValue')
-			->with(
-				$this->equalTo('uid'),
-				$this->equalTo('homeobjectstore'),
-				$this->equalTo('bucket'),
-				$this->equalTo('49'),
-				$this->equalTo(null)
-			);
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 49, 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketWithPrefix(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config
-			->method('getUserValue')
-			->willReturn(null);
-
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with(
-				$this->equalTo('uid'),
-				$this->equalTo('homeobjectstore'),
-				$this->equalTo('bucket'),
-				$this->equalTo('myBucketPrefix49'),
-				$this->equalTo(null)
-			);
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 'myBucketPrefix49', 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketBucketAlreadySet(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$this->config
-			->method('getUserValue')
-			->willReturnCallback(function ($uid, $app, $key, $default) {
-				if ($uid === 'uid' && $app === 'homeobjectstore' && $key === 'bucket') {
-					return 'awesomeBucket1';
-				} else {
-					return $default;
-				}
-			});
-
-		$this->config->expects($this->never())
-			->method('setUserValue');
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$arguments = $this->invokePrivate($mount, 'arguments');
-
-		$objectStore = $arguments['objectstore'];
-		$this->assertInstanceOf(FakeObjectStore::class, $objectStore);
-		$this->assertEquals(['foo' => 'bar', 'bucket' => 'awesomeBucket1', 'multibucket' => true], $objectStore->getArguments());
-	}
-
-	public function testMultiBucketConfigFirst(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				if ($key === 'objectstore_multibucket') {
-					return [
-						'class' => 'Test\Files\Mount\FakeObjectStore',
-						'arguments' => [
-							'foo' => 'bar',
-							'bucket' => 'myBucketPrefix',
-						],
-					];
-				} else {
-					return $default;
-				}
-			});
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
-	}
-
-	public function testMultiBucketConfigFirstFallBackSingle(): void {
-		$this->config
-			->method('getSystemValue')->willReturnMap([
-				['objectstore_multibucket', null, null],
-				['objectstore', null, [
-					'class' => 'Test\Files\Mount\FakeObjectStore',
-					'arguments' => [
-						'foo' => 'bar',
-						'bucket' => 'myBucketPrefix',
-					],
-				]],
-			]);
-
-		$this->user->method('getUID')
-			->willReturn('uid');
-		$this->loader->expects($this->never())->method($this->anything());
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
-	}
-
-	public function testNoObjectStore(): void {
-		$this->config->method('getSystemValue')
-			->willReturnCallback(function ($key, $default) {
-				return $default;
-			});
-
-		$mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
-		$this->assertNull($mount);
-	}
+    /** @var ObjectHomeMountProvider */
+    protected $provider;
+
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
+
+    /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+    protected $user;
+
+    /** @var IStorageFactory|\PHPUnit\Framework\MockObject\MockObject */
+    protected $loader;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->user = $this->createMock(IUser::class);
+        $this->loader = $this->createMock(IStorageFactory::class);
+
+        $objectStoreConfig = new PrimaryObjectStoreConfig($this->config, $this->createMock(IAppManager::class));
+        $this->provider = new ObjectHomeMountProvider($objectStoreConfig);
+    }
+
+    public function testSingleBucket(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar'
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'multibucket' => false], $objectStore->getArguments());
+    }
+
+    public function testMultiBucket(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar'
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config->method('getUserValue')
+            ->willReturn(null);
+
+        $this->config
+            ->method('setUserValue')
+            ->with(
+                $this->equalTo('uid'),
+                $this->equalTo('homeobjectstore'),
+                $this->equalTo('bucket'),
+                $this->equalTo('49'),
+                $this->equalTo(null)
+            );
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 49, 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketWithPrefix(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturn(null);
+
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with(
+                $this->equalTo('uid'),
+                $this->equalTo('homeobjectstore'),
+                $this->equalTo('bucket'),
+                $this->equalTo('myBucketPrefix49'),
+                $this->equalTo(null)
+            );
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 'myBucketPrefix49', 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketBucketAlreadySet(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $this->config
+            ->method('getUserValue')
+            ->willReturnCallback(function ($uid, $app, $key, $default) {
+                if ($uid === 'uid' && $app === 'homeobjectstore' && $key === 'bucket') {
+                    return 'awesomeBucket1';
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $arguments = $this->invokePrivate($mount, 'arguments');
+
+        $objectStore = $arguments['objectstore'];
+        $this->assertInstanceOf(FakeObjectStore::class, $objectStore);
+        $this->assertEquals(['foo' => 'bar', 'bucket' => 'awesomeBucket1', 'multibucket' => true], $objectStore->getArguments());
+    }
+
+    public function testMultiBucketConfigFirst(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                if ($key === 'objectstore_multibucket') {
+                    return [
+                        'class' => 'Test\Files\Mount\FakeObjectStore',
+                        'arguments' => [
+                            'foo' => 'bar',
+                            'bucket' => 'myBucketPrefix',
+                        ],
+                    ];
+                } else {
+                    return $default;
+                }
+            });
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
+    }
+
+    public function testMultiBucketConfigFirstFallBackSingle(): void {
+        $this->config
+            ->method('getSystemValue')->willReturnMap([
+                ['objectstore_multibucket', null, null],
+                ['objectstore', null, [
+                    'class' => 'Test\Files\Mount\FakeObjectStore',
+                    'arguments' => [
+                        'foo' => 'bar',
+                        'bucket' => 'myBucketPrefix',
+                    ],
+                ]],
+            ]);
+
+        $this->user->method('getUID')
+            ->willReturn('uid');
+        $this->loader->expects($this->never())->method($this->anything());
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertInstanceOf('OC\Files\Mount\MountPoint', $mount);
+    }
+
+    public function testNoObjectStore(): void {
+        $this->config->method('getSystemValue')
+            ->willReturnCallback(function ($key, $default) {
+                return $default;
+            });
+
+        $mount = $this->provider->getHomeMountForUser($this->user, $this->loader);
+        $this->assertNull($mount);
+    }
 }
 
 class FakeObjectStore implements IObjectStore {
-	public function __construct(
-		private array $arguments,
-	) {
-	}
+    public function __construct(
+        private array $arguments,
+    ) {
+    }
 
-	public function getArguments() {
-		return $this->arguments;
-	}
+    public function getArguments() {
+        return $this->arguments;
+    }
 
-	public function getStorageId() {
-	}
+    public function getStorageId() {
+    }
 
-	public function readObject($urn) {
-	}
+    public function readObject($urn) {
+    }
 
-	public function writeObject($urn, $stream, ?string $mimetype = null) {
-	}
+    public function writeObject($urn, $stream, ?string $mimetype = null) {
+    }
 
-	public function deleteObject($urn) {
-	}
+    public function deleteObject($urn) {
+    }
 
-	public function objectExists($urn) {
-	}
+    public function objectExists($urn) {
+    }
 
-	public function copyObject($from, $to) {
-	}
+    public function copyObject($from, $to) {
+    }
 }