nextcloud / server

lib/public/DB/QueryBuilder/ICompositeExpression.php

Indentation +32 added lines, -32 removed lines

@@ -29,39 +29,39 @@
  * @since 8.2.0
  */
 interface ICompositeExpression {
-	/**
-	 * Adds multiple parts to composite expression.
-	 *
-	 * @param array $parts
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function addMultiple(array $parts = []): ICompositeExpression;
+    /**
+     * Adds multiple parts to composite expression.
+     *
+     * @param array $parts
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function addMultiple(array $parts = []): ICompositeExpression;
 
-	/**
-	 * Adds an expression to composite expression.
-	 *
-	 * @param mixed $part
-	 *
-	 * @return ICompositeExpression
-	 * @since 8.2.0
-	 */
-	public function add($part): ICompositeExpression;
+    /**
+     * Adds an expression to composite expression.
+     *
+     * @param mixed $part
+     *
+     * @return ICompositeExpression
+     * @since 8.2.0
+     */
+    public function add($part): ICompositeExpression;
 
-	/**
-	 * Retrieves the amount of expressions on composite expression.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function count(): int;
+    /**
+     * Retrieves the amount of expressions on composite expression.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function count(): int;
 
-	/**
-	 * Returns the type of this composite expression (AND/OR).
-	 *
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType(): string;
+    /**
+     * Returns the type of this composite expression (AND/OR).
+     *
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType(): string;
 }

core/Command/Group/Info.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		$gid = $input->getArgument('groupid');
 		$group = $this->groupManager->get($gid);
 		if (!$group instanceof IGroup) {
-			$output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
+			$output->writeln('<error>Group "'.$gid.'" does not exist.</error>');
 			return 1;
 		} else {
 			$groupOutput = [

Indentation +48 added lines, -48 removed lines

@@ -35,56 +35,56 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	public function __construct(
-		protected IGroupManager $groupManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IGroupManager $groupManager,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:info')
-			->setDescription('Show information about a group')
-			->addArgument(
-				'groupid',
-				InputArgument::REQUIRED,
-				'Group id'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:info')
+            ->setDescription('Show information about a group')
+            ->addArgument(
+                'groupid',
+                InputArgument::REQUIRED,
+                'Group id'
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$gid = $input->getArgument('groupid');
-		$group = $this->groupManager->get($gid);
-		if (!$group instanceof IGroup) {
-			$output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
-			return 1;
-		} else {
-			$groupOutput = [
-				'groupID' => $gid,
-				'displayName' => $group->getDisplayName(),
-				'backends' => $group->getBackendNames(),
-			];
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $gid = $input->getArgument('groupid');
+        $group = $this->groupManager->get($gid);
+        if (!$group instanceof IGroup) {
+            $output->writeln('<error>Group "' . $gid . '" does not exist.</error>');
+            return 1;
+        } else {
+            $groupOutput = [
+                'groupID' => $gid,
+                'displayName' => $group->getDisplayName(),
+                'backends' => $group->getBackendNames(),
+            ];
 
-			$this->writeArrayInOutputFormat($input, $output, $groupOutput);
-			return 0;
-		}
-	}
+            $this->writeArrayInOutputFormat($input, $output, $groupOutput);
+            return 0;
+        }
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'groupid') {
-			return array_map(static fn (IGroup $group) => $group->getGID(), $this->groupManager->search($context->getCurrentWord()));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'groupid') {
+            return array_map(static fn (IGroup $group) => $group->getGID(), $this->groupManager->search($context->getCurrentWord()));
+        }
+        return [];
+    }
 }

lib/private/Contacts/ContactsMenu/Entry.php

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	 * sort the actions by priority and name
 	 */
 	private function sortActions(): void {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
+		usort($this->actions, function(IAction $action1, IAction $action2) {
 			$prio1 = $action1->getPriority();
 			$prio2 = $action2->getPriority();
 
@@ -154,7 +154,7 @@ 
 	 */
 	public function jsonSerialize(): array {
 		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
+		$otherActions = array_map(function(IAction $action) {
 			return $action->jsonSerialize();
 		}, array_slice($this->actions, 1));
 

Indentation +166 added lines, -166 removed lines

@@ -14,170 +14,170 @@
 use function array_merge;
 
 class Entry implements IEntry {
-	public const PROPERTY_STATUS_MESSAGE_TIMESTAMP = 'statusMessageTimestamp';
-
-	/** @var string|int|null */
-	private $id = null;
-
-	private string $fullName = '';
-
-	/** @var string[] */
-	private array $emailAddresses = [];
-
-	private ?string $avatar = null;
-
-	private ?string $profileTitle = null;
-
-	private ?string $profileUrl = null;
-
-	/** @var IAction[] */
-	private array $actions = [];
-
-	private array $properties = [];
-
-	private ?string $status = null;
-	private ?string $statusMessage = null;
-	private ?int $statusMessageTimestamp = null;
-	private ?string $statusIcon = null;
-
-	public function setId(string $id): void {
-		$this->id = $id;
-	}
-
-	public function setFullName(string $displayName): void {
-		$this->fullName = $displayName;
-	}
-
-	public function getFullName(): string {
-		return $this->fullName;
-	}
-
-	public function addEMailAddress(string $address): void {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getEMailAddresses(): array {
-		return $this->emailAddresses;
-	}
-
-	public function setAvatar(string $avatar): void {
-		$this->avatar = $avatar;
-	}
-
-	public function getAvatar(): ?string {
-		return $this->avatar;
-	}
-
-	public function setProfileTitle(string $profileTitle): void {
-		$this->profileTitle = $profileTitle;
-	}
-
-	public function getProfileTitle(): ?string {
-		return $this->profileTitle;
-	}
-
-	public function setProfileUrl(string $profileUrl): void {
-		$this->profileUrl = $profileUrl;
-	}
-
-	public function getProfileUrl(): ?string {
-		return $this->profileUrl;
-	}
-
-	public function addAction(IAction $action): void {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	public function setStatus(string $status,
-		?string $statusMessage = null,
-		?int $statusMessageTimestamp = null,
-		?string $icon = null): void {
-		$this->status = $status;
-		$this->statusMessage = $statusMessage;
-		$this->statusMessageTimestamp = $statusMessageTimestamp;
-		$this->statusIcon = $icon;
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions(): array {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions(): void {
-		usort($this->actions, function (IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	public function setProperty(string $propertyName, mixed $value) {
-		$this->properties[$propertyName] = $value;
-	}
-
-	/**
-	 * @param array $properties key-value array containing additional properties
-	 */
-	public function setProperties(array $properties): void {
-		$this->properties = array_merge($this->properties, $properties);
-	}
-
-	public function getProperty(string $key): mixed {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array{id: int|string|null, fullName: string, avatar: string|null, topAction: mixed, actions: array, lastMessage: '', emailAddresses: string[], profileTitle: string|null, profileUrl: string|null, status: string|null, statusMessage: null|string, statusMessageTimestamp: null|int, statusIcon: null|string, isUser: bool, uid: mixed}
-	 */
-	public function jsonSerialize(): array {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function (IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-			'emailAddresses' => $this->getEMailAddresses(),
-			'profileTitle' => $this->profileTitle,
-			'profileUrl' => $this->profileUrl,
-			'status' => $this->status,
-			'statusMessage' => $this->statusMessage,
-			'statusMessageTimestamp' => $this->statusMessageTimestamp,
-			'statusIcon' => $this->statusIcon,
-			'isUser' => $this->getProperty('isUser') === true,
-			'uid' => $this->getProperty('UID'),
-		];
-	}
-
-	public function getStatusMessage(): ?string {
-		return $this->statusMessage;
-	}
-
-	public function getStatusMessageTimestamp(): ?int {
-		return $this->statusMessageTimestamp;
-	}
+    public const PROPERTY_STATUS_MESSAGE_TIMESTAMP = 'statusMessageTimestamp';
+
+    /** @var string|int|null */
+    private $id = null;
+
+    private string $fullName = '';
+
+    /** @var string[] */
+    private array $emailAddresses = [];
+
+    private ?string $avatar = null;
+
+    private ?string $profileTitle = null;
+
+    private ?string $profileUrl = null;
+
+    /** @var IAction[] */
+    private array $actions = [];
+
+    private array $properties = [];
+
+    private ?string $status = null;
+    private ?string $statusMessage = null;
+    private ?int $statusMessageTimestamp = null;
+    private ?string $statusIcon = null;
+
+    public function setId(string $id): void {
+        $this->id = $id;
+    }
+
+    public function setFullName(string $displayName): void {
+        $this->fullName = $displayName;
+    }
+
+    public function getFullName(): string {
+        return $this->fullName;
+    }
+
+    public function addEMailAddress(string $address): void {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getEMailAddresses(): array {
+        return $this->emailAddresses;
+    }
+
+    public function setAvatar(string $avatar): void {
+        $this->avatar = $avatar;
+    }
+
+    public function getAvatar(): ?string {
+        return $this->avatar;
+    }
+
+    public function setProfileTitle(string $profileTitle): void {
+        $this->profileTitle = $profileTitle;
+    }
+
+    public function getProfileTitle(): ?string {
+        return $this->profileTitle;
+    }
+
+    public function setProfileUrl(string $profileUrl): void {
+        $this->profileUrl = $profileUrl;
+    }
+
+    public function getProfileUrl(): ?string {
+        return $this->profileUrl;
+    }
+
+    public function addAction(IAction $action): void {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    public function setStatus(string $status,
+        ?string $statusMessage = null,
+        ?int $statusMessageTimestamp = null,
+        ?string $icon = null): void {
+        $this->status = $status;
+        $this->statusMessage = $statusMessage;
+        $this->statusMessageTimestamp = $statusMessageTimestamp;
+        $this->statusIcon = $icon;
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions(): array {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions(): void {
+        usort($this->actions, function (IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    public function setProperty(string $propertyName, mixed $value) {
+        $this->properties[$propertyName] = $value;
+    }
+
+    /**
+     * @param array $properties key-value array containing additional properties
+     */
+    public function setProperties(array $properties): void {
+        $this->properties = array_merge($this->properties, $properties);
+    }
+
+    public function getProperty(string $key): mixed {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array{id: int|string|null, fullName: string, avatar: string|null, topAction: mixed, actions: array, lastMessage: '', emailAddresses: string[], profileTitle: string|null, profileUrl: string|null, status: string|null, statusMessage: null|string, statusMessageTimestamp: null|int, statusIcon: null|string, isUser: bool, uid: mixed}
+     */
+    public function jsonSerialize(): array {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function (IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+            'emailAddresses' => $this->getEMailAddresses(),
+            'profileTitle' => $this->profileTitle,
+            'profileUrl' => $this->profileUrl,
+            'status' => $this->status,
+            'statusMessage' => $this->statusMessage,
+            'statusMessageTimestamp' => $this->statusMessageTimestamp,
+            'statusIcon' => $this->statusIcon,
+            'isUser' => $this->getProperty('isUser') === true,
+            'uid' => $this->getProperty('UID'),
+        ];
+    }
+
+    public function getStatusMessage(): ?string {
+        return $this->statusMessage;
+    }
+
+    public function getStatusMessageTimestamp(): ?int {
+        return $this->statusMessageTimestamp;
+    }
 }

apps/admin_audit/lib/Actions/Trashbin.php

Indentation +10 added lines, -10 removed lines

@@ -29,15 +29,15 @@
 namespace OCA\AdminAudit\Actions;
 
 class Trashbin extends Action {
-	public function delete(array $params): void {
-		$this->log('File "%s" deleted from trash bin.',
-			['path' => $params['path']], ['path']
-		);
-	}
+    public function delete(array $params): void {
+        $this->log('File "%s" deleted from trash bin.',
+            ['path' => $params['path']], ['path']
+        );
+    }
 
-	public function restore(array $params): void {
-		$this->log('File "%s" restored from trash bin.',
-			['path' => $params['filePath']], ['path']
-		);
-	}
+    public function restore(array $params): void {
+        $this->log('File "%s" restored from trash bin.',
+            ['path' => $params['filePath']], ['path']
+        );
+    }
 }

lib/public/Share/Exceptions/AlreadySharedException.php

Indentation +15 added lines, -15 removed lines

@@ -29,22 +29,22 @@
  * @since 22.0.0
  */
 class AlreadySharedException extends GenericShareException {
-	/** @var IShare */
-	private $existingShare;
+    /** @var IShare */
+    private $existingShare;
 
-	/**
-	 * @since 22.0.0
-	 */
-	public function __construct(string $message, IShare $existingShare) {
-		parent::__construct($message);
+    /**
+     * @since 22.0.0
+     */
+    public function __construct(string $message, IShare $existingShare) {
+        parent::__construct($message);
 
-		$this->existingShare = $existingShare;
-	}
+        $this->existingShare = $existingShare;
+    }
 
-	/**
-	 * @since 22.0.0
-	 */
-	public function getExistingShare(): IShare {
-		return $this->existingShare;
-	}
+    /**
+     * @since 22.0.0
+     */
+    public function getExistingShare(): IShare {
+        return $this->existingShare;
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+		$context->registerService(NewUserMailHelper::class, function(ContainerInterface $c) {
 			return new NewUserMailHelper(
 				$c->get(Defaults::class),
 				$c->get(IURLGenerator::class),
@@ -73,7 +73,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+		$context->registerService(ProvisioningApiMiddleware::class, function(ContainerInterface $c) {
 			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
 			$isAdmin = false;
 			$isSubAdmin = false;

Indentation +39 added lines, -39 removed lines

@@ -54,48 +54,48 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
-			return new NewUserMailHelper(
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IFactory::class),
-				$c->get(IMailer::class),
-				$c->get(ISecureRandom::class),
-				$c->get(ITimeFactory::class),
-				$c->get(IConfig::class),
-				$c->get(ICrypto::class),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
-			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
-			$isAdmin = false;
-			$isSubAdmin = false;
+        $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+            return new NewUserMailHelper(
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IFactory::class),
+                $c->get(IMailer::class),
+                $c->get(ISecureRandom::class),
+                $c->get(ITimeFactory::class),
+                $c->get(IConfig::class),
+                $c->get(ICrypto::class),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+            $user = $c->get(IUserManager::class)->get($c->get('UserId'));
+            $isAdmin = false;
+            $isSubAdmin = false;
 
-			if ($user instanceof IUser) {
-				$groupManager = $c->get(IGroupManager::class);
-				assert($groupManager instanceof GroupManager);
-				$isAdmin = $groupManager->isAdmin($user->getUID());
-				$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
-			}
+            if ($user instanceof IUser) {
+                $groupManager = $c->get(IGroupManager::class);
+                assert($groupManager instanceof GroupManager);
+                $isAdmin = $groupManager->isAdmin($user->getUID());
+                $isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
+            }
 
-			return new ProvisioningApiMiddleware(
-				$c->get(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$context->registerMiddleware(ProvisioningApiMiddleware::class);
-		$context->registerCapability(Capabilities::class);
-	}
+            return new ProvisioningApiMiddleware(
+                $c->get(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $context->registerMiddleware(ProvisioningApiMiddleware::class);
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

lib/private/Files/Cache/MoveFromCacheTrait.php

Indentation +23 added lines, -23 removed lines

@@ -30,31 +30,31 @@
  * Fallback implementation for moveFromCache
  */
 trait MoveFromCacheTrait {
-	/**
-	 * store meta data for a file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	abstract public function put($file, array $data);
+    /**
+     * store meta data for a file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    abstract public function put($file, array $data);
 
-	abstract public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int;
+    abstract public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int;
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		$sourceEntry = $sourceCache->get($sourcePath);
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        $sourceEntry = $sourceCache->get($sourcePath);
 
-		$this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
+        $this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
 
-		$sourceCache->remove($sourcePath);
-	}
+        $sourceCache->remove($sourcePath);
+    }
 }

core/Migrations/Version21000Date20210309185127.php

Indentation +16 added lines, -16 removed lines

@@ -31,22 +31,22 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20210309185127 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable('known_users');
-		if (!$table->hasIndex('ku_known_user')) {
-			$table->addIndex(['known_user'], 'ku_known_user');
-			return $schema;
-		}
+        $table = $schema->getTable('known_users');
+        if (!$table->hasIndex('ku_known_user')) {
+            $table->addIndex(['known_user'], 'ku_known_user');
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

lib/private/Encryption/Update.php

Spacing +7 added lines, -7 removed lines

@@ -90,7 +90,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -106,7 +106,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -120,7 +120,7 @@ 
 	 */
 	public function postRestore($params) {
 		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+			$path = Filesystem::normalizePath('/'.$this->uid.'/files/'.$params['filePath']);
 			$this->update($path);
 		}
 	}
@@ -139,7 +139,7 @@ 
 			dirname($source) !== dirname($target)
 		) {
 			[$owner, $ownerPath] = $this->getOwnerPath($target);
-			$absPath = '/' . $owner . '/files/' . $ownerPath;
+			$absPath = '/'.$owner.'/files/'.$ownerPath;
 			$this->update($absPath);
 		}
 	}
@@ -154,10 +154,10 @@ 
 	protected function getOwnerPath($path) {
 		$info = Filesystem::getFileInfo($path);
 		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
+		$view = new View('/'.$owner.'/files');
 		$path = $view->getPath($info->getId());
 		if ($path === null) {
-			throw new InvalidArgumentException('No file found for ' . $info->getId());
+			throw new InvalidArgumentException('No file found for '.$info->getId());
 		}
 
 		return [$owner, $path];
@@ -193,7 +193,7 @@ 
 				$encryptionModule->update($file, $this->uid, $usersSharing);
 			} catch (GenericEncryptionException $e) {
 				// If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
-				$this->logger->error('Failed to update encryption module for ' . $this->uid . ' ' . $file, [ 'exception' => $e ]);
+				$this->logger->error('Failed to update encryption module for '.$this->uid.' '.$file, ['exception' => $e]);
 			}
 		}
 	}

Indentation +159 added lines, -159 removed lines

@@ -18,163 +18,163 @@
  * update encrypted files, e.g. because a file was shared
  */
 class Update {
-	/** @var View */
-	protected $view;
-
-	/** @var Util */
-	protected $util;
-
-	/** @var \OC\Files\Mount\Manager */
-	protected $mountManager;
-
-	/** @var Manager */
-	protected $encryptionManager;
-
-	/** @var string */
-	protected $uid;
-
-	/** @var File */
-	protected $file;
-
-	/** @var LoggerInterface */
-	protected $logger;
-
-	/**
-	 * @param string $uid
-	 */
-	public function __construct(
-		View $view,
-		Util $util,
-		Mount\Manager $mountManager,
-		Manager $encryptionManager,
-		File $file,
-		LoggerInterface $logger,
-		$uid,
-	) {
-		$this->view = $view;
-		$this->util = $util;
-		$this->mountManager = $mountManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->file = $file;
-		$this->logger = $logger;
-		$this->uid = $uid;
-	}
-
-	/**
-	 * hook after file was shared
-	 *
-	 * @param array $params
-	 */
-	public function postShared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * hook after file was unshared
-	 *
-	 * @param array $params
-	 */
-	public function postUnshared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was restored from the trash bin,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRestore($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
-			$this->update($path);
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was renamed,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRename($params) {
-		$source = $params['oldpath'];
-		$target = $params['newpath'];
-		if (
-			$this->encryptionManager->isEnabled() &&
-			dirname($source) !== dirname($target)
-		) {
-			[$owner, $ownerPath] = $this->getOwnerPath($target);
-			$absPath = '/' . $owner . '/files/' . $ownerPath;
-			$this->update($absPath);
-		}
-	}
-
-	/**
-	 * get owner and path relative to data/<owner>/files
-	 *
-	 * @param string $path path to file for current user
-	 * @return array ['owner' => $owner, 'path' => $path]
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getOwnerPath($path) {
-		$info = Filesystem::getFileInfo($path);
-		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
-		$path = $view->getPath($info->getId());
-		if ($path === null) {
-			throw new InvalidArgumentException('No file found for ' . $info->getId());
-		}
-
-		return [$owner, $path];
-	}
-
-	/**
-	 * notify encryption module about added/removed users from a file/folder
-	 *
-	 * @param string $path relative to data/
-	 * @throws Exceptions\ModuleDoesNotExistsException
-	 */
-	public function update($path) {
-		$encryptionModule = $this->encryptionManager->getEncryptionModule();
-
-		// if the encryption module doesn't encrypt the files on a per-user basis
-		// we have nothing to do here.
-		if ($encryptionModule->needDetailedAccessList() === false) {
-			return;
-		}
-
-		// if a folder was shared, get a list of all (sub-)folders
-		if ($this->view->is_dir($path)) {
-			$allFiles = $this->util->getAllFiles($path);
-		} else {
-			$allFiles = [$path];
-		}
-
-
-
-		foreach ($allFiles as $file) {
-			$usersSharing = $this->file->getAccessList($file);
-			try {
-				$encryptionModule->update($file, $this->uid, $usersSharing);
-			} catch (GenericEncryptionException $e) {
-				// If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
-				$this->logger->error('Failed to update encryption module for ' . $this->uid . ' ' . $file, [ 'exception' => $e ]);
-			}
-		}
-	}
+    /** @var View */
+    protected $view;
+
+    /** @var Util */
+    protected $util;
+
+    /** @var \OC\Files\Mount\Manager */
+    protected $mountManager;
+
+    /** @var Manager */
+    protected $encryptionManager;
+
+    /** @var string */
+    protected $uid;
+
+    /** @var File */
+    protected $file;
+
+    /** @var LoggerInterface */
+    protected $logger;
+
+    /**
+     * @param string $uid
+     */
+    public function __construct(
+        View $view,
+        Util $util,
+        Mount\Manager $mountManager,
+        Manager $encryptionManager,
+        File $file,
+        LoggerInterface $logger,
+        $uid,
+    ) {
+        $this->view = $view;
+        $this->util = $util;
+        $this->mountManager = $mountManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->file = $file;
+        $this->logger = $logger;
+        $this->uid = $uid;
+    }
+
+    /**
+     * hook after file was shared
+     *
+     * @param array $params
+     */
+    public function postShared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                [$owner, $ownerPath] = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * hook after file was unshared
+     *
+     * @param array $params
+     */
+    public function postUnshared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                [$owner, $ownerPath] = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * inform encryption module that a file was restored from the trash bin,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRestore($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+            $this->update($path);
+        }
+    }
+
+    /**
+     * inform encryption module that a file was renamed,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRename($params) {
+        $source = $params['oldpath'];
+        $target = $params['newpath'];
+        if (
+            $this->encryptionManager->isEnabled() &&
+            dirname($source) !== dirname($target)
+        ) {
+            [$owner, $ownerPath] = $this->getOwnerPath($target);
+            $absPath = '/' . $owner . '/files/' . $ownerPath;
+            $this->update($absPath);
+        }
+    }
+
+    /**
+     * get owner and path relative to data/<owner>/files
+     *
+     * @param string $path path to file for current user
+     * @return array ['owner' => $owner, 'path' => $path]
+     * @throws \InvalidArgumentException
+     */
+    protected function getOwnerPath($path) {
+        $info = Filesystem::getFileInfo($path);
+        $owner = Filesystem::getOwner($path);
+        $view = new View('/' . $owner . '/files');
+        $path = $view->getPath($info->getId());
+        if ($path === null) {
+            throw new InvalidArgumentException('No file found for ' . $info->getId());
+        }
+
+        return [$owner, $path];
+    }
+
+    /**
+     * notify encryption module about added/removed users from a file/folder
+     *
+     * @param string $path relative to data/
+     * @throws Exceptions\ModuleDoesNotExistsException
+     */
+    public function update($path) {
+        $encryptionModule = $this->encryptionManager->getEncryptionModule();
+
+        // if the encryption module doesn't encrypt the files on a per-user basis
+        // we have nothing to do here.
+        if ($encryptionModule->needDetailedAccessList() === false) {
+            return;
+        }
+
+        // if a folder was shared, get a list of all (sub-)folders
+        if ($this->view->is_dir($path)) {
+            $allFiles = $this->util->getAllFiles($path);
+        } else {
+            $allFiles = [$path];
+        }
+
+
+
+        foreach ($allFiles as $file) {
+            $usersSharing = $this->file->getAccessList($file);
+            try {
+                $encryptionModule->update($file, $this->uid, $usersSharing);
+            } catch (GenericEncryptionException $e) {
+                // If the update of an individual file fails e.g. due to a corrupt key we should continue the operation and just log the failure
+                $this->logger->error('Failed to update encryption module for ' . $this->uid . ' ' . $file, [ 'exception' => $e ]);
+            }
+        }
+    }
 }