Merge pull request #3249 from nextcloud/chore/deps/nextcloud-coding-s…

…tandard

chore(deps): Update nextcloud/coding-standard to v1.3.0

lib/ACL/ACLCacheWrapper.php

@@ -31,7 +31,9 @@ private function getACLPermissionsForPath(string $path, array $rules = []) {
 		} else {
 			$minPermissions = Constants::PERMISSION_READ;
 		}
+
 		$canRead = ($permissions & $minPermissions) === $minPermissions;
+
 		return $canRead ? $permissions : 0;
 	}
 
@@ -49,12 +51,14 @@ protected function formatCacheEntry($entry, array $rules = []) {
 				return false;
 			}
 		}
+
 		return $entry;
 	}
 
 	public function getFolderContentsById($fileId) {
 		$results = $this->getCache()->getFolderContentsById($fileId);
 		$rules = $this->preloadEntries($results);
+
 		return array_filter(array_map(function ($entry) use ($rules) {
 			return $this->formatCacheEntry($entry, $rules);
 		}, $results));
@@ -63,18 +67,21 @@ public function getFolderContentsById($fileId) {
 	public function search($pattern) {
 		$results = $this->getCache()->search($pattern);
 		$this->preloadEntries($results);
+
 		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	public function searchByMime($mimetype) {
 		$results = $this->getCache()->searchByMime($mimetype);
 		$this->preloadEntries($results);
+
 		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	public function searchQuery(ISearchQuery $query) {
 		$results = $this->getCache()->searchQuery($query);
 		$this->preloadEntries($results);
+
 		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
@@ -86,6 +93,7 @@ private function preloadEntries(array $entries): array {
 		$paths = array_map(function (ICacheEntry $entry) {
 			return $entry->getPath();
 		}, $entries);
+
 		return $this->aclManager->getRelevantRulesForPath($paths, false);
 	}
 }

lib/ACL/ACLManager.php

@@ -69,6 +69,7 @@ private function getRules(array $paths, bool $cache = true): array {
 				if ($cache) {
 					$this->ruleCache->set($path, $rulesForPath);
 				}
+
 				$rules[$path] = $rulesForPath;
 			}
 		}
@@ -98,6 +99,7 @@ private function getRelevantPaths(string $path): array {
 			$rootTrashedItemDate = (int)substr($rootTrashedItemName, $separatorPos + 2);
 			$rootTrashedItemName = substr($rootTrashedItemName, 0, $separatorPos);
 		}
+
 		while ($path !== '') {
 			$paths[] = $path;
 			$path = dirname($path);
@@ -133,6 +135,7 @@ public function getRelevantRulesForPath(array $paths, bool $cache = true): array
 		foreach ($paths as $path) {
 			$allPaths = array_unique(array_merge($allPaths, $this->getRelevantPaths($path)));
 		}
+
 		return $this->getRules($allPaths, $cache);
 	}
 
@@ -152,6 +155,7 @@ public function getPermissionsForPathFromRules(string $path, array $rules): int
 		$path = ltrim($path, '/');
 		$relevantPaths = $this->getRelevantPaths($path);
 		$rules = array_intersect_key($rules, array_flip($relevantPaths));
+
 		return $this->calculatePermissionsForPath($rules);
 	}
 
@@ -194,6 +198,7 @@ private function calculatePermissionsForPath(array $rules): int {
 			}
 
 			$mergedRule = Rule::mergeRules($rulesPerMapping);
+
 			return $mergedRule->applyPermissions(Constants::PERMISSION_ALL);
 		} else {
 			// first combine all rules with the same path, then apply them on top of the current permissions

lib/ACL/ACLStorageWrapper.php

@@ -33,6 +33,7 @@ private function getACLPermissionsForPath(string $path) {
 		} else {
 			$canRead = $permissions & Constants::PERMISSION_READ;
 		}
+
 		return $canRead ? $permissions : 0;
 	}
 
@@ -74,15 +75,18 @@ public function rename($source, $target) {
 				return $this->checkPermissions($target, Constants::PERMISSION_CREATE) && parent::rename($source, $target);
 			}
 		}
