nextcloud / server

core/Db/ProfileConfigMapper.php

Indentation +13 added lines, -13 removed lines

@@ -33,19 +33,19 @@
  * @template-extends QBMapper<ProfileConfig>
  */
 class ProfileConfigMapper extends QBMapper {
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'profile_config', ProfileConfig::class);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'profile_config', ProfileConfig::class);
+    }
 
-	public function get(string $userId): ProfileConfig {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
-		return $this->findEntity($qb);
-	}
+    public function get(string $userId): ProfileConfig {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
+        return $this->findEntity($qb);
+    }
 
-	public function getArray(string $userId): array {
-		return $this->get($userId)->getConfigArray();
-	}
+    public function getArray(string $userId): array {
+        return $this->get($userId)->getConfigArray();
+    }
 }

lib/private/Settings/AuthorizedGroupMapper.php

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/Tagging/TagMapper.php

Indentation +43 added lines, -43 removed lines

@@ -36,49 +36,49 @@
  * @template-extends QBMapper<Tag>
  */
 class TagMapper extends QBMapper {
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $db Instance of the Db abstraction layer.
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'vcategory', Tag::class);
-	}
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $db Instance of the Db abstraction layer.
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'vcategory', Tag::class);
+    }
 
-	/**
-	 * Load tags from the database.
-	 *
-	 * @param array $owners The user(s) whose tags we are going to load.
-	 * @param string $type The type of item for which we are loading tags.
-	 * @return array An array of Tag objects.
-	 */
-	public function loadTags(array $owners, string $type): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select(['id', 'uid', 'type', 'category'])
-			->from($this->getTableName())
-			->where($qb->expr()->in('uid', $qb->createNamedParameter($owners, IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
-			->orderBy('category');
-		return $this->findEntities($qb);
-	}
+    /**
+     * Load tags from the database.
+     *
+     * @param array $owners The user(s) whose tags we are going to load.
+     * @param string $type The type of item for which we are loading tags.
+     * @return array An array of Tag objects.
+     */
+    public function loadTags(array $owners, string $type): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select(['id', 'uid', 'type', 'category'])
+            ->from($this->getTableName())
+            ->where($qb->expr()->in('uid', $qb->createNamedParameter($owners, IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
+            ->orderBy('category');
+        return $this->findEntities($qb);
+    }
 
-	/**
-	 * Check if a given Tag object already exists in the database.
-	 *
-	 * @param Tag $tag The tag to look for in the database.
-	 */
-	public function tagExists(Tag $tag): bool {
-		$qb = $this->db->getQueryBuilder();
-		$qb->select(['id', 'uid', 'type', 'category'])
-			->from($this->getTableName())
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($tag->getOwner(), IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($tag->getType(), IQueryBuilder::PARAM_STR)))
-			->andWhere($qb->expr()->eq('category', $qb->createNamedParameter($tag->getName(), IQueryBuilder::PARAM_STR)));
-		try {
-			$this->findEntity($qb);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-		return true;
-	}
+    /**
+     * Check if a given Tag object already exists in the database.
+     *
+     * @param Tag $tag The tag to look for in the database.
+     */
+    public function tagExists(Tag $tag): bool {
+        $qb = $this->db->getQueryBuilder();
+        $qb->select(['id', 'uid', 'type', 'category'])
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($tag->getOwner(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($tag->getType(), IQueryBuilder::PARAM_STR)))
+            ->andWhere($qb->expr()->eq('category', $qb->createNamedParameter($tag->getName(), IQueryBuilder::PARAM_STR)));
+        try {
+            $this->findEntity($qb);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+        return true;
+    }
 }

lib/private/KnownUser/KnownUserMapper.php

Indentation +46 added lines, -46 removed lines

@@ -34,57 +34,57 @@
  * @template-extends QBMapper<KnownUser>
  */
 class KnownUserMapper extends QBMapper {
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'known_users', KnownUser::class);
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'known_users', KnownUser::class);
+    }
 
-	/**
-	 * @param string $knownTo
-	 * @return int Number of deleted entities
-	 */
-	public function deleteKnownTo(string $knownTo): int {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->getTableName())
-			->where($query->expr()->eq('known_to', $query->createNamedParameter($knownTo)));
+    /**
+     * @param string $knownTo
+     * @return int Number of deleted entities
+     */
+    public function deleteKnownTo(string $knownTo): int {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->getTableName())
+            ->where($query->expr()->eq('known_to', $query->createNamedParameter($knownTo)));
 
-		return $query->executeStatement();
-	}
+        return $query->executeStatement();
+    }
 
-	/**
-	 * @param string $knownUser
-	 * @return int Number of deleted entities
-	 */
-	public function deleteKnownUser(string $knownUser): int {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->getTableName())
-			->where($query->expr()->eq('known_user', $query->createNamedParameter($knownUser)));
+    /**
+     * @param string $knownUser
+     * @return int Number of deleted entities
+     */
+    public function deleteKnownUser(string $knownUser): int {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->getTableName())
+            ->where($query->expr()->eq('known_user', $query->createNamedParameter($knownUser)));
 
-		return $query->executeStatement();
-	}
+        return $query->executeStatement();
+    }
 
-	/**
-	 * Returns all "known users" for the given "known to" user
-	 *
-	 * @param string $knownTo
-	 * @return KnownUser[]
-	 */
-	public function getKnownUsers(string $knownTo): array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from($this->getTableName())
-			->where($query->expr()->eq('known_to', $query->createNamedParameter($knownTo)));
+    /**
+     * Returns all "known users" for the given "known to" user
+     *
+     * @param string $knownTo
+     * @return KnownUser[]
+     */
+    public function getKnownUsers(string $knownTo): array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from($this->getTableName())
+            ->where($query->expr()->eq('known_to', $query->createNamedParameter($knownTo)));
 
-		return $this->findEntities($query);
-	}
+        return $this->findEntities($query);
+    }
 
-	public function createKnownUserFromRow(array $row): KnownUser {
-		return $this->mapRowToEntity([
-			'id' => $row['s_id'],
-			'known_to' => $row['known_to'],
-			'known_user' => $row['known_user'],
-		]);
-	}
+    public function createKnownUserFromRow(array $row): KnownUser {
+        return $this->mapRowToEntity([
+            'id' => $row['s_id'],
+            'known_to' => $row['known_to'],
+            'known_user' => $row['known_user'],
+        ]);
+    }
 }

lib/public/AppFramework/Middleware.php

Indentation +58 added lines, -58 removed lines

@@ -36,68 +36,68 @@
  * @since 6.0.0
  */
 abstract class Middleware {
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function beforeController(Controller $controller, string $methodName) {
-	}
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @return void
+     * @since 6.0.0
+     */
+    public function beforeController(Controller $controller, string $methodName) {
+    }
 
 
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is
-	 * asked in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Exception $exception the thrown exception
-	 * @throws Exception the passed in exception if it can't handle it
-	 * @return Response a Response object in case that the exception was handled
-	 * @since 6.0.0
-	 */
-	public function afterException(Controller $controller, string $methodName, Exception $exception) {
-		throw $exception;
-	}
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is
+     * asked in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Exception $exception the thrown exception
+     * @throws Exception the passed in exception if it can't handle it
+     * @return Response a Response object in case that the exception was handled
+     * @since 6.0.0
+     */
+    public function afterException(Controller $controller, string $methodName, Exception $exception) {
+        throw $exception;
+    }
 
 
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 * @since 6.0.0
-	 */
-	public function afterController(Controller $controller, string $methodName, Response $response) {
-		return $response;
-	}
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     * @since 6.0.0
+     */
+    public function afterController(Controller $controller, string $methodName, Response $response) {
+        return $response;
+    }
 
 
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 * @since 6.0.0
-	 */
-	public function beforeOutput(Controller $controller, string $methodName, string $output) {
-		return $output;
-	}
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     * @since 6.0.0
+     */
+    public function beforeOutput(Controller $controller, string $methodName, string $output) {
+        return $output;
+    }
 }

lib/private/Repair/NC16/ClearCollectionsAccessCache.php

Indentation +25 added lines, -25 removed lines

@@ -32,29 +32,29 @@
 use OCP\Migration\IRepairStep;
 
 class ClearCollectionsAccessCache implements IRepairStep {
-	/** @var IConfig */
-	private $config;
-
-	/** @var Manager */
-	private $manager;
-
-	public function __construct(IConfig $config, IManager $manager) {
-		$this->config = $config;
-		$this->manager = $manager;
-	}
-
-	public function getName(): string {
-		return 'Clear access cache of projects';
-	}
-
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
-		return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun()) {
-			$this->manager->invalidateAccessCacheForAllCollections();
-		}
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var Manager */
+    private $manager;
+
+    public function __construct(IConfig $config, IManager $manager) {
+        $this->config = $config;
+        $this->manager = $manager;
+    }
+
+    public function getName(): string {
+        return 'Clear access cache of projects';
+    }
+
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
+        return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun()) {
+            $this->manager->invalidateAccessCacheForAllCollections();
+        }
+    }
 }

lib/private/L10N/LanguageIterator.php

Indentation +103 added lines, -103 removed lines

@@ -31,114 +31,114 @@
 use OCP\L10N\ILanguageIterator;
 
 class LanguageIterator implements ILanguageIterator {
-	private $i = 0;
-	/** @var IConfig */
-	private $config;
-	/** @var IUser */
-	private $user;
+    private $i = 0;
+    /** @var IConfig */
+    private $config;
+    /** @var IUser */
+    private $user;
 
-	public function __construct(IUser $user, IConfig $config) {
-		$this->config = $config;
-		$this->user = $user;
-	}
+    public function __construct(IUser $user, IConfig $config) {
+        $this->config = $config;
+        $this->user = $user;
+    }
 
-	/**
-	 * Rewind the Iterator to the first element
-	 */
-	public function rewind(): void {
-		$this->i = 0;
-	}
+    /**
+     * Rewind the Iterator to the first element
+     */
+    public function rewind(): void {
+        $this->i = 0;
+    }
 
-	/**
-	 * Return the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function current(): string {
-		switch ($this->i) {
-			/** @noinspection PhpMissingBreakStatementInspection */
-			case 0:
-				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if (is_string($forcedLang)) {
-					return $forcedLang;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 1:
-				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if (is_string($forcedLang)
-					&& ($truncated = $this->getTruncatedLanguage($forcedLang)) !== $forcedLang
-				) {
-					return $truncated;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 2:
-				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if (is_string($userLang)) {
-					return $userLang;
-				}
-				$this->next();
-				/** @noinspection PhpMissingBreakStatementInspection */
-				// no break
-			case 3:
-				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if (is_string($userLang)
-					&& ($truncated = $this->getTruncatedLanguage($userLang)) !== $userLang
-				) {
-					return $truncated;
-				}
-				$this->next();
-				// no break
-			case 4:
-				return $this->config->getSystemValueString('default_language', 'en');
-				/** @noinspection PhpMissingBreakStatementInspection */
-			case 5:
-				$defaultLang = $this->config->getSystemValueString('default_language', 'en');
-				if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
-					return $truncated;
-				}
-				$this->next();
-				// no break
-			default:
-				return 'en';
-		}
-	}
+    /**
+     * Return the current element
+     *
+     * @since 14.0.0
+     */
+    public function current(): string {
+        switch ($this->i) {
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 0:
+                $forcedLang = $this->config->getSystemValue('force_language', false);
+                if (is_string($forcedLang)) {
+                    return $forcedLang;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 1:
+                $forcedLang = $this->config->getSystemValue('force_language', false);
+                if (is_string($forcedLang)
+                    && ($truncated = $this->getTruncatedLanguage($forcedLang)) !== $forcedLang
+                ) {
+                    return $truncated;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 2:
+                $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
+                if (is_string($userLang)) {
+                    return $userLang;
+                }
+                $this->next();
+                /** @noinspection PhpMissingBreakStatementInspection */
+                // no break
+            case 3:
+                $userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
+                if (is_string($userLang)
+                    && ($truncated = $this->getTruncatedLanguage($userLang)) !== $userLang
+                ) {
+                    return $truncated;
+                }
+                $this->next();
+                // no break
+            case 4:
+                return $this->config->getSystemValueString('default_language', 'en');
+                /** @noinspection PhpMissingBreakStatementInspection */
+            case 5:
+                $defaultLang = $this->config->getSystemValueString('default_language', 'en');
+                if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
+                    return $truncated;
+                }
+                $this->next();
+                // no break
+            default:
+                return 'en';
+        }
+    }
 
-	/**
-	 * Move forward to next element
-	 *
-	 * @since 14.0.0
-	 */
-	public function next(): void {
-		++$this->i;
-	}
+    /**
+     * Move forward to next element
+     *
+     * @since 14.0.0
+     */
+    public function next(): void {
+        ++$this->i;
+    }
 
-	/**
-	 * Return the key of the current element
-	 *
-	 * @since 14.0.0
-	 */
-	public function key(): int {
-		return $this->i;
-	}
+    /**
+     * Return the key of the current element
+     *
+     * @since 14.0.0
+     */
+    public function key(): int {
+        return $this->i;
+    }
 
-	/**
-	 * Checks if current position is valid
-	 *
-	 * @since 14.0.0
-	 */
-	public function valid(): bool {
-		return $this->i <= 6;
-	}
+    /**
+     * Checks if current position is valid
+     *
+     * @since 14.0.0
+     */
+    public function valid(): bool {
+        return $this->i <= 6;
+    }
 
-	protected function getTruncatedLanguage(string $lang):string {
-		$pos = strpos($lang, '_');
-		if ($pos !== false) {
-			$lang = substr($lang, 0, $pos);
-		}
-		return $lang;
-	}
+    protected function getTruncatedLanguage(string $lang):string {
+        $pos = strpos($lang, '_');
+        if ($pos !== false) {
+            $lang = substr($lang, 0, $pos);
+        }
+        return $lang;
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Indentation +33 added lines, -33 removed lines

@@ -28,42 +28,42 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach ($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach ($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
-		if ($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValueString('datadirectory', '');
+        if ($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	public function accept(): bool {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    public function accept(): bool {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/Files/Mount/CacheMountProvider.php

Indentation +35 added lines, -35 removed lines

@@ -30,42 +30,42 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValueString('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-				mkdir($cacheDir . '/uploads', 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValueString('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+                mkdir($cacheDir . '/uploads', 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir], $loader, null, null, self::class),
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads'], $loader, null, null, self::class)
+            ];
+        } else {
+            return [];
+        }
+    }
 }