nextcloud / server

lib/public/Http/Client/IClientService.php

Indentation +5 added lines, -5 removed lines

@@ -31,9 +31,9 @@
  * @since 8.1.0
  */
 interface IClientService {
-	/**
-	 * @return IClient
-	 * @since 8.1.0
-	 */
-	public function newClient(): IClient;
+    /**
+     * @return IClient
+     * @since 8.1.0
+     */
+    public function newClient(): IClient;
 }

lib/public/Http/Client/IResponse.php

Indentation +21 added lines, -21 removed lines

@@ -32,28 +32,28 @@
  * @since 8.1.0
  */
 interface IResponse {
-	/**
-	 * @return string|resource
-	 * @since 8.1.0
-	 */
-	public function getBody();
+    /**
+     * @return string|resource
+     * @since 8.1.0
+     */
+    public function getBody();
 
-	/**
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function getStatusCode(): int;
+    /**
+     * @return int
+     * @since 8.1.0
+     */
+    public function getStatusCode(): int;
 
-	/**
-	 * @param string $key
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getHeader(string $key): string;
+    /**
+     * @param string $key
+     * @return string
+     * @since 8.1.0
+     */
+    public function getHeader(string $key): string;
 
-	/**
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getHeaders(): array;
+    /**
+     * @return array
+     * @since 8.1.0
+     */
+    public function getHeaders(): array;
 }

lib/public/Security/IHasher.php

Indentation +18 added lines, -18 removed lines

@@ -45,23 +45,23 @@
  * @since 8.0.0
  */
 interface IHasher {
-	/**
-	 * Hashes a message using PHP's `password_hash` functionality.
-	 * Please note that the size of the returned string is not guaranteed
-	 * and can be up to 255 characters.
-	 *
-	 * @param string $message Message to generate hash from
-	 * @return string Hash of the message with appended version parameter
-	 * @since 8.0.0
-	 */
-	public function hash(string $message): string;
+    /**
+     * Hashes a message using PHP's `password_hash` functionality.
+     * Please note that the size of the returned string is not guaranteed
+     * and can be up to 255 characters.
+     *
+     * @param string $message Message to generate hash from
+     * @return string Hash of the message with appended version parameter
+     * @since 8.0.0
+     */
+    public function hash(string $message): string;
 
-	/**
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 * @since 8.0.0
-	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+    /**
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     * @since 8.0.0
+     */
+    public function verify(string $message, string $hash, &$newHash = null): bool ;
 }

Spacing +1 added lines, -1 removed lines

@@ -63,5 +63,5 @@
 	 * @return bool Whether $hash is a valid hash of $message
 	 * @since 8.0.0
 	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+	public function verify(string $message, string $hash, &$newHash = null): bool;
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php

Indentation +62 added lines, -62 removed lines

@@ -31,75 +31,75 @@
 
 class Version1002Date20170607113030 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
+    /** @var IDBConnection */
+    protected $connection;
 
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_backup_codes')) {
-			// Legacy table does not exist
-			return;
-		}
+        if (!$schema->hasTable('twofactor_backup_codes')) {
+            // Legacy table does not exist
+            return;
+        }
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('twofactor_backupcodes')
-			->values([
-				// Inserting with id might fail: 'id' => $insert->createParameter('id'),
-				'user_id' => $insert->createParameter('user_id'),
-				'code' => $insert->createParameter('code'),
-				'used' => $insert->createParameter('used'),
-			]);
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('twofactor_backupcodes')
+            ->values([
+                // Inserting with id might fail: 'id' => $insert->createParameter('id'),
+                'user_id' => $insert->createParameter('user_id'),
+                'code' => $insert->createParameter('code'),
+                'used' => $insert->createParameter('used'),
+            ]);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('twofactor_backup_codes')
-			->orderBy('id', 'ASC');
-		$result = $query->execute();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('twofactor_backup_codes')
+            ->orderBy('id', 'ASC');
+        $result = $query->execute();
 
-		$output->startProgress();
-		while ($row = $result->fetch()) {
-			$output->advance();
+        $output->startProgress();
+        while ($row = $result->fetch()) {
+            $output->advance();
 
-			$insert
-				// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
-				->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
-				->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
-				->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-		$output->finishProgress();
-	}
+            $insert
+                // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
+                ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
+                ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
+                ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+        $output->finishProgress();
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('twofactor_backup_codes')) {
-			$schema->dropTable('twofactor_backup_codes');
-			return $schema;
-		}
-		return null;
-	}
+        if ($schema->hasTable('twofactor_backup_codes')) {
+            $schema->dropTable('twofactor_backup_codes');
+            return $schema;
+        }
+        return null;
+    }
 }

apps/files_external/lib/Service/StoragesService.php

Spacing +12 added lines, -12 removed lines

@@ -72,17 +72,17 @@ 
 	}
 
 	protected function getStorageConfigFromDBMount(array $mount) {
-		$applicableUsers = array_filter($mount['applicable'], function ($applicable) {
+		$applicableUsers = array_filter($mount['applicable'], function($applicable) {
 			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER;
 		});
-		$applicableUsers = array_map(function ($applicable) {
+		$applicableUsers = array_map(function($applicable) {
 			return $applicable['value'];
 		}, $applicableUsers);
 
-		$applicableGroups = array_filter($mount['applicable'], function ($applicable) {
+		$applicableGroups = array_filter($mount['applicable'], function($applicable) {
 			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP;
 		});
-		$applicableGroups = array_map(function ($applicable) {
+		$applicableGroups = array_map(function($applicable) {
 			return $applicable['value'];
 		}, $applicableGroups);
 
@@ -98,7 +98,7 @@ 
 				$mount['priority']
 			);
 			$config->setType($mount['type']);
-			$config->setId((int)$mount['mount_id']);
+			$config->setId((int) $mount['mount_id']);
 			return $config;
 		} catch (\UnexpectedValueException $e) {
 			// don't die if a storage backend doesn't exist
@@ -126,11 +126,11 @@ 
 	protected function readConfig() {
 		$mounts = $this->readDBConfig();
 		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
+		$configs = array_filter($configs, function($config) {
 			return $config instanceof StorageConfig;
 		});
 
-		$keys = array_map(function (StorageConfig $config) {
+		$keys = array_map(function(StorageConfig $config) {
 			return $config->getId();
 		}, $configs);
 
@@ -149,14 +149,14 @@ 
 		$mount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($mount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "'.$id.'" not found');
 		}
 
 		$config = $this->getStorageConfigFromDBMount($mount);
 		if ($this->isApplicable($config)) {
 			return $config;
 		} else {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "'.$id.'" not found');
 		}
 	}
 
@@ -379,13 +379,13 @@ 
 		$existingMount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
+			throw new NotFoundException('Storage with ID "'.$id.'" not found while updating storage');
 		}
 
 		$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
 
 		if ($oldStorage->getBackend() instanceof InvalidBackend) {
-			throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend');
+			throw new NotFoundException('Storage with id "'.$id.'" cannot be edited due to missing backend');
 		}
 
 		$removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers());
@@ -462,7 +462,7 @@ 
 		$existingMount = $this->dbConfig->getMountById($id);
 
 		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
+			throw new NotFoundException('Storage with ID "'.$id.'" not found');
 		}
 
 		$this->dbConfig->removeMount($id);

Indentation +465 added lines, -465 removed lines

@@ -51,469 +51,469 @@
  */
 abstract class StoragesService {
 
-	/** @var BackendService */
-	protected $backendService;
-
-	/**
-	 * @var DBConfigService
-	 */
-	protected $dbConfig;
-
-	/**
-	 * @var IUserMountCache
-	 */
-	protected $userMountCache;
-
-	protected IEventDispatcher $eventDispatcher;
-
-	/**
-	 * @param BackendService $backendService
-	 * @param DBConfigService $dbConfigService
-	 * @param IUserMountCache $userMountCache
-	 * @param IEventDispatcher $eventDispatcher
-	 */
-	public function __construct(
-		BackendService $backendService,
-		DBConfigService $dbConfigService,
-		IUserMountCache $userMountCache,
-		IEventDispatcher $eventDispatcher
-	) {
-		$this->backendService = $backendService;
-		$this->dbConfig = $dbConfigService;
-		$this->userMountCache = $userMountCache;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	protected function readDBConfig() {
-		return $this->dbConfig->getAdminMounts();
-	}
-
-	protected function getStorageConfigFromDBMount(array $mount) {
-		$applicableUsers = array_filter($mount['applicable'], function ($applicable) {
-			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER;
-		});
-		$applicableUsers = array_map(function ($applicable) {
-			return $applicable['value'];
-		}, $applicableUsers);
-
-		$applicableGroups = array_filter($mount['applicable'], function ($applicable) {
-			return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP;
-		});
-		$applicableGroups = array_map(function ($applicable) {
-			return $applicable['value'];
-		}, $applicableGroups);
-
-		try {
-			$config = $this->createStorage(
-				$mount['mount_point'],
-				$mount['storage_backend'],
-				$mount['auth_backend'],
-				$mount['config'],
-				$mount['options'],
-				array_values($applicableUsers),
-				array_values($applicableGroups),
-				$mount['priority']
-			);
-			$config->setType($mount['type']);
-			$config->setId((int)$mount['mount_id']);
-			return $config;
-		} catch (\UnexpectedValueException $e) {
-			// don't die if a storage backend doesn't exist
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'Could not load storage.',
-				'level' => ILogger::ERROR,
-				'app' => 'files_external',
-			]);
-			return null;
-		} catch (\InvalidArgumentException $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'Could not load storage.',
-				'level' => ILogger::ERROR,
-				'app' => 'files_external',
-			]);
-			return null;
-		}
-	}
-
-	/**
-	 * Read the external storage config
-	 *
-	 * @return array map of storage id to storage config
-	 */
-	protected function readConfig() {
-		$mounts = $this->readDBConfig();
-		$configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
-		$configs = array_filter($configs, function ($config) {
-			return $config instanceof StorageConfig;
-		});
-
-		$keys = array_map(function (StorageConfig $config) {
-			return $config->getId();
-		}, $configs);
-
-		return array_combine($keys, $configs);
-	}
-
-	/**
-	 * Get a storage with status
-	 *
-	 * @param int $id storage id
-	 *
-	 * @return StorageConfig
-	 * @throws NotFoundException if the storage with the given id was not found
-	 */
-	public function getStorage($id) {
-		$mount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($mount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-
-		$config = $this->getStorageConfigFromDBMount($mount);
-		if ($this->isApplicable($config)) {
-			return $config;
-		} else {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-	}
-
-	/**
-	 * Check whether this storage service should provide access to a storage
-	 *
-	 * @param StorageConfig $config
-	 * @return bool
-	 */
-	abstract protected function isApplicable(StorageConfig $config);
-
-	/**
-	 * Gets all storages, valid or not
-	 *
-	 * @return StorageConfig[] array of storage configs
-	 */
-	public function getAllStorages() {
-		return $this->readConfig();
-	}
-
-	/**
-	 * Gets all valid storages
-	 *
-	 * @return StorageConfig[]
-	 */
-	public function getStorages() {
-		return array_filter($this->getAllStorages(), [$this, 'validateStorage']);
-	}
-
-	/**
-	 * Validate storage
-	 * FIXME: De-duplicate with StoragesController::validate()
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	protected function validateStorage(StorageConfig $storage) {
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		/** @var AuthMechanism */
-		$authMechanism = $storage->getAuthMechanism();
-
-		if (!$backend->isVisibleFor($this->getVisibilityType())) {
-			// not permitted to use backend
-			return false;
-		}
-		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
-			// not permitted to use auth mechanism
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return int BackendService::VISIBILITY_* constants
-	 */
-	abstract public function getVisibilityType();
-
-	/**
-	 * @return integer
-	 */
-	protected function getType() {
-		return DBConfigService::MOUNT_TYPE_ADMIN;
-	}
-
-	/**
-	 * Add new storage to the configuration
-	 *
-	 * @param StorageConfig $newStorage storage attributes
-	 *
-	 * @return StorageConfig storage config, with added id
-	 */
-	public function addStorage(StorageConfig $newStorage) {
-		$allStorages = $this->readConfig();
-
-		$configId = $this->dbConfig->addMount(
-			$newStorage->getMountPoint(),
-			$newStorage->getBackend()->getIdentifier(),
-			$newStorage->getAuthMechanism()->getIdentifier(),
-			$newStorage->getPriority(),
-			$this->getType()
-		);
-
-		$newStorage->setId($configId);
-
-		foreach ($newStorage->getApplicableUsers() as $user) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($newStorage->getApplicableGroups() as $group) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-		foreach ($newStorage->getBackendOptions() as $key => $value) {
-			$this->dbConfig->setConfig($configId, $key, $value);
-		}
-		foreach ($newStorage->getMountOptions() as $key => $value) {
-			$this->dbConfig->setOption($configId, $key, $value);
-		}
-
-		if (count($newStorage->getApplicableUsers()) === 0 && count($newStorage->getApplicableGroups()) === 0) {
-			$this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		}
-
-		// add new storage
-		$allStorages[$configId] = $newStorage;
-
-		$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
-
-		$newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
-		return $newStorage;
-	}
-
-	/**
-	 * Create a storage from its parameters
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backendIdentifier backend identifier
-	 * @param string $authMechanismIdentifier authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array|null $mountOptions mount-specific options
-	 * @param array|null $applicableUsers users for which to mount the storage
-	 * @param array|null $applicableGroups groups for which to mount the storage
-	 * @param int|null $priority priority
-	 *
-	 * @return StorageConfig
-	 */
-	public function createStorage(
-		$mountPoint,
-		$backendIdentifier,
-		$authMechanismIdentifier,
-		$backendOptions,
-		$mountOptions = null,
-		$applicableUsers = null,
-		$applicableGroups = null,
-		$priority = null
-	) {
-		$backend = $this->backendService->getBackend($backendIdentifier);
-		if (!$backend) {
-			$backend = new InvalidBackend($backendIdentifier);
-		}
-		$authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
-		if (!$authMechanism) {
-			$authMechanism = new InvalidAuth($authMechanismIdentifier);
-		}
-		$newStorage = new StorageConfig();
-		$newStorage->setMountPoint($mountPoint);
-		$newStorage->setBackend($backend);
-		$newStorage->setAuthMechanism($authMechanism);
-		$newStorage->setBackendOptions($backendOptions);
-		if (isset($mountOptions)) {
-			$newStorage->setMountOptions($mountOptions);
-		}
-		if (isset($applicableUsers)) {
-			$newStorage->setApplicableUsers($applicableUsers);
-		}
-		if (isset($applicableGroups)) {
-			$newStorage->setApplicableGroups($applicableGroups);
-		}
-		if (isset($priority)) {
-			$newStorage->setPriority($priority);
-		}
-
-		return $newStorage;
-	}
-
-	/**
-	 * Triggers the given hook signal for all the applicables given
-	 *
-	 * @param string $signal signal
-	 * @param string $mountPoint hook mount point param
-	 * @param string $mountType hook mount type param
-	 * @param array $applicableArray array of applicable users/groups for which to trigger the hook
-	 */
-	protected function triggerApplicableHooks($signal, $mountPoint, $mountType, $applicableArray): void {
-		$this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent(null));
-		foreach ($applicableArray as $applicable) {
-			\OCP\Util::emitHook(
-				Filesystem::CLASSNAME,
-				$signal,
-				[
-					Filesystem::signal_param_path => $mountPoint,
-					Filesystem::signal_param_mount_type => $mountType,
-					Filesystem::signal_param_users => $applicable,
-				]
-			);
-		}
-	}
-
-	/**
-	 * Triggers $signal for all applicable users of the given
-	 * storage
-	 *
-	 * @param StorageConfig $storage storage data
-	 * @param string $signal signal to trigger
-	 */
-	abstract protected function triggerHooks(StorageConfig $storage, $signal);
-
-	/**
-	 * Triggers signal_create_mount or signal_delete_mount to
-	 * accommodate for additions/deletions in applicableUsers
-	 * and applicableGroups fields.
-	 *
-	 * @param StorageConfig $oldStorage old storage data
-	 * @param StorageConfig $newStorage new storage data
-	 */
-	abstract protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage);
-
-	/**
-	 * Update storage to the configuration
-	 *
-	 * @param StorageConfig $updatedStorage storage attributes
-	 *
-	 * @return StorageConfig storage config
-	 * @throws NotFoundException if the given storage does not exist in the config
-	 */
-	public function updateStorage(StorageConfig $updatedStorage) {
-		$id = $updatedStorage->getId();
-
-		$existingMount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
-		}
-
-		$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
-
-		if ($oldStorage->getBackend() instanceof InvalidBackend) {
-			throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend');
-		}
-
-		$removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers());
-		$removedGroups = array_diff($oldStorage->getApplicableGroups(), $updatedStorage->getApplicableGroups());
-		$addedUsers = array_diff($updatedStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
-		$addedGroups = array_diff($updatedStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
-
-		$oldUserCount = count($oldStorage->getApplicableUsers());
-		$oldGroupCount = count($oldStorage->getApplicableGroups());
-		$newUserCount = count($updatedStorage->getApplicableUsers());
-		$newGroupCount = count($updatedStorage->getApplicableGroups());
-		$wasGlobal = ($oldUserCount + $oldGroupCount) === 0;
-		$isGlobal = ($newUserCount + $newGroupCount) === 0;
-
-		foreach ($removedUsers as $user) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($removedGroups as $group) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-		foreach ($addedUsers as $user) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
-		}
-		foreach ($addedGroups as $group) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
-		}
-
-		if ($wasGlobal && !$isGlobal) {
-			$this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		} elseif (!$wasGlobal && $isGlobal) {
-			$this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
-		}
-
-		$changedConfig = array_diff_assoc($updatedStorage->getBackendOptions(), $oldStorage->getBackendOptions());
-		$changedOptions = array_diff_assoc($updatedStorage->getMountOptions(), $oldStorage->getMountOptions());
-
-		foreach ($changedConfig as $key => $value) {
-			if ($value !== DefinitionParameter::UNMODIFIED_PLACEHOLDER) {
-				$this->dbConfig->setConfig($id, $key, $value);
-			}
-		}
-		foreach ($changedOptions as $key => $value) {
-			$this->dbConfig->setOption($id, $key, $value);
-		}
-
-		if ($updatedStorage->getMountPoint() !== $oldStorage->getMountPoint()) {
-			$this->dbConfig->setMountPoint($id, $updatedStorage->getMountPoint());
-		}
-
-		if ($updatedStorage->getAuthMechanism()->getIdentifier() !== $oldStorage->getAuthMechanism()->getIdentifier()) {
-			$this->dbConfig->setAuthBackend($id, $updatedStorage->getAuthMechanism()->getIdentifier());
-		}
-
-		$this->triggerChangeHooks($oldStorage, $updatedStorage);
-
-		if (($wasGlobal && !$isGlobal) || count($removedGroups) > 0) { // to expensive to properly handle these on the fly
-			$this->userMountCache->remoteStorageMounts($this->getStorageId($updatedStorage));
-		} else {
-			$storageId = $this->getStorageId($updatedStorage);
-			foreach ($removedUsers as $userId) {
-				$this->userMountCache->removeUserStorageMount($storageId, $userId);
-			}
-		}
-
-		return $this->getStorage($id);
-	}
-
-	/**
-	 * Delete the storage with the given id.
-	 *
-	 * @param int $id storage id
-	 *
-	 * @throws NotFoundException if no storage was found with the given id
-	 */
-	public function removeStorage($id) {
-		$existingMount = $this->dbConfig->getMountById($id);
-
-		if (!is_array($existingMount)) {
-			throw new NotFoundException('Storage with ID "' . $id . '" not found');
-		}
-
-		$this->dbConfig->removeMount($id);
-
-		$deletedStorage = $this->getStorageConfigFromDBMount($existingMount);
-		$this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount);
-
-		// delete oc_storages entries and oc_filecache
-		\OC\Files\Cache\Storage::cleanByMountId($id);
-	}
-
-	/**
-	 * Construct the storage implementation
-	 *
-	 * @param StorageConfig $storageConfig
-	 * @return int
-	 */
-	private function getStorageId(StorageConfig $storageConfig) {
-		try {
-			$class = $storageConfig->getBackend()->getStorageClass();
-			/** @var \OC\Files\Storage\Storage $storage */
-			$storage = new $class($storageConfig->getBackendOptions());
-
-			// auth mechanism should fire first
-			$storage = $storageConfig->getBackend()->wrapStorage($storage);
-			$storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
-
-			/** @var \OC\Files\Storage\Storage $storage */
-			return $storage->getStorageCache()->getNumericId();
-		} catch (\Exception $e) {
-			return -1;
-		}
-	}
+    /** @var BackendService */
+    protected $backendService;
+
+    /**
+     * @var DBConfigService
+     */
+    protected $dbConfig;
+
+    /**
+     * @var IUserMountCache
+     */
+    protected $userMountCache;
+
+    protected IEventDispatcher $eventDispatcher;
+
+    /**
+     * @param BackendService $backendService
+     * @param DBConfigService $dbConfigService
+     * @param IUserMountCache $userMountCache
+     * @param IEventDispatcher $eventDispatcher
+     */
+    public function __construct(
+        BackendService $backendService,
+        DBConfigService $dbConfigService,
+        IUserMountCache $userMountCache,
+        IEventDispatcher $eventDispatcher
+    ) {
+        $this->backendService = $backendService;
+        $this->dbConfig = $dbConfigService;
+        $this->userMountCache = $userMountCache;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    protected function readDBConfig() {
+        return $this->dbConfig->getAdminMounts();
+    }
+
+    protected function getStorageConfigFromDBMount(array $mount) {
+        $applicableUsers = array_filter($mount['applicable'], function ($applicable) {
+            return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_USER;
+        });
+        $applicableUsers = array_map(function ($applicable) {
+            return $applicable['value'];
+        }, $applicableUsers);
+
+        $applicableGroups = array_filter($mount['applicable'], function ($applicable) {
+            return $applicable['type'] === DBConfigService::APPLICABLE_TYPE_GROUP;
+        });
+        $applicableGroups = array_map(function ($applicable) {
+            return $applicable['value'];
+        }, $applicableGroups);
+
+        try {
+            $config = $this->createStorage(
+                $mount['mount_point'],
+                $mount['storage_backend'],
+                $mount['auth_backend'],
+                $mount['config'],
+                $mount['options'],
+                array_values($applicableUsers),
+                array_values($applicableGroups),
+                $mount['priority']
+            );
+            $config->setType($mount['type']);
+            $config->setId((int)$mount['mount_id']);
+            return $config;
+        } catch (\UnexpectedValueException $e) {
+            // don't die if a storage backend doesn't exist
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'Could not load storage.',
+                'level' => ILogger::ERROR,
+                'app' => 'files_external',
+            ]);
+            return null;
+        } catch (\InvalidArgumentException $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'Could not load storage.',
+                'level' => ILogger::ERROR,
+                'app' => 'files_external',
+            ]);
+            return null;
+        }
+    }
+
+    /**
+     * Read the external storage config
+     *
+     * @return array map of storage id to storage config
+     */
+    protected function readConfig() {
+        $mounts = $this->readDBConfig();
+        $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts);
+        $configs = array_filter($configs, function ($config) {
+            return $config instanceof StorageConfig;
+        });
+
+        $keys = array_map(function (StorageConfig $config) {
+            return $config->getId();
+        }, $configs);
+
+        return array_combine($keys, $configs);
+    }
+
+    /**
+     * Get a storage with status
+     *
+     * @param int $id storage id
+     *
+     * @return StorageConfig
+     * @throws NotFoundException if the storage with the given id was not found
+     */
+    public function getStorage($id) {
+        $mount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($mount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+
+        $config = $this->getStorageConfigFromDBMount($mount);
+        if ($this->isApplicable($config)) {
+            return $config;
+        } else {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+    }
+
+    /**
+     * Check whether this storage service should provide access to a storage
+     *
+     * @param StorageConfig $config
+     * @return bool
+     */
+    abstract protected function isApplicable(StorageConfig $config);
+
+    /**
+     * Gets all storages, valid or not
+     *
+     * @return StorageConfig[] array of storage configs
+     */
+    public function getAllStorages() {
+        return $this->readConfig();
+    }
+
+    /**
+     * Gets all valid storages
+     *
+     * @return StorageConfig[]
+     */
+    public function getStorages() {
+        return array_filter($this->getAllStorages(), [$this, 'validateStorage']);
+    }
+
+    /**
+     * Validate storage
+     * FIXME: De-duplicate with StoragesController::validate()
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    protected function validateStorage(StorageConfig $storage) {
+        /** @var Backend */
+        $backend = $storage->getBackend();
+        /** @var AuthMechanism */
+        $authMechanism = $storage->getAuthMechanism();
+
+        if (!$backend->isVisibleFor($this->getVisibilityType())) {
+            // not permitted to use backend
+            return false;
+        }
+        if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
+            // not permitted to use auth mechanism
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the visibility type for this controller, used in validation
+     *
+     * @return int BackendService::VISIBILITY_* constants
+     */
+    abstract public function getVisibilityType();
+
+    /**
+     * @return integer
+     */
+    protected function getType() {
+        return DBConfigService::MOUNT_TYPE_ADMIN;
+    }
+
+    /**
+     * Add new storage to the configuration
+     *
+     * @param StorageConfig $newStorage storage attributes
+     *
+     * @return StorageConfig storage config, with added id
+     */
+    public function addStorage(StorageConfig $newStorage) {
+        $allStorages = $this->readConfig();
+
+        $configId = $this->dbConfig->addMount(
+            $newStorage->getMountPoint(),
+            $newStorage->getBackend()->getIdentifier(),
+            $newStorage->getAuthMechanism()->getIdentifier(),
+            $newStorage->getPriority(),
+            $this->getType()
+        );
+
+        $newStorage->setId($configId);
+
+        foreach ($newStorage->getApplicableUsers() as $user) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($newStorage->getApplicableGroups() as $group) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+        foreach ($newStorage->getBackendOptions() as $key => $value) {
+            $this->dbConfig->setConfig($configId, $key, $value);
+        }
+        foreach ($newStorage->getMountOptions() as $key => $value) {
+            $this->dbConfig->setOption($configId, $key, $value);
+        }
+
+        if (count($newStorage->getApplicableUsers()) === 0 && count($newStorage->getApplicableGroups()) === 0) {
+            $this->dbConfig->addApplicable($configId, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        }
+
+        // add new storage
+        $allStorages[$configId] = $newStorage;
+
+        $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
+
+        $newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
+        return $newStorage;
+    }
+
+    /**
+     * Create a storage from its parameters
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backendIdentifier backend identifier
+     * @param string $authMechanismIdentifier authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array|null $mountOptions mount-specific options
+     * @param array|null $applicableUsers users for which to mount the storage
+     * @param array|null $applicableGroups groups for which to mount the storage
+     * @param int|null $priority priority
+     *
+     * @return StorageConfig
+     */
+    public function createStorage(
+        $mountPoint,
+        $backendIdentifier,
+        $authMechanismIdentifier,
+        $backendOptions,
+        $mountOptions = null,
+        $applicableUsers = null,
+        $applicableGroups = null,
+        $priority = null
+    ) {
+        $backend = $this->backendService->getBackend($backendIdentifier);
+        if (!$backend) {
+            $backend = new InvalidBackend($backendIdentifier);
+        }
+        $authMechanism = $this->backendService->getAuthMechanism($authMechanismIdentifier);
+        if (!$authMechanism) {
+            $authMechanism = new InvalidAuth($authMechanismIdentifier);
+        }
+        $newStorage = new StorageConfig();
+        $newStorage->setMountPoint($mountPoint);
+        $newStorage->setBackend($backend);
+        $newStorage->setAuthMechanism($authMechanism);
+        $newStorage->setBackendOptions($backendOptions);
+        if (isset($mountOptions)) {
+            $newStorage->setMountOptions($mountOptions);
+        }
+        if (isset($applicableUsers)) {
+            $newStorage->setApplicableUsers($applicableUsers);
+        }
+        if (isset($applicableGroups)) {
+            $newStorage->setApplicableGroups($applicableGroups);
+        }
+        if (isset($priority)) {
+            $newStorage->setPriority($priority);
+        }
+
+        return $newStorage;
+    }
+
+    /**
+     * Triggers the given hook signal for all the applicables given
+     *
+     * @param string $signal signal
+     * @param string $mountPoint hook mount point param
+     * @param string $mountType hook mount type param
+     * @param array $applicableArray array of applicable users/groups for which to trigger the hook
+     */
+    protected function triggerApplicableHooks($signal, $mountPoint, $mountType, $applicableArray): void {
+        $this->eventDispatcher->dispatchTyped(new InvalidateMountCacheEvent(null));
+        foreach ($applicableArray as $applicable) {
+            \OCP\Util::emitHook(
+                Filesystem::CLASSNAME,
+                $signal,
+                [
+                    Filesystem::signal_param_path => $mountPoint,
+                    Filesystem::signal_param_mount_type => $mountType,
+                    Filesystem::signal_param_users => $applicable,
+                ]
+            );
+        }
+    }
+
+    /**
+     * Triggers $signal for all applicable users of the given
+     * storage
+     *
+     * @param StorageConfig $storage storage data
+     * @param string $signal signal to trigger
+     */
+    abstract protected function triggerHooks(StorageConfig $storage, $signal);
+
+    /**
+     * Triggers signal_create_mount or signal_delete_mount to
+     * accommodate for additions/deletions in applicableUsers
+     * and applicableGroups fields.
+     *
+     * @param StorageConfig $oldStorage old storage data
+     * @param StorageConfig $newStorage new storage data
+     */
+    abstract protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage);
+
+    /**
+     * Update storage to the configuration
+     *
+     * @param StorageConfig $updatedStorage storage attributes
+     *
+     * @return StorageConfig storage config
+     * @throws NotFoundException if the given storage does not exist in the config
+     */
+    public function updateStorage(StorageConfig $updatedStorage) {
+        $id = $updatedStorage->getId();
+
+        $existingMount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($existingMount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
+        }
+
+        $oldStorage = $this->getStorageConfigFromDBMount($existingMount);
+
+        if ($oldStorage->getBackend() instanceof InvalidBackend) {
+            throw new NotFoundException('Storage with id "' . $id . '" cannot be edited due to missing backend');
+        }
+
+        $removedUsers = array_diff($oldStorage->getApplicableUsers(), $updatedStorage->getApplicableUsers());
+        $removedGroups = array_diff($oldStorage->getApplicableGroups(), $updatedStorage->getApplicableGroups());
+        $addedUsers = array_diff($updatedStorage->getApplicableUsers(), $oldStorage->getApplicableUsers());
+        $addedGroups = array_diff($updatedStorage->getApplicableGroups(), $oldStorage->getApplicableGroups());
+
+        $oldUserCount = count($oldStorage->getApplicableUsers());
+        $oldGroupCount = count($oldStorage->getApplicableGroups());
+        $newUserCount = count($updatedStorage->getApplicableUsers());
+        $newGroupCount = count($updatedStorage->getApplicableGroups());
+        $wasGlobal = ($oldUserCount + $oldGroupCount) === 0;
+        $isGlobal = ($newUserCount + $newGroupCount) === 0;
+
+        foreach ($removedUsers as $user) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($removedGroups as $group) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+        foreach ($addedUsers as $user) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_USER, $user);
+        }
+        foreach ($addedGroups as $group) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GROUP, $group);
+        }
+
+        if ($wasGlobal && !$isGlobal) {
+            $this->dbConfig->removeApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        } elseif (!$wasGlobal && $isGlobal) {
+            $this->dbConfig->addApplicable($id, DBConfigService::APPLICABLE_TYPE_GLOBAL, null);
+        }
+
+        $changedConfig = array_diff_assoc($updatedStorage->getBackendOptions(), $oldStorage->getBackendOptions());
+        $changedOptions = array_diff_assoc($updatedStorage->getMountOptions(), $oldStorage->getMountOptions());
+
+        foreach ($changedConfig as $key => $value) {
+            if ($value !== DefinitionParameter::UNMODIFIED_PLACEHOLDER) {
+                $this->dbConfig->setConfig($id, $key, $value);
+            }
+        }
+        foreach ($changedOptions as $key => $value) {
+            $this->dbConfig->setOption($id, $key, $value);
+        }
+
+        if ($updatedStorage->getMountPoint() !== $oldStorage->getMountPoint()) {
+            $this->dbConfig->setMountPoint($id, $updatedStorage->getMountPoint());
+        }
+
+        if ($updatedStorage->getAuthMechanism()->getIdentifier() !== $oldStorage->getAuthMechanism()->getIdentifier()) {
+            $this->dbConfig->setAuthBackend($id, $updatedStorage->getAuthMechanism()->getIdentifier());
+        }
+
+        $this->triggerChangeHooks($oldStorage, $updatedStorage);
+
+        if (($wasGlobal && !$isGlobal) || count($removedGroups) > 0) { // to expensive to properly handle these on the fly
+            $this->userMountCache->remoteStorageMounts($this->getStorageId($updatedStorage));
+        } else {
+            $storageId = $this->getStorageId($updatedStorage);
+            foreach ($removedUsers as $userId) {
+                $this->userMountCache->removeUserStorageMount($storageId, $userId);
+            }
+        }
+
+        return $this->getStorage($id);
+    }
+
+    /**
+     * Delete the storage with the given id.
+     *
+     * @param int $id storage id
+     *
+     * @throws NotFoundException if no storage was found with the given id
+     */
+    public function removeStorage($id) {
+        $existingMount = $this->dbConfig->getMountById($id);
+
+        if (!is_array($existingMount)) {
+            throw new NotFoundException('Storage with ID "' . $id . '" not found');
+        }
+
+        $this->dbConfig->removeMount($id);
+
+        $deletedStorage = $this->getStorageConfigFromDBMount($existingMount);
+        $this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount);
+
+        // delete oc_storages entries and oc_filecache
+        \OC\Files\Cache\Storage::cleanByMountId($id);
+    }
+
+    /**
+     * Construct the storage implementation
+     *
+     * @param StorageConfig $storageConfig
+     * @return int
+     */
+    private function getStorageId(StorageConfig $storageConfig) {
+        try {
+            $class = $storageConfig->getBackend()->getStorageClass();
+            /** @var \OC\Files\Storage\Storage $storage */
+            $storage = new $class($storageConfig->getBackendOptions());
+
+            // auth mechanism should fire first
+            $storage = $storageConfig->getBackend()->wrapStorage($storage);
+            $storage = $storageConfig->getAuthMechanism()->wrapStorage($storage);
+
+            /** @var \OC\Files\Storage\Storage $storage */
+            return $storage->getStorageCache()->getNumericId();
+        } catch (\Exception $e) {
+            return -1;
+        }
+    }
 }

lib/public/IAppConfig.php

Indentation +34 added lines, -34 removed lines

@@ -31,41 +31,41 @@
  * @since 7.0.0
  */
 interface IAppConfig {
-	/**
-	 * check if a key is set in the appconfig
-	 * @param string $app
-	 * @param string $key
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public function hasKey($app, $key);
+    /**
+     * check if a key is set in the appconfig
+     * @param string $app
+     * @param string $key
+     * @return bool
+     * @since 7.0.0
+     */
+    public function hasKey($app, $key);
 
-	/**
-	 * get multiply values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $key
-	 * @param string|false $app
-	 * @return array|false
-	 * @since 7.0.0
-	 */
-	public function getValues($app, $key);
+    /**
+     * get multiply values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $key
+     * @param string|false $app
+     * @return array|false
+     * @since 7.0.0
+     */
+    public function getValues($app, $key);
 
-	/**
-	 * get all values of the app or and filters out sensitive data
-	 *
-	 * @param string $app
-	 * @return array
-	 * @since 12.0.0
-	 */
-	public function getFilteredValues($app);
+    /**
+     * get all values of the app or and filters out sensitive data
+     *
+     * @param string $app
+     * @return array
+     * @since 12.0.0
+     */
+    public function getFilteredValues($app);
 
-	/**
-	 * Get all apps using the config
-	 * @return array an array of app ids
-	 *
-	 * This function returns a list of all apps that have at least one
-	 * entry in the appconfig table.
-	 * @since 7.0.0
-	 */
-	public function getApps();
+    /**
+     * Get all apps using the config
+     * @return array an array of app ids
+     *
+     * This function returns a list of all apps that have at least one
+     * entry in the appconfig table.
+     * @since 7.0.0
+     */
+    public function getApps();
 }

apps/workflowengine/lib/Controller/RequestTime.php

Indentation +20 added lines, -20 removed lines

@@ -26,27 +26,27 @@
 
 class RequestTime extends Controller {
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @return JSONResponse
-	 */
-	public function getTimezones($search = '') {
-		$timezones = \DateTimeZone::listIdentifiers();
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @return JSONResponse
+     */
+    public function getTimezones($search = '') {
+        $timezones = \DateTimeZone::listIdentifiers();
 
-		if ($search !== '') {
-			$timezones = array_filter($timezones, function ($timezone) use ($search) {
-				return stripos($timezone, $search) !== false;
-			});
-		}
+        if ($search !== '') {
+            $timezones = array_filter($timezones, function ($timezone) use ($search) {
+                return stripos($timezone, $search) !== false;
+            });
+        }
 
-		$timezones = array_slice($timezones, 0, 10);
+        $timezones = array_slice($timezones, 0, 10);
 
-		$response = [];
-		foreach ($timezones as $timezone) {
-			$response[$timezone] = $timezone;
-		}
-		return new JSONResponse($response);
-	}
+        $response = [];
+        foreach ($timezones as $timezone) {
+            $response[$timezone] = $timezone;
+        }
+        return new JSONResponse($response);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		$timezones = \DateTimeZone::listIdentifiers();
 
 		if ($search !== '') {
-			$timezones = array_filter($timezones, function ($timezone) use ($search) {
+			$timezones = array_filter($timezones, function($timezone) use ($search) {
 				return stripos($timezone, $search) !== false;
 			});
 		}

lib/public/AppFramework/Http/Template/SimpleMenuAction.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
 	 * @since 14.0.0
 	 */
 	public function render(): string {
-		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
+		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">('.Util::sanitizeHTML($this->detail).')</span>' : '';
 		return sprintf(
 			'<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
 			Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent

Indentation +77 added lines, -77 removed lines

@@ -31,93 +31,93 @@
  * @since 14.0.0
  */
 class SimpleMenuAction implements IMenuAction {
-	/** @var string */
-	private $id;
+    /** @var string */
+    private $id;
 
-	/** @var string */
-	private $label;
+    /** @var string */
+    private $label;
 
-	/** @var string */
-	private $icon;
+    /** @var string */
+    private $icon;
 
-	/** @var string */
-	private $link;
+    /** @var string */
+    private $link;
 
-	/** @var int */
-	private $priority;
+    /** @var int */
+    private $priority;
 
-	/** @var string */
-	private $detail;
+    /** @var string */
+    private $detail;
 
-	/**
-	 * SimpleMenuAction constructor.
-	 *
-	 * @param string $id
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $link
-	 * @param int $priority
-	 * @param string $detail
-	 * @since 14.0.0
-	 */
-	public function __construct(string $id, string $label, string $icon, string $link = '', int $priority = 100, string $detail = '') {
-		$this->id = $id;
-		$this->label = $label;
-		$this->icon = $icon;
-		$this->link = $link;
-		$this->priority = $priority;
-		$this->detail = $detail;
-	}
+    /**
+     * SimpleMenuAction constructor.
+     *
+     * @param string $id
+     * @param string $label
+     * @param string $icon
+     * @param string $link
+     * @param int $priority
+     * @param string $detail
+     * @since 14.0.0
+     */
+    public function __construct(string $id, string $label, string $icon, string $link = '', int $priority = 100, string $detail = '') {
+        $this->id = $id;
+        $this->label = $label;
+        $this->icon = $icon;
+        $this->link = $link;
+        $this->priority = $priority;
+        $this->detail = $detail;
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getId(): string {
-		return $this->id;
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getId(): string {
+        return $this->id;
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getLabel(): string {
-		return $this->label;
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getLabel(): string {
+        return $this->label;
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getIcon(): string {
-		return $this->icon;
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getIcon(): string {
+        return $this->icon;
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getLink(): string {
-		return $this->link;
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function getLink(): string {
+        return $this->link;
+    }
 
-	/**
-	 * @return int
-	 * @since 14.0.0
-	 */
-	public function getPriority(): int {
-		return $this->priority;
-	}
+    /**
+     * @return int
+     * @since 14.0.0
+     */
+    public function getPriority(): int {
+        return $this->priority;
+    }
 
-	/**
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function render(): string {
-		$detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
-		return sprintf(
-			'<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
-			Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent
-		);
-	}
+    /**
+     * @return string
+     * @since 14.0.0
+     */
+    public function render(): string {
+        $detailContent = ($this->detail !== '') ? '&nbsp;<span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : '';
+        return sprintf(
+            '<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>',
+            Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent
+        );
+    }
 }

apps/comments/lib/Activity/Listener.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@ 
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -121,7 +121,7 @@ 
 		foreach ($users as $user => $path) {
 			// numerical user ids end up as integers from array keys, but string
 			// is required
-			$activity->setAffectedUser((string)$user);
+			$activity->setAffectedUser((string) $user);
 
 			$activity->setSubject('add_comment_subject', [
 				'actor' => $actor,

Indentation +76 added lines, -76 removed lines

@@ -35,88 +35,88 @@
 use OCP\Share\IShareHelper;
 
 class Listener {
-	protected IManager $activityManager;
-	protected IUserSession $session;
-	protected IAppManager $appManager;
-	protected IMountProviderCollection $mountCollection;
-	protected IRootFolder $rootFolder;
-	protected IShareHelper $shareHelper;
+    protected IManager $activityManager;
+    protected IUserSession $session;
+    protected IAppManager $appManager;
+    protected IMountProviderCollection $mountCollection;
+    protected IRootFolder $rootFolder;
+    protected IShareHelper $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 */
-	public function __construct(IManager $activityManager,
-								IUserSession $session,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     */
+    public function __construct(IManager $activityManager,
+                                IUserSession $session,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function commentEvent(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files'
-			|| $event->getEvent() !== CommentsEvent::EVENT_ADD
-			|| !$this->appManager->isInstalled('activity')) {
-			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function commentEvent(CommentsEvent $event) {
+        if ($event->getComment()->getObjectType() !== 'files'
+            || $event->getEvent() !== CommentsEvent::EVENT_ADD
+            || !$this->appManager->isInstalled('activity')) {
+            // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('comments')
-			->setType('comments')
-			->setAuthor($actor)
-			->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
-			->setMessage('add_comment_message', [
-				'commentId' => $event->getComment()->getId(),
-			]);
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('comments')
+            ->setType('comments')
+            ->setAuthor($actor)
+            ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
+            ->setMessage('add_comment_message', [
+                'commentId' => $event->getComment()->getId(),
+            ]);
 
-		foreach ($users as $user => $path) {
-			// numerical user ids end up as integers from array keys, but string
-			// is required
-			$activity->setAffectedUser((string)$user);
+        foreach ($users as $user => $path) {
+            // numerical user ids end up as integers from array keys, but string
+            // is required
+            $activity->setAffectedUser((string)$user);
 
-			$activity->setSubject('add_comment_subject', [
-				'actor' => $actor,
-				'fileId' => (int) $event->getComment()->getObjectId(),
-				'filePath' => trim($path, '/'),
-			]);
-			$this->activityManager->publish($activity);
-		}
-	}
+            $activity->setSubject('add_comment_subject', [
+                'actor' => $actor,
+                'fileId' => (int) $event->getComment()->getObjectId(),
+                'filePath' => trim($path, '/'),
+            ]);
+            $this->activityManager->publish($activity);
+        }
+    }
 }