nextcloud / server

lib/private/Settings/AuthorizedGroupMapper.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
 		$result = $qb->select('class')
 			->from($this->getTableName(), 'auth')
-			->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
+			->where($qb->expr()->in('group_id', array_map(function(IGroup $group) use ($qb) {
 				return $qb->createNamedParameter($group->getGID());
 			}, $groups), IQueryBuilder::PARAM_STR))
 			->executeQuery();

Indentation +80 added lines, -80 removed lines

@@ -36,93 +36,93 @@
  * @template-extends QBMapper<AuthorizedGroup>
  */
 class AuthorizedGroupMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'authorized_groups', AuthorizedGroup::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'authorized_groups', AuthorizedGroup::class);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	public function findAllClassesForUser(IUser $user): array {
-		$qb = $this->db->getQueryBuilder();
+    /**
+     * @throws Exception
+     */
+    public function findAllClassesForUser(IUser $user): array {
+        $qb = $this->db->getQueryBuilder();
 
-		/** @var IGroupManager $groupManager */
-		$groupManager = \OC::$server->get(IGroupManager::class);
-		$groups = $groupManager->getUserGroups($user);
-		if (count($groups) === 0) {
-			return [];
-		}
+        /** @var IGroupManager $groupManager */
+        $groupManager = \OC::$server->get(IGroupManager::class);
+        $groups = $groupManager->getUserGroups($user);
+        if (count($groups) === 0) {
+            return [];
+        }
 
-		$result = $qb->select('class')
-			->from($this->getTableName(), 'auth')
-			->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
-				return $qb->createNamedParameter($group->getGID());
-			}, $groups), IQueryBuilder::PARAM_STR))
-			->executeQuery();
+        $result = $qb->select('class')
+            ->from($this->getTableName(), 'auth')
+            ->where($qb->expr()->in('group_id', array_map(function (IGroup $group) use ($qb) {
+                return $qb->createNamedParameter($group->getGID());
+            }, $groups), IQueryBuilder::PARAM_STR))
+            ->executeQuery();
 
-		$classes = [];
-		while ($row = $result->fetch()) {
-			$classes[] = $row['class'];
-		}
-		$result->closeCursor();
-		return $classes;
-	}
+        $classes = [];
+        while ($row = $result->fetch()) {
+            $classes[] = $row['class'];
+        }
+        $result->closeCursor();
+        return $classes;
+    }
 
-	/**
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException
-	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
-	 * @throws \OCP\DB\Exception
-	 */
-	public function find(int $id): AuthorizedGroup {
-		$queryBuilder = $this->db->getQueryBuilder();
-		$queryBuilder->select('*')
-			->from($this->getTableName())
-			->where($queryBuilder->expr()->eq('id', $queryBuilder->createNamedParameter($id)));
-		/** @var AuthorizedGroup $authorizedGroup */
-		$authorizedGroup = $this->findEntity($queryBuilder);
-		return $authorizedGroup;
-	}
+    /**
+     * @throws \OCP\AppFramework\Db\DoesNotExistException
+     * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
+     * @throws \OCP\DB\Exception
+     */
+    public function find(int $id): AuthorizedGroup {
+        $queryBuilder = $this->db->getQueryBuilder();
+        $queryBuilder->select('*')
+            ->from($this->getTableName())
+            ->where($queryBuilder->expr()->eq('id', $queryBuilder->createNamedParameter($id)));
+        /** @var AuthorizedGroup $authorizedGroup */
+        $authorizedGroup = $this->findEntity($queryBuilder);
+        return $authorizedGroup;
+    }
 
-	/**
-	 * Get all the authorizations stored in the database.
-	 *
-	 * @return AuthorizedGroup[]
-	 * @throws \OCP\DB\Exception
-	 */
-	public function findAll(): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')->from($this->getTableName());
-		return $this->findEntities($qb);
-	}
+    /**
+     * Get all the authorizations stored in the database.
+     *
+     * @return AuthorizedGroup[]
+     * @throws \OCP\DB\Exception
+     */
+    public function findAll(): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')->from($this->getTableName());
+        return $this->findEntities($qb);
+    }
 
-	public function findByGroupIdAndClass(string $groupId, string $class) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('group_id', $qb->createNamedParameter($groupId)))
-			->andWhere($qb->expr()->eq('class', $qb->createNamedParameter($class)));
-		return $this->findEntity($qb);
-	}
+    public function findByGroupIdAndClass(string $groupId, string $class) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('group_id', $qb->createNamedParameter($groupId)))
+            ->andWhere($qb->expr()->eq('class', $qb->createNamedParameter($class)));
+        return $this->findEntity($qb);
+    }
 
-	/**
-	 * @return Entity[]
-	 * @throws \OCP\DB\Exception
-	 */
-	public function findExistingGroupsForClass(string $class): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('class', $qb->createNamedParameter($class)));
-		return $this->findEntities($qb);
-	}
+    /**
+     * @return Entity[]
+     * @throws \OCP\DB\Exception
+     */
+    public function findExistingGroupsForClass(string $class): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('class', $qb->createNamedParameter($class)));
+        return $this->findEntities($qb);
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	public function removeGroup(string $gid) {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where($qb->expr()->eq('group_id', $qb->createNamedParameter($gid)))
-			->executeStatement();
-	}
+    /**
+     * @throws Exception
+     */
+    public function removeGroup(string $gid) {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->getTableName())
+            ->where($qb->expr()->eq('group_id', $qb->createNamedParameter($gid)))
+            ->executeStatement();
+    }
 }

lib/private/Contacts/ContactsMenu/ActionFactory.php

Spacing +1 added lines, -1 removed lines

@@ -44,6 +44,6 @@
 	 * {@inheritDoc}
 	 */
 	public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
-		return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
+		return $this->newLinkAction($icon, $name, 'mailto:'.$email, $appId);
 	}
 }

Indentation +17 added lines, -17 removed lines

@@ -27,22 +27,22 @@
 use OCP\Contacts\ContactsMenu\ILinkAction;
 
 class ActionFactory implements IActionFactory {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function newLinkAction(string $icon, string $name, string $href, string $appId = ''): ILinkAction {
-		$action = new LinkAction();
-		$action->setName($name);
-		$action->setIcon($icon);
-		$action->setHref($href);
-		$action->setAppId($appId);
-		return $action;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function newLinkAction(string $icon, string $name, string $href, string $appId = ''): ILinkAction {
+        $action = new LinkAction();
+        $action->setName($name);
+        $action->setIcon($icon);
+        $action->setHref($href);
+        $action->setAppId($appId);
+        return $action;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
-		return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function newEMailAction(string $icon, string $name, string $email, string $appId = ''): ILinkAction {
+        return $this->newLinkAction($icon, $name, 'mailto:' . $email, $appId);
+    }
 }

lib/private/Preview/Storage/Root.php

Indentation +37 added lines, -37 removed lines

@@ -33,60 +33,60 @@
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class Root extends AppData {
-	private $isMultibucketPreviewDistributionEnabled = false;
-	public function __construct(IRootFolder $rootFolder, SystemConfig $systemConfig) {
-		parent::__construct($rootFolder, $systemConfig, 'preview');
+    private $isMultibucketPreviewDistributionEnabled = false;
+    public function __construct(IRootFolder $rootFolder, SystemConfig $systemConfig) {
+        parent::__construct($rootFolder, $systemConfig, 'preview');
 
-		$this->isMultibucketPreviewDistributionEnabled = $systemConfig->getValue('objectstore.multibucket.preview-distribution', false) === true;
-	}
+        $this->isMultibucketPreviewDistributionEnabled = $systemConfig->getValue('objectstore.multibucket.preview-distribution', false) === true;
+    }
 
 
-	public function getFolder(string $name): ISimpleFolder {
-		$internalFolder = self::getInternalFolder($name);
+    public function getFolder(string $name): ISimpleFolder {
+        $internalFolder = self::getInternalFolder($name);
 
-		try {
-			return parent::getFolder($internalFolder);
-		} catch (NotFoundException $e) {
-			/*
+        try {
+            return parent::getFolder($internalFolder);
+        } catch (NotFoundException $e) {
+            /*
 			 * The new folder structure is not found.
 			 * Lets try the old one
 			 */
-		}
+        }
 
-		try {
-			return parent::getFolder($name);
-		} catch (NotFoundException $e) {
-			/*
+        try {
+            return parent::getFolder($name);
+        } catch (NotFoundException $e) {
+            /*
 			 * The old folder structure is not found.
 			 * Lets try the multibucket fallback if available
 			 */
-			if ($this->isMultibucketPreviewDistributionEnabled) {
-				return parent::getFolder('old-multibucket/' . $internalFolder);
-			}
+            if ($this->isMultibucketPreviewDistributionEnabled) {
+                return parent::getFolder('old-multibucket/' . $internalFolder);
+            }
 
-			// when there is no further fallback just throw the exception
-			throw $e;
-		}
-	}
+            // when there is no further fallback just throw the exception
+            throw $e;
+        }
+    }
 
-	public function newFolder(string $name): ISimpleFolder {
-		$internalFolder = self::getInternalFolder($name);
-		return parent::newFolder($internalFolder);
-	}
+    public function newFolder(string $name): ISimpleFolder {
+        $internalFolder = self::getInternalFolder($name);
+        return parent::newFolder($internalFolder);
+    }
 
-	/*
+    /*
 	 * Do not allow directory listing on this special root
 	 * since it gets to big and time consuming
 	 */
-	public function getDirectoryListing(): array {
-		return [];
-	}
+    public function getDirectoryListing(): array {
+        return [];
+    }
 
-	public static function getInternalFolder(string $name): string {
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
-	}
+    public static function getInternalFolder(string $name): string {
+        return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+    }
 
-	public function getStorageId(): int {
-		return $this->getAppDataRootFolder()->getStorage()->getCache()->getNumericStorageId();
-	}
+    public function getStorageId(): int {
+        return $this->getAppDataRootFolder()->getStorage()->getCache()->getNumericStorageId();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 			 * Lets try the multibucket fallback if available
 			 */
 			if ($this->isMultibucketPreviewDistributionEnabled) {
-				return parent::getFolder('old-multibucket/' . $internalFolder);
+				return parent::getFolder('old-multibucket/'.$internalFolder);
 			}
 
 			// when there is no further fallback just throw the exception
@@ -83,7 +83,7 @@ 
 	}
 
 	public static function getInternalFolder(string $name): string {
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+		return implode('/', str_split(substr(md5($name), 0, 7))).'/'.$name;
 	}
 
 	public function getStorageId(): int {

core/Command/User/Info.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 		$data = [
 			'user_id' => $user->getUID(),
 			'display_name' => $user->getDisplayName(),
-			'email' => (string)$user->getSystemEMailAddress(),
+			'email' => (string) $user->getSystemEMailAddress(),
 			'cloud_id' => $user->getCloudId(),
 			'enabled' => $user->isEnabled(),
 			'groups' => $groups,

Indentation +86 added lines, -86 removed lines

@@ -17,95 +17,95 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Info extends Base {
-	public function __construct(
-		protected IUserManager $userManager,
-		protected IGroupManager $groupManager,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IUserManager $userManager,
+        protected IGroupManager $groupManager,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('user:info')
-			->setDescription('show user info')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to show'
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('user:info')
+            ->setDescription('show user info')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to show'
+            )->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 {
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$groups = $this->groupManager->getUserGroupIds($user);
-		$data = [
-			'user_id' => $user->getUID(),
-			'display_name' => $user->getDisplayName(),
-			'email' => (string)$user->getSystemEMailAddress(),
-			'cloud_id' => $user->getCloudId(),
-			'enabled' => $user->isEnabled(),
-			'groups' => $groups,
-			'quota' => $user->getQuota(),
-			'storage' => $this->getStorageInfo($user),
-			'first_seen' => $this->formatLoginDate($user->getFirstLogin()),
-			'last_seen' => $this->formatLoginDate($user->getLastLogin()),
-			'user_directory' => $user->getHome(),
-			'backend' => $user->getBackendClassName()
-		];
-		$this->writeArrayInOutputFormat($input, $output, $data);
-		return 0;
-	}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $groups = $this->groupManager->getUserGroupIds($user);
+        $data = [
+            'user_id' => $user->getUID(),
+            'display_name' => $user->getDisplayName(),
+            'email' => (string)$user->getSystemEMailAddress(),
+            'cloud_id' => $user->getCloudId(),
+            'enabled' => $user->isEnabled(),
+            'groups' => $groups,
+            'quota' => $user->getQuota(),
+            'storage' => $this->getStorageInfo($user),
+            'first_seen' => $this->formatLoginDate($user->getFirstLogin()),
+            'last_seen' => $this->formatLoginDate($user->getLastLogin()),
+            'user_directory' => $user->getHome(),
+            'backend' => $user->getBackendClassName()
+        ];
+        $this->writeArrayInOutputFormat($input, $output, $data);
+        return 0;
+    }
 
-	private function formatLoginDate(int $timestamp): string {
-		if ($timestamp < 0) {
-			return 'unknown';
-		} elseif ($timestamp === 0) {
-			return 'never';
-		} else {
-			return date(\DateTimeInterface::ATOM, $timestamp); // ISO-8601
-		}
-	}
+    private function formatLoginDate(int $timestamp): string {
+        if ($timestamp < 0) {
+            return 'unknown';
+        } elseif ($timestamp === 0) {
+            return 'never';
+        } else {
+            return date(\DateTimeInterface::ATOM, $timestamp); // ISO-8601
+        }
+    }
 
-	/**
-	 * @param IUser $user
-	 * @return array
-	 */
-	protected function getStorageInfo(IUser $user): array {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user->getUID());
-		try {
-			$storage = \OC_Helper::getStorageInfo('/');
-		} catch (NotFoundException $e) {
-			return [];
-		}
-		return [
-			'free' => $storage['free'],
-			'used' => $storage['used'],
-			'total' => $storage['total'],
-			'relative' => $storage['relative'],
-			'quota' => $storage['quota'],
-		];
-	}
+    /**
+     * @param IUser $user
+     * @return array
+     */
+    protected function getStorageInfo(IUser $user): array {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user->getUID());
+        try {
+            $storage = \OC_Helper::getStorageInfo('/');
+        } catch (NotFoundException $e) {
+            return [];
+        }
+        return [
+            'free' => $storage['free'],
+            'used' => $storage['used'],
+            'total' => $storage['total'],
+            'relative' => $storage['relative'],
+            'quota' => $storage['quota'],
+        ];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'user') {
-			return array_map(static fn (IUser $user) => $user->getUID(), $this->userManager->search($context->getCurrentWord()));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'user') {
+            return array_map(static fn (IUser $user) => $user->getUID(), $this->userManager->search($context->getCurrentWord()));
+        }
+        return [];
+    }
 }

core/Migrations/Version23000Date20210930122352.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 				'notnull' => true,
 			]);
 			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['user_id'], self::TABLE_NAME . '_user_id_idx');
+			$table->addUniqueIndex(['user_id'], self::TABLE_NAME.'_user_id_idx');
 			return $schema;
 		}
 

Indentation +33 added lines, -33 removed lines

@@ -16,37 +16,37 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version23000Date20210930122352 extends SimpleMigrationStep {
-	private const TABLE_NAME = 'profile_config';
-
-	/**
-	 * @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();
-
-		$hasTable = $schema->hasTable(self::TABLE_NAME);
-		if (!$hasTable) {
-			$table = $schema->createTable(self::TABLE_NAME);
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-			$table->addColumn('user_id', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('config', Types::TEXT, [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['user_id'], self::TABLE_NAME . '_user_id_idx');
-			return $schema;
-		}
-
-		return null;
-	}
+    private const TABLE_NAME = 'profile_config';
+
+    /**
+     * @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();
+
+        $hasTable = $schema->hasTable(self::TABLE_NAME);
+        if (!$hasTable) {
+            $table = $schema->createTable(self::TABLE_NAME);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+            $table->addColumn('user_id', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('config', Types::TEXT, [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['user_id'], self::TABLE_NAME . '_user_id_idx');
+            return $schema;
+        }
+
+        return null;
+    }
 }

core/Migrations/Version23000Date20211203110726.php

Indentation +17 added lines, -17 removed lines

@@ -32,23 +32,23 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version23000Date20211203110726 extends SimpleMigrationStep {
-	private const TABLE_NAME = 'profile_config';
+    private const TABLE_NAME = 'profile_config';
 
-	/**
-	 * @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(self::TABLE_NAME);
-		if ($table->hasIndex('user_id')) {
-			$table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
-			return $schema;
-		}
-		return null;
-	}
+        $table = $schema->getTable(self::TABLE_NAME);
+        if ($table->hasIndex('user_id')) {
+            $table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
+            return $schema;
+        }
+        return null;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 		$table = $schema->getTable(self::TABLE_NAME);
 		if ($table->hasIndex('user_id')) {
-			$table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
+			$table->renameIndex('user_id', self::TABLE_NAME.'_user_id_idx');
 			return $schema;
 		}
 		return null;

apps/dav/lib/CalDAV/Auth/PublicPrincipalPlugin.php

Indentation +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@
  * Defines the public facing principal option
  */
 class PublicPrincipalPlugin extends Plugin {
-	public function getCurrentPrincipal(): ?string {
-		return 'principals/system/public';
-	}
+    public function getCurrentPrincipal(): ?string {
+        return 'principals/system/public';
+    }
 }

apps/dav/lib/CalDAV/Auth/CustomPrincipalPlugin.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * Set a custom principal uri to allow public requests to its calendar
  */
 class CustomPrincipalPlugin extends Plugin {
-	public function setCurrentPrincipal(?string $currentPrincipal): void {
-		$this->currentPrincipal = $currentPrincipal;
-	}
+    public function setCurrentPrincipal(?string $currentPrincipal): void {
+        $this->currentPrincipal = $currentPrincipal;
+    }
 }

apps/dav/lib/Upload/AssemblyStream.php

Spacing +4 added lines, -4 removed lines

@@ -73,11 +73,11 @@ 
 		$this->loadContext('assembly');
 
 		$nodes = $this->nodes;
-		usort($nodes, function (IFile $a, IFile $b) {
+		usort($nodes, function(IFile $a, IFile $b) {
 			return strnatcmp($a->getName(), $b->getName());
 		});
 		$this->nodes = array_values($nodes);
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+		$this->size = array_reduce($this->nodes, function($size, IFile $file) {
 			return $size + $file->getSize();
 		}, 0);
 
@@ -156,7 +156,7 @@ 
 				fclose($this->currentStream);
 				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
 				if ($this->currentNodeRead < $currentNodeSize) {
-					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+					throw new \Exception('Stream from assembly node shorter than expected, got '.$this->currentNodeRead.' bytes, expected '.$currentNodeSize);
 				}
 				$this->currentNode++;
 				$this->currentNodeRead = 0;
@@ -253,7 +253,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['nodes']) and is_array($context['nodes'])) {
 			$this->nodes = $context['nodes'];

Indentation +266 added lines, -266 removed lines

@@ -20,270 +20,270 @@
  */
 class AssemblyStream implements \Icewind\Streams\File {
 
-	/** @var resource */
-	private $context;
-
-	/** @var IFile[] */
-	private $nodes;
-
-	/** @var int */
-	private $pos = 0;
-
-	/** @var int */
-	private $size = 0;
-
-	/** @var resource */
-	private $currentStream = null;
-
-	/** @var int */
-	private $currentNode = 0;
-
-	/** @var int */
-	private $currentNodeRead = 0;
-
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @param int $options
-	 * @param string &$opened_path
-	 * @return bool
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$this->loadContext('assembly');
-
-		$nodes = $this->nodes;
-		usort($nodes, function (IFile $a, IFile $b) {
-			return strnatcmp($a->getName(), $b->getName());
-		});
-		$this->nodes = array_values($nodes);
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
-			return $size + $file->getSize();
-		}, 0);
-
-		return true;
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $whence
-	 * @return bool
-	 */
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		if ($whence === SEEK_CUR) {
-			$offset = $this->stream_tell() + $offset;
-		} elseif ($whence === SEEK_END) {
-			$offset = $this->size + $offset;
-		}
-
-		if ($offset === $this->pos) {
-			return true;
-		}
-
-		if ($offset > $this->size) {
-			return false;
-		}
-
-		$nodeIndex = 0;
-		$nodeStart = 0;
-		while (true) {
-			if (!isset($this->nodes[$nodeIndex + 1])) {
-				break;
-			}
-			$node = $this->nodes[$nodeIndex];
-			if ($nodeStart + $node->getSize() > $offset) {
-				break;
-			}
-			$nodeIndex++;
-			$nodeStart += $node->getSize();
-		}
-
-		$stream = $this->getStream($this->nodes[$nodeIndex]);
-		$nodeOffset = $offset - $nodeStart;
-		if ($nodeOffset > 0 && fseek($stream, $nodeOffset) === -1) {
-			return false;
-		}
-		$this->currentNode = $nodeIndex;
-		$this->currentNodeRead = $nodeOffset;
-		$this->currentStream = $stream;
-		$this->pos = $offset;
-
-		return true;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function stream_tell() {
-		return $this->pos;
-	}
-
-	/**
-	 * @param int $count
-	 * @return string
-	 */
-	public function stream_read($count) {
-		if (is_null($this->currentStream)) {
-			if ($this->currentNode < count($this->nodes)) {
-				$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
-			} else {
-				return '';
-			}
-		}
-
-		$collectedData = '';
-		// read data until we either got all the data requested or there is no more stream left
-		while ($count > 0 && !is_null($this->currentStream)) {
-			$data = fread($this->currentStream, $count);
-			$read = strlen($data);
-
-			$count -= $read;
-			$collectedData .= $data;
-			$this->currentNodeRead += $read;
-
-			if (feof($this->currentStream)) {
-				fclose($this->currentStream);
-				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
-				if ($this->currentNodeRead < $currentNodeSize) {
-					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
-				}
-				$this->currentNode++;
-				$this->currentNodeRead = 0;
-				if ($this->currentNode < count($this->nodes)) {
-					$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
-				} else {
-					$this->currentStream = null;
-				}
-			}
-		}
-
-		// update position
-		$this->pos += strlen($collectedData);
-		return $collectedData;
-	}
-
-	/**
-	 * @param string $data
-	 * @return int
-	 */
-	public function stream_write($data) {
-		return false;
-	}
-
-	/**
-	 * @param int $option
-	 * @param int $arg1
-	 * @param int $arg2
-	 * @return bool
-	 */
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	/**
-	 * @param int $size
-	 * @return bool
-	 */
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stream_stat() {
-		return [
-			'size' => $this->size,
-		];
-	}
-
-	/**
-	 * @param int $operation
-	 * @return bool
-	 */
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_flush() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_eof() {
-		return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_close() {
-		return true;
-	}
-
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['nodes']) and is_array($context['nodes'])) {
-			$this->nodes = $context['nodes'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, nodes not set');
-		}
-		return $context;
-	}
-
-	/**
-	 * @param IFile[] $nodes
-	 * @return resource
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public static function wrap(array $nodes) {
-		$context = stream_context_create([
-			'assembly' => [
-				'nodes' => $nodes
-			]
-		]);
-		stream_wrapper_register('assembly', self::class);
-		try {
-			$wrapped = fopen('assembly://', 'r', false, $context);
-		} catch (\BadMethodCallException $e) {
-			stream_wrapper_unregister('assembly');
-			throw $e;
-		}
-		stream_wrapper_unregister('assembly');
-		return $wrapped;
-	}
-
-	/**
-	 * @param IFile $node
-	 * @return resource
-	 */
-	private function getStream(IFile $node) {
-		$data = $node->get();
-		if (is_resource($data)) {
-			return $data;
-		} else {
-			$tmp = fopen('php://temp', 'w+');
-			fwrite($tmp, $data);
-			rewind($tmp);
-			return $tmp;
-		}
-	}
+    /** @var resource */
+    private $context;
+
+    /** @var IFile[] */
+    private $nodes;
+
+    /** @var int */
+    private $pos = 0;
+
+    /** @var int */
+    private $size = 0;
+
+    /** @var resource */
+    private $currentStream = null;
+
+    /** @var int */
+    private $currentNode = 0;
+
+    /** @var int */
+    private $currentNodeRead = 0;
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->loadContext('assembly');
+
+        $nodes = $this->nodes;
+        usort($nodes, function (IFile $a, IFile $b) {
+            return strnatcmp($a->getName(), $b->getName());
+        });
+        $this->nodes = array_values($nodes);
+        $this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+            return $size + $file->getSize();
+        }, 0);
+
+        return true;
+    }
+
+    /**
+     * @param int $offset
+     * @param int $whence
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        if ($whence === SEEK_CUR) {
+            $offset = $this->stream_tell() + $offset;
+        } elseif ($whence === SEEK_END) {
+            $offset = $this->size + $offset;
+        }
+
+        if ($offset === $this->pos) {
+            return true;
+        }
+
+        if ($offset > $this->size) {
+            return false;
+        }
+
+        $nodeIndex = 0;
+        $nodeStart = 0;
+        while (true) {
+            if (!isset($this->nodes[$nodeIndex + 1])) {
+                break;
+            }
+            $node = $this->nodes[$nodeIndex];
+            if ($nodeStart + $node->getSize() > $offset) {
+                break;
+            }
+            $nodeIndex++;
+            $nodeStart += $node->getSize();
+        }
+
+        $stream = $this->getStream($this->nodes[$nodeIndex]);
+        $nodeOffset = $offset - $nodeStart;
+        if ($nodeOffset > 0 && fseek($stream, $nodeOffset) === -1) {
+            return false;
+        }
+        $this->currentNode = $nodeIndex;
+        $this->currentNodeRead = $nodeOffset;
+        $this->currentStream = $stream;
+        $this->pos = $offset;
+
+        return true;
+    }
+
+    /**
+     * @return int
+     */
+    public function stream_tell() {
+        return $this->pos;
+    }
+
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count) {
+        if (is_null($this->currentStream)) {
+            if ($this->currentNode < count($this->nodes)) {
+                $this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+            } else {
+                return '';
+            }
+        }
+
+        $collectedData = '';
+        // read data until we either got all the data requested or there is no more stream left
+        while ($count > 0 && !is_null($this->currentStream)) {
+            $data = fread($this->currentStream, $count);
+            $read = strlen($data);
+
+            $count -= $read;
+            $collectedData .= $data;
+            $this->currentNodeRead += $read;
+
+            if (feof($this->currentStream)) {
+                fclose($this->currentStream);
+                $currentNodeSize = $this->nodes[$this->currentNode]->getSize();
+                if ($this->currentNodeRead < $currentNodeSize) {
+                    throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+                }
+                $this->currentNode++;
+                $this->currentNodeRead = 0;
+                if ($this->currentNode < count($this->nodes)) {
+                    $this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+                } else {
+                    $this->currentStream = null;
+                }
+            }
+        }
+
+        // update position
+        $this->pos += strlen($collectedData);
+        return $collectedData;
+    }
+
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data) {
+        return false;
+    }
+
+    /**
+     * @param int $option
+     * @param int $arg1
+     * @param int $arg2
+     * @return bool
+     */
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    /**
+     * @param int $size
+     * @return bool
+     */
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat() {
+        return [
+            'size' => $this->size,
+        ];
+    }
+
+    /**
+     * @param int $operation
+     * @return bool
+     */
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_flush() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof() {
+        return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_close() {
+        return true;
+    }
+
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @return array
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['nodes']) and is_array($context['nodes'])) {
+            $this->nodes = $context['nodes'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, nodes not set');
+        }
+        return $context;
+    }
+
+    /**
+     * @param IFile[] $nodes
+     * @return resource
+     *
+     * @throws \BadMethodCallException
+     */
+    public static function wrap(array $nodes) {
+        $context = stream_context_create([
+            'assembly' => [
+                'nodes' => $nodes
+            ]
+        ]);
+        stream_wrapper_register('assembly', self::class);
+        try {
+            $wrapped = fopen('assembly://', 'r', false, $context);
+        } catch (\BadMethodCallException $e) {
+            stream_wrapper_unregister('assembly');
+            throw $e;
+        }
+        stream_wrapper_unregister('assembly');
+        return $wrapped;
+    }
+
+    /**
+     * @param IFile $node
+     * @return resource
+     */
+    private function getStream(IFile $node) {
+        $data = $node->get();
+        if (is_resource($data)) {
+            return $data;
+        } else {
+            $tmp = fopen('php://temp', 'w+');
+            fwrite($tmp, $data);
+            rewind($tmp);
+            return $tmp;
+        }
+    }
 }