+
 		$permissions = $this->file_exists($target) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
 		$sourceParent = dirname($source);
 		if ($sourceParent === '.') {
 			$sourceParent = '';
 		}
+
 		$targetParent = dirname($target);
 		if ($targetParent === '.') {
 			$targetParent = '';
 		}
+
 		return  ($sourceParent === $targetParent ||
 			$this->checkPermissions($sourceParent, Constants::PERMISSION_DELETE)) &&
 			$this->checkPermissions($source, Constants::PERMISSION_UPDATE & Constants::PERMISSION_READ) &&
@@ -158,6 +162,7 @@ public function fopen($path, $mode) {
 		} else {
 			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
 		}
+
 		return $this->checkPermissions($path, $permissions) ? parent::fopen($path, $mode) : false;
 	}
 
@@ -177,7 +182,9 @@ public function getCache($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this;
 		}
+
 		$sourceCache = parent::getCache($path, $storage);
+
 		return new ACLCacheWrapper($sourceCache, $this->aclManager, $this->inShare);
 	}
 
@@ -188,13 +195,15 @@ public function getMetaData($path) {
 			$data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
 			$data['permissions'] &= $this->getACLPermissionsForPath($path);
 		}
+
 		return $data;
 	}
 
 	public function getScanner($path = '', $storage = null) {
 		if (!$storage) {
 			$storage = $this->storage;
 		}
+
 		return parent::getScanner($path, $storage);
 	}
 
@@ -212,20 +221,23 @@ public function stat($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::stat($path);
 	}
 
 	public function filetype($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::filetype($path);
 	}
 
 	public function filesize($path): false|int|float {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::filesize($path);
 	}
 
@@ -238,41 +250,47 @@ public function filemtime($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::filemtime($path);
 	}
 
 	public function file_get_contents($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::file_get_contents($path);
 	}
 
 	public function getMimeType($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::getMimeType($path);
 	}
 
 	public function hash($type, $path, $raw = false) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::hash($type, $path, $raw);
 	}
 
 	public function getETag($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::getETag($path);
 	}
 
 	public function getDirectDownload($path) {
 		if (!$this->checkPermissions($path, Constants::PERMISSION_READ)) {
 			return false;
 		}
+
 		return parent::getDirectDownload($path);
 	}
 

lib/ACL/Rule.php

@@ -81,6 +81,7 @@ public function applyPermissions(int $permissions): int {
 
 		// a bitmask that has all allow bits set to 1 and all inherit and deny bits to 0
 		$allowMask = $this->mask & $this->permissions;
+
 		return $permissions | $allowMask;
 	}
 
@@ -185,6 +186,7 @@ public static function formatRulePermissions(int $mask, int $permissions): strin
 				$result[] = $type . $name;
 			}
 		}
+
 		return implode(', ', $result);
 	}
 

lib/ACL/RuleManager.php

@@ -67,11 +67,13 @@ public function getRulesForFilesById(IUser $user, array $fileIds): array {
 			if (!isset($result[$row['fileid']])) {
 				$result[$row['fileid']] = [];
 			}
+
 			$rule = $this->createRule($row);
 			if ($rule) {
 				$result[$row['fileid']][] = $rule;
 			}
 		}
+
 		return $result;
 	}
 
@@ -106,11 +108,11 @@ public function getRulesForFilesByPath(IUser $user, int $storageId, array $fileP
 			$rows = array_merge($rows, $query->executeQuery()->fetchAll());
 		}
 
-
 		$result = [];
 		foreach ($filePaths as $path) {
 			$result[$path] = [];
 		}
+
 		return $this->rulesByPath($rows, $result);
 	}
 
@@ -155,13 +157,15 @@ public function getRulesForFilesByParent(IUser $user, int $storageId, string $pa
 			if (!isset($result[$row['path']])) {
 				$result[$row['path']] = [];
 			}
+
 			if ($row['mapping_type'] !== null) {
 				$rule = $this->createRule($row);
 				if ($rule) {
 					$result[$row['path']][] = $rule;
 				}
 			}
 		}
+
 		return $result;
 	}
 
@@ -201,11 +205,13 @@ private function rulesByPath(array $rows, array $result = []): array {
 			if (!isset($result[$row['path']])) {
 				$result[$row['path']] = [];
 			}
+
 			$rule = $this->createRule($row);
 			if ($rule) {
 				$result[$row['path']][] = $rule;
 			}
 		}
+
 		return $result;
 	}
 
@@ -267,6 +273,7 @@ private function hasRule(IUserMapping $mapping, int $fileId): bool {
 			->where($query->expr()->eq('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->eq('mapping_type', $query->createNamedParameter($mapping->getType())))
 			->andWhere($query->expr()->eq('mapping_id', $query->createNamedParameter($mapping->getId())));
+
 		return (bool)$query->executeQuery()->fetch();
 	}
 

lib/AppInfo/Application.php

@@ -85,6 +85,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerService('GroupAppFolder', function (ContainerInterface $c): Folder {
 			/** @var IRootFolder $rootFolder */
 			$rootFolder = $c->get(IRootFolder::class);
+
 			return new LazyFolder($rootFolder, function () use ($rootFolder) {
 				try {
 					return $rootFolder->get('__groupfolders');
@@ -136,6 +137,7 @@ public function register(IRegistrationContext $context): void {
 			if ($hasVersionApp) {
 				$trashBackend->setVersionsBackend($c->get(VersionsBackend::class));
 			}
+
 			return $trashBackend;
 		});
 
@@ -214,6 +216,7 @@ public function register(IRegistrationContext $context): void {
 			$rootFolderProvider = function () use ($c): \OCP\Files\IRootFolder {
 				return $c->get(IRootFolder::class);
 			};
+
 			return new ACLManagerFactory(
 				$c->get(RuleManager::class),
 				$c->get(TrashManager::class),

lib/AppInfo/Capabilities.php

@@ -29,6 +29,7 @@ public function getCapabilities(): array {
 		if (!$user) {
 			return [];
 		}
+
 		return [
 			Application::APP_ID => [
 				'appVersion' => $this->appManager->getAppVersion(Application::APP_ID),

lib/AuthorizedAdminSettingMiddleware.php

@@ -24,7 +24,7 @@ class AuthorizedAdminSettingMiddleware extends Middleware {
 	public function __construct(
 		DelegationService $delegatedService,
 		IControllerMethodReflector $reflector,
-		IRequest $request
+		IRequest $request,
 	) {
 		$this->delegatedService = $delegatedService;
 		$this->reflector = $reflector;
@@ -63,6 +63,7 @@ public function afterException($controller, $methodName, \Exception $exception):
 			$response = new TemplateResponse('core', '403', ['message' => $exception->getMessage()], 'guest');
 			$response->setStatus((int)$exception->getCode());
 		}
+
 		return $response;
 	}
 }

lib/BackgroundJob/ExpireGroupTrash.php

@@ -23,7 +23,7 @@ public function __construct(
 		TrashBackend $trashBackend,
 		Expiration $expiration,
 		IConfig $config,
-		ITimeFactory $timeFactory
+		ITimeFactory $timeFactory,
 	) {
 		parent::__construct($timeFactory);
 		// Run once per hour
@@ -39,6 +39,7 @@ protected function run($argument) {
 		if ($backgroundJob === 'no') {
 			return;
 		}
+
 		$this->trashBackend->expire($this->expiration);
 	}
 }

lib/CacheListener.php

@@ -14,7 +14,9 @@
 use OCP\Files\Cache\ICacheEvent;
 
 class CacheListener {
-	public function __construct(private IEventDispatcher $eventDispatcher) {
+	public function __construct(
+		private IEventDispatcher $eventDispatcher,
+	) {
 	}
 
 	public function listen(): void {