nextcloud / server

lib/private/Security/Bruteforce/Throttler.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
 	private function getCutoff(int $expire): \DateInterval {
 		$d1 = new \DateTime();
 		$d2 = clone $d1;
-		$d2->sub(new \DateInterval('PT' . $expire . 'S'));
+		$d2->sub(new \DateInterval('PT'.$expire.'S'));
 		return $d2->diff($d1);
 	}
 
@@ -120,7 +120,7 @@ 
 		$values = [
 			'action' => $action,
 			'occurred' => $this->timeFactory->getTime(),
-			'ip' => (string)$ipAddress,
+			'ip' => (string) $ipAddress,
 			'subnet' => $ipAddress->getSubnet(),
 			'metadata' => json_encode($metadata),
 		];
@@ -156,7 +156,7 @@ 
 		}
 
 		$keys = $this->config->getAppKeys('bruteForce');
-		$keys = array_filter($keys, function ($key) {
+		$keys = array_filter($keys, function($key) {
 			return str_starts_with($key, 'whitelist_');
 		});
 
@@ -175,7 +175,7 @@ 
 
 			$cx = explode('/', $cidr);
 			$addr = $cx[0];
-			$mask = (int)$cx[1];
+			$mask = (int) $cx[1];
 
 			// Do not compare ipv4 to ipv6
 			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
@@ -187,8 +187,8 @@ 
 
 			$valid = true;
 			for ($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i / 8)]);
-				$orig = ord($ip[(int)($i / 8)]);
+				$part = ord($addr[(int) ($i / 8)]);
+				$orig = ord($ip[(int) ($i / 8)]);
 
 				$bitmask = 1 << (7 - ($i % 8));
 
@@ -228,7 +228,7 @@ 
 		}
 
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return 0;
 		}
 
@@ -286,7 +286,7 @@ 
 	 */
 	public function resetDelay(string $ip, string $action, array $metadata): void {
 		$ipAddress = new IpAddress($ip);
-		if ($this->isIPWhitelisted((string)$ipAddress)) {
+		if ($this->isIPWhitelisted((string) $ipAddress)) {
 			return;
 		}
 

lib/private/LargeFileHelper.php

Spacing +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
 	 *                           PHP platform.
 	 */
 	public function __construct() {
-		$pow_2_53 = (float)self::POW_2_53_MINUS_1 + 1.0;
+		$pow_2_53 = (float) self::POW_2_53_MINUS_1 + 1.0;
 		if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
 			throw new \RuntimeException(
 				'This class assumes floats to be double precision or "better".'
@@ -73,7 +73,7 @@ 
 	 *
 	 * @return string Unsigned integer base-10 string
 	 */
-	public function formatUnsignedInteger(int|float|string $number): string {
+	public function formatUnsignedInteger(int | float | string $number): string {
 		if (is_float($number)) {
 			// Undo the effect of the php.ini setting 'precision'.
 			return number_format($number, 0, '', '');
@@ -97,7 +97,7 @@ 
 	 *
 	 * @return int|float Number of bytes as number (float or int)
 	 */
-	public function getFileSize(string $filename): int|float {
+	public function getFileSize(string $filename): int | float {
 		$fileSize = $this->getFileSizeViaCurl($filename);
 		if (!is_null($fileSize)) {
 			return $fileSize;
@@ -117,7 +117,7 @@ 
 	 * @return null|int|float Number of bytes as number (float or int) or
 	 *                        null on failure.
 	 */
-	public function getFileSizeViaCurl(string $fileName): null|int|float {
+	public function getFileSizeViaCurl(string $fileName): null | int | float {
 		if (\OC::$server->get(IniGetWrapper::class)->getString('open_basedir') === '') {
 			$encodedFileName = rawurlencode($fileName);
 			$ch = curl_init("file:///$encodedFileName");
@@ -145,7 +145,7 @@ 
 	 * @return null|int|float Number of bytes as number (float or int) or
 	 *                        null on failure.
 	 */
-	public function getFileSizeViaExec(string $filename): null|int|float {
+	public function getFileSizeViaExec(string $filename): null | int | float {
 		if (\OCP\Util::isFunctionEnabled('exec')) {
 			$os = strtolower(php_uname('s'));
 			$arg = escapeshellarg($filename);
@@ -170,7 +170,7 @@ 
 	 *
 	 * @return int|float Number of bytes as number (float or int).
 	 */
-	public function getFileSizeNative(string $filename): int|float {
+	public function getFileSizeNative(string $filename): int | float {
 		$result = filesize($filename);
 		if ($result < 0) {
 			// For file sizes between 2 GiB and 4 GiB, filesize() will return a
@@ -194,14 +194,14 @@ 
 			if (\OCP\Util::isFunctionEnabled('exec')) {
 				$os = strtolower(php_uname('s'));
 				if (str_contains($os, 'linux')) {
-					return (int)($this->exec('stat -c %Y ' . escapeshellarg($fullPath)) ?? -1);
+					return (int) ($this->exec('stat -c %Y '.escapeshellarg($fullPath)) ?? -1);
 				}
 			}
 		}
 		return $result;
 	}
 
-	protected function exec(string $cmd): null|int|float {
+	protected function exec(string $cmd): null | int | float {
 		$result = trim(exec($cmd));
 		return ctype_digit($result) ? 0 + $result : null;
 	}

lib/private/Cache/File.php

Spacing +10 added lines, -10 removed lines

@@ -54,10 +54,10 @@ 
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
 			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
+			if (!$rootView->file_exists('/'.$user->getUID().'/cache')) {
+				$rootView->mkdir('/'.$user->getUID().'/cache');
 			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
+			$this->storage = new View('/'.$user->getUID().'/cache');
 			return $this->storage;
 		} else {
 			\OC::$server->get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']);
@@ -112,7 +112,7 @@ 
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage and $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -161,7 +161,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file != '.' and $file != '..' and ($prefix === '' || str_starts_with($file, $prefix))) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -186,17 +186,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file != '.' and $file != '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', ['app' => 'core']);
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']);
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', ['app' => 'core']);
 					}
 				}
 			}

lib/private/Files/SetupManager.php

Spacing +31 added lines, -31 removed lines

@@ -132,14 +132,14 @@ 
 		OC_App::loadApps(['filesystem']);
 		$prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false);
 
-		Filesystem::addStorageWrapper('mount_options', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
+		Filesystem::addStorageWrapper('mount_options', function($mountPoint, IStorage $storage, IMountPoint $mount) {
 			if ($storage->instanceOfStorage(Common::class)) {
 				$storage->setMountOptions($mount->getOptions());
 			}
 			return $storage;
 		});
 
-		Filesystem::addStorageWrapper('enable_sharing', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
+		Filesystem::addStorageWrapper('enable_sharing', function($mountPoint, IStorage $storage, IMountPoint $mount) {
 			if (!$mount->getOption('enable_sharing', true)) {
 				return new PermissionsMask([
 					'storage' => $storage,
@@ -150,21 +150,21 @@ 
 		});
 
 		// install storage availability wrapper, before most other wrappers
-		Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, IStorage $storage) {
+		Filesystem::addStorageWrapper('oc_availability', function($mountPoint, IStorage $storage) {
 			if (!$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
 				return new Availability(['storage' => $storage]);
 			}
 			return $storage;
 		});
 
-		Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
+		Filesystem::addStorageWrapper('oc_encoding', function($mountPoint, IStorage $storage, IMountPoint $mount) {
 			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
 				return new Encoding(['storage' => $storage]);
 			}
 			return $storage;
 		});
 
-		Filesystem::addStorageWrapper('oc_quota', function ($mountPoint, $storage) {
+		Filesystem::addStorageWrapper('oc_quota', function($mountPoint, $storage) {
 			// set up quota for home storages, even for other users
 			// which can happen when using sharing
 
@@ -174,7 +174,7 @@ 
 			if ($storage->instanceOfStorage(HomeObjectStoreStorage::class) || $storage->instanceOfStorage(Home::class)) {
 				if (is_object($storage->getUser())) {
 					$user = $storage->getUser();
-					return new Quota(['storage' => $storage, 'quotaCallback' => function () use ($user) {
+					return new Quota(['storage' => $storage, 'quotaCallback' => function() use ($user) {
 						return OC_Util::getUserQuota($user);
 					}, 'root' => 'files']);
 				}
@@ -183,7 +183,7 @@ 
 			return $storage;
 		});
 
-		Filesystem::addStorageWrapper('readonly', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
+		Filesystem::addStorageWrapper('readonly', function($mountPoint, IStorage $storage, IMountPoint $mount) {
 			/*
 			 * Do not allow any operations that modify the storage
 			 */
@@ -220,8 +220,8 @@ 
 
 		$previouslySetupProviders = $this->setupUserMountProviders[$user->getUID()];
 
-		$this->setupForUserWith($user, function () use ($user) {
-			$this->mountProviderCollection->addMountForUser($user, $this->mountManager, function (
+		$this->setupForUserWith($user, function() use ($user) {
+			$this->mountProviderCollection->addMountForUser($user, $this->mountManager, function(
 				IMountProvider $provider
 			) use ($user) {
 				return !in_array(get_class($provider), $this->setupUserMountProviders[$user->getUID()]);
@@ -252,7 +252,7 @@ 
 
 		Filesystem::logWarningWhenAddingStorageWrapper($prevLogging);
 
-		$userDir = '/' . $user->getUID() . '/files';
+		$userDir = '/'.$user->getUID().'/files';
 
 		Filesystem::initInternal($userDir);
 
@@ -272,11 +272,11 @@ 
 		} else {
 			$this->mountManager->addMount(new MountPoint(
 				new NullStorage([]),
-				'/' . $user->getUID()
+				'/'.$user->getUID()
 			));
 			$this->mountManager->addMount(new MountPoint(
 				new NullStorage([]),
-				'/' . $user->getUID() . '/files'
+				'/'.$user->getUID().'/files'
 			));
 			$this->setupUsersComplete[] = $user->getUID();
 		}
@@ -291,16 +291,16 @@ 
 	 */
 	private function afterUserFullySetup(IUser $user, array $previouslySetupProviders): void {
 		$this->eventLogger->start('fs:setup:user:full:post', 'Housekeeping after user is setup');
-		$userRoot = '/' . $user->getUID() . '/';
+		$userRoot = '/'.$user->getUID().'/';
 		$mounts = $this->mountManager->getAll();
-		$mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) use ($userRoot) {
 			return str_starts_with($mount->getMountPoint(), $userRoot);
 		});
-		$allProviders = array_map(function (IMountProvider $provider) {
+		$allProviders = array_map(function(IMountProvider $provider) {
 			return get_class($provider);
 		}, $this->mountProviderCollection->getProviders());
 		$newProviders = array_diff($allProviders, $previouslySetupProviders);
-		$mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) use ($previouslySetupProviders) {
 			return !in_array($mount->getMountProvider(), $previouslySetupProviders);
 		});
 		$this->userMountCache->registerMounts($user, $mounts, $newProviders);
@@ -330,7 +330,7 @@ 
 		\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', ['user' => $user->getUID()]);
 		$this->eventLogger->end('fs:setup:user:post-init-mountpoint');
 
-		$userDir = '/' . $user->getUID() . '/files';
+		$userDir = '/'.$user->getUID().'/files';
 		$this->eventLogger->start('fs:setup:user:setup-hook', 'setup legacy hook');
 		OC_Hook::emit('OC_Filesystem', 'setup', ['user' => $user->getUID(), 'user_dir' => $userDir]);
 		$this->eventLogger->end('fs:setup:user:setup-hook');
@@ -373,7 +373,7 @@ 
 			} else {
 				return null;
 			}
-		} elseif (str_starts_with($path, '/appdata_' . \OC_Util::getInstanceId()) || str_starts_with($path, '/files_external/')) {
+		} elseif (str_starts_with($path, '/appdata_'.\OC_Util::getInstanceId()) || str_starts_with($path, '/files_external/')) {
 			return null;
 		} else {
 			[, $userId] = explode('/', $path);
@@ -402,7 +402,7 @@ 
 		}
 
 		// for the user's home folder, and includes children we need everything always
-		if (rtrim($path) === "/" . $user->getUID() . "/files" && $includeChildren) {
+		if (rtrim($path) === "/".$user->getUID()."/files" && $includeChildren) {
 			$this->setupForUser($user);
 			return;
 		}
@@ -432,7 +432,7 @@ 
 				$setupProviders[] = $cachedMount->getMountProvider();
 				$mounts = $this->mountProviderCollection->getUserMountsForProviderClasses($user, [$cachedMount->getMountProvider()]);
 			} else {
-				$this->logger->debug("mount at " . $cachedMount->getMountPoint() . " has no provider set, performing full setup");
+				$this->logger->debug("mount at ".$cachedMount->getMountPoint()." has no provider set, performing full setup");
 				$this->eventLogger->end('fs:setup:user:path:find');
 				$this->setupForUser($user);
 				$this->eventLogger->end('fs:setup:user:path');
@@ -444,7 +444,7 @@ 
 			$subCachedMounts = $this->userMountCache->getMountsInPath($user, $path);
 			$this->eventLogger->end('fs:setup:user:path:find');
 
-			$needsFullSetup = array_reduce($subCachedMounts, function (bool $needsFullSetup, ICachedMountInfo $cachedMountInfo) {
+			$needsFullSetup = array_reduce($subCachedMounts, function(bool $needsFullSetup, ICachedMountInfo $cachedMountInfo) {
 				return $needsFullSetup || $cachedMountInfo->getMountProvider() === '';
 			}, false);
 
@@ -468,7 +468,7 @@ 
 
 		if (count($mounts)) {
 			$this->userMountCache->registerMounts($user, $mounts, $currentProviders);
-			$this->setupForUserWith($user, function () use ($mounts) {
+			$this->setupForUserWith($user, function() use ($mounts) {
 				array_walk($mounts, [$this->mountManager, 'addMount']);
 			});
 		} elseif (!$this->isSetupStarted($user)) {
@@ -507,12 +507,12 @@ 
 			return;
 		}
 
-		$this->eventLogger->start('fs:setup:user:providers', "Setup filesystem for " . implode(', ', $providers));
+		$this->eventLogger->start('fs:setup:user:providers', "Setup filesystem for ".implode(', ', $providers));
 
 		$this->oneTimeUserSetup($user);
 
 		// home providers are always used
-		$providers = array_filter($providers, function (string $provider) {
+		$providers = array_filter($providers, function(string $provider) {
 			return !is_subclass_of($provider, IHomeMountProvider::class);
 		});
 
@@ -535,7 +535,7 @@ 
 		}
 
 		$this->userMountCache->registerMounts($user, $mounts, $providers);
-		$this->setupForUserWith($user, function () use ($mounts) {
+		$this->setupForUserWith($user, function() use ($mounts) {
 			array_walk($mounts, [$this->mountManager, 'addMount']);
 		});
 		$this->eventLogger->end('fs:setup:user:providers');
@@ -557,7 +557,7 @@ 
 	private function listenForNewMountProviders() {
 		if (!$this->listeningForProviders) {
 			$this->listeningForProviders = true;
-			$this->mountProviderCollection->listen('\OC\Files\Config', 'registerMountProvider', function (
+			$this->mountProviderCollection->listen('\OC\Files\Config', 'registerMountProvider', function(
 				IMountProvider $provider
 			) {
 				foreach ($this->setupUsers as $userId) {
@@ -575,16 +575,16 @@ 
 		// note that this event handling is intentionally pessimistic
 		// clearing the cache to often is better than not enough
 
-		$this->eventDispatcher->addListener(UserAddedEvent::class, function (UserAddedEvent $event) {
+		$this->eventDispatcher->addListener(UserAddedEvent::class, function(UserAddedEvent $event) {
 			$this->cache->remove($event->getUser()->getUID());
 		});
-		$this->eventDispatcher->addListener(UserRemovedEvent::class, function (UserRemovedEvent $event) {
+		$this->eventDispatcher->addListener(UserRemovedEvent::class, function(UserRemovedEvent $event) {
 			$this->cache->remove($event->getUser()->getUID());
 		});
-		$this->eventDispatcher->addListener(ShareCreatedEvent::class, function (ShareCreatedEvent $event) {
+		$this->eventDispatcher->addListener(ShareCreatedEvent::class, function(ShareCreatedEvent $event) {
 			$this->cache->remove($event->getShare()->getSharedWith());
 		});
-		$this->eventDispatcher->addListener(InvalidateMountCacheEvent::class, function (InvalidateMountCacheEvent $event
+		$this->eventDispatcher->addListener(InvalidateMountCacheEvent::class, function(InvalidateMountCacheEvent $event
 		) {
 			if ($user = $event->getUser()) {
 				$this->cache->remove($user->getUID());
@@ -601,7 +601,7 @@ 
 		];
 
 		foreach ($genericEvents as $genericEvent) {
-			$this->eventDispatcher->addListener($genericEvent, function ($event) {
+			$this->eventDispatcher->addListener($genericEvent, function($event) {
 				$this->cache->clear();
 			});
 		}

lib/private/Files/Config/UserMountCache.php

Spacing +28 added lines, -28 removed lines

@@ -79,11 +79,11 @@ 
 	public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
 		$this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
 		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) {
 			return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
 		});
 		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
+		$newMounts = array_map(function(IMountPoint $mount) use ($user) {
 			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
 			if ($mount->getStorageRootId() === -1) {
 				return null;
@@ -92,25 +92,25 @@ 
 			}
 		}, $mounts);
 		$newMounts = array_values(array_filter($newMounts));
-		$newMountKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
+		$newMountKeys = array_map(function(ICachedMountInfo $mount) {
+			return $mount->getRootId().'::'.$mount->getMountPoint();
 		}, $newMounts);
 		$newMounts = array_combine($newMountKeys, $newMounts);
 
 		$cachedMounts = $this->getMountsForUser($user);
 		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+			$cachedMounts = array_filter($cachedMounts, function(ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
 				// for existing mounts that didn't have a mount provider set
 				// we still want the ones that map to new mounts
-				$mountKey = $mountInfo->getRootId() . '::' . $mountInfo->getMountPoint();
+				$mountKey = $mountInfo->getRootId().'::'.$mountInfo->getMountPoint();
 				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountKey])) {
 					return true;
 				}
 				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
 			});
 		}
-		$cachedRootKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
+		$cachedRootKeys = array_map(function(ICachedMountInfo $mount) {
+			return $mount->getRootId().'::'.$mount->getMountPoint();
 		}, $cachedMounts);
 		$cachedMounts = array_combine($cachedRootKeys, $cachedMounts);
 
@@ -162,11 +162,11 @@ 
 	private function findChangedMounts(array $newMounts, array $cachedMounts) {
 		$new = [];
 		foreach ($newMounts as $mount) {
-			$new[$mount->getRootId() . '::' . $mount->getMountPoint()] = $mount;
+			$new[$mount->getRootId().'::'.$mount->getMountPoint()] = $mount;
 		}
 		$changed = [];
 		foreach ($cachedMounts as $cachedMount) {
-			$key = $cachedMount->getRootId() . '::' . $cachedMount->getMountPoint();
+			$key = $cachedMount->getRootId().'::'.$cachedMount->getMountPoint();
 			if (isset($new[$key])) {
 				$newMount = $new[$key];
 				if (
@@ -194,7 +194,7 @@ 
 			], ['root_id', 'user_id', 'mount_point']);
 		} else {
 			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+			$this->logger->debug('Could not get storage info for mount at '.$mount->getMountPoint());
 		}
 	}
 
@@ -229,12 +229,12 @@ 
 		}
 		$mount_id = $row['mount_id'];
 		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
+			$mount_id = (int) $mount_id;
 		}
 		return new CachedMountInfo(
 			$user,
-			(int)$row['storage_id'],
-			(int)$row['root_id'],
+			(int) $row['storage_id'],
+			(int) $row['root_id'],
 			$row['mount_point'],
 			$row['mount_provider_class'] ?? '',
 			$mount_id,
@@ -322,12 +322,12 @@ 
 
 			if (is_array($row)) {
 				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
+					(int) $row['storage'],
+					(string) $row['path'],
+					(int) $row['mimetype']
 				];
 			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
+				throw new NotFoundException('File with id "'.$fileId.'" not found');
 			}
 		}
 		return $this->cacheInfoCache[$fileId];
@@ -359,17 +359,17 @@ 
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 		// filter mounts that are from the same storage but a different directory
-		$filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
-			if ($fileId === (int)$row['root_id']) {
+		$filteredMounts = array_filter($rows, function(array $row) use ($internalPath, $fileId) {
+			if ($fileId === (int) $row['root_id']) {
 				return true;
 			}
 			$internalMountPath = $row['path'] ?? '';
 
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath.'/';
 		});
 
 		$filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
-		return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+		return array_map(function(ICachedMountInfo $mount) use ($internalPath) {
 			return new CachedMountFileInfo(
 				$mount->getUser(),
 				$mount->getStorageId(),
@@ -427,7 +427,7 @@ 
 			$slash
 		);
 
-		$userIds = array_map(function (IUser $user) {
+		$userIds = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
 
@@ -458,7 +458,7 @@ 
 
 	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
 		$mounts = $this->getMountsForUser($user);
-		$mountPoints = array_map(function (ICachedMountInfo $mount) {
+		$mountPoints = array_map(function(ICachedMountInfo $mount) {
 			return $mount->getMountPoint();
 		}, $mounts);
 		$mounts = array_combine($mountPoints, $mounts);
@@ -467,7 +467,7 @@ 
 		// walk up the directory tree until we find a path that has a mountpoint set
 		// the loop will return if a mountpoint is found or break if none are found
 		while (true) {
-			$mountPoint = $current . '/';
+			$mountPoint = $current.'/';
 			if (isset($mounts[$mountPoint])) {
 				return $mounts[$mountPoint];
 			} elseif ($current === '') {
@@ -480,13 +480,13 @@ 
 			}
 		}
 
-		throw new NotFoundException("No cached mount for path " . $path);
+		throw new NotFoundException("No cached mount for path ".$path);
 	}
 
 	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
+		$path = rtrim($path, '/').'/';
 		$mounts = $this->getMountsForUser($user);
-		return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
+		return array_filter($mounts, function(ICachedMountInfo $mount) use ($path) {
 			return $mount->getMountPoint() !== $path && str_starts_with($mount->getMountPoint(), $path);
 		});
 	}

lib/private/Files/Filesystem.php

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
 use OCP\IUserSession;
 
 class Filesystem {
-	private static ?Mount\Manager $mounts = null;
+	private static ? Mount\Manager $mounts = null;
 
 	public static bool $loaded = false;
 
@@ -59,7 +59,7 @@ 
 	private static ?CappedMemoryCache $normalizedPathCache = null;
 
 	/** @var string[]|null */
-	private static ?array $blacklist = null;
+	private static ? array $blacklist = null;
 
 	/**
 	 * classname which used for hooks handling
@@ -178,7 +178,7 @@ 
 	public const signal_param_mount_type = 'mounttype';
 	public const signal_param_users = 'users';
 
-	private static ?\OC\Files\Storage\StorageFactory $loader = null;
+	private static ? \OC\Files\Storage\StorageFactory $loader = null;
 
 	private static bool $logWarningWhenAddingStorageWrapper = true;
 
@@ -307,7 +307,7 @@ 
 		return [$mount->getStorage(), rtrim($mount->getInternalPath($path), '/')];
 	}
 
-	public static function init(string|IUser|null $user, string $root): bool {
+	public static function init(string | IUser | null $user, string $root): bool {
 		if (self::$defaultInstance) {
 			return false;
 		}
@@ -327,7 +327,7 @@ 
 		self::$defaultInstance = new View($root);
 		/** @var IEventDispatcher $eventDispatcher */
 		$eventDispatcher = \OC::$server->get(IEventDispatcher::class);
-		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function () {
+		$eventDispatcher->addListener(FilesystemTornDownEvent::class, function() {
 			self::$defaultInstance = null;
 			self::$loaded = false;
 		});
@@ -350,7 +350,7 @@ 
 	 *
 	 * @throws \OC\User\NoUserException if the user is not available
 	 */
-	public static function initMountPoints(string|IUser|null $user = ''): void {
+	public static function initMountPoints(string | IUser | null $user = ''): void {
 		/** @var IUserManager $userManager */
 		$userManager = \OC::$server->get(IUserManager::class);
 
@@ -373,7 +373,7 @@ 
 			$session = \OC::$server->get(IUserSession::class);
 			$user = $session->getUser();
 			if ($user) {
-				$userDir = '/' . $user->getUID() . '/files';
+				$userDir = '/'.$user->getUID().'/files';
 				self::initInternal($userDir);
 			}
 		}
@@ -421,7 +421,7 @@ 
 	 * we need this because we can't know if a file is stored local or not from
 	 * outside the filestorage and for some purposes a local file is needed
 	 */
-	public static function getLocalFile(string $path): string|false {
+	public static function getLocalFile(string $path): string | false {
 		return self::$defaultInstance->getLocalFile($path);
 	}
 
@@ -432,7 +432,7 @@ 
 	 * @return string
 	 */
 	public static function getLocalPath($path) {
-		$datadir = \OC_User::getHome(\OC_User::getUser()) . '/files';
+		$datadir = \OC_User::getHome(\OC_User::getUser()).'/files';
 		$newpath = $path;
 		if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
 			$newpath = substr($path, strlen($datadir));
@@ -449,7 +449,7 @@ 
 	public static function isValidPath($path) {
 		$path = self::normalizePath($path);
 		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		if (str_contains($path, '/../') || strrchr($path, '/') === '/..') {
 			return false;
@@ -584,7 +584,7 @@ 
 	 * @param string $path
 	 * @throws \OCP\Files\InvalidPathException
 	 */
-	public static function toTmpFile($path): string|false {
+	public static function toTmpFile($path): string | false {
 		return self::$defaultInstance->toTmpFile($path);
 	}
 
@@ -652,7 +652,7 @@ 
 		 *        conversion should get removed as soon as all existing
 		 *        function calls have been fixed.
 		 */
-		$path = (string)$path;
+		$path = (string) $path;
 
 		if ($path === '') {
 			return '/';
@@ -674,13 +674,13 @@ 
 		}
 
 		//add leading slash, if it is already there we strip it anyway
-		$path = '/' . $path;
+		$path = '/'.$path;
 
 		$patterns = [
-			'#\\\\#s',       // no windows style '\\' slashes
+			'#\\\\#s', // no windows style '\\' slashes
 			'#/\.(/\.)*/#s', // remove '/./'
-			'#\//+#s',       // remove sequence of slashes
-			'#/\.$#s',       // remove trailing '/.'
+			'#\//+#s', // remove sequence of slashes
+			'#/\.$#s', // remove trailing '/.'
 		];
 
 		do {
@@ -760,7 +760,7 @@ 
 	/**
 	 * get the ETag for a file or folder
 	 */
-	public static function getETag(string $path): string|false {
+	public static function getETag(string $path): string | false {
 		return self::$defaultInstance->getETag($path);
 	}
 }

lib/private/Files/Node/Folder.php

Spacing +23 added lines, -23 removed lines

@@ -68,9 +68,9 @@ 
 	public function getFullPath($path) {
 		$path = $this->normalizePath($path);
 		if (!$this->isValidPath($path)) {
-			throw new NotPermittedException('Invalid path "' . $path . '"');
+			throw new NotPermittedException('Invalid path "'.$path.'"');
 		}
-		return $this->path . $path;
+		return $this->path.$path;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 * @return bool
 	 */
 	public function isSubNode($node) {
-		return str_starts_with($node->getPath(), $this->path . '/');
+		return str_starts_with($node->getPath(), $this->path.'/');
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	public function getDirectoryListing() {
 		$folderContent = $this->view->getDirectoryContent($this->path, '', $this->getFileInfo(false));
 
-		return array_map(function (FileInfo $info) {
+		return array_map(function(FileInfo $info) {
 			if ($info->getMimetype() === FileInfo::MIMETYPE_FOLDER) {
 				return new Folder($this->root, $this->view, $info->getPath(), $info, $this);
 			} else {
@@ -163,14 +163,14 @@ 
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
 			$this->sendHooks(['preWrite', 'preCreate'], [$nonExisting]);
 			if (!$this->view->mkdir($fullPath)) {
-				throw new NotPermittedException('Could not create folder "' . $fullPath . '"');
+				throw new NotPermittedException('Could not create folder "'.$fullPath.'"');
 			}
 			$parent = dirname($fullPath) === $this->getPath() ? $this : null;
 			$node = new Folder($this->root, $this->view, $fullPath, null, $parent);
 			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
 			return $node;
 		} else {
-			throw new NotPermittedException('No create permission for folder "' . $path . '"');
+			throw new NotPermittedException('No create permission for folder "'.$path.'"');
 		}
 	}
 
@@ -194,13 +194,13 @@ 
 				$result = $this->view->touch($fullPath);
 			}
 			if ($result === false) {
-				throw new NotPermittedException('Could not create path "' . $fullPath . '"');
+				throw new NotPermittedException('Could not create path "'.$fullPath.'"');
 			}
 			$node = new File($this->root, $this->view, $fullPath, null, $this);
 			$this->sendHooks(['postWrite', 'postCreate'], [$node]);
 			return $node;
 		}
-		throw new NotPermittedException('No create permission for path "' . $path . '"');
+		throw new NotPermittedException('No create permission for path "'.$path.'"');
 	}
 
 	private function queryFromOperator(ISearchOperator $operator, string $uid = null, int $limit = 0, int $offset = 0): ISearchQuery {
@@ -222,7 +222,7 @@ 
 	 */
 	public function search($query) {
 		if (is_string($query)) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%'.$query.'%'));
 		}
 
 		// search is handled by a single query covering all caches that this folder contains
@@ -239,22 +239,22 @@ 
 		$resultsPerCache = $searchHelper->searchInCaches($query, $caches);
 
 		// loop through all results per-cache, constructing the FileInfo object from the CacheEntry and merge them all
-		$files = array_merge(...array_map(function (array $results, string $relativeMountPoint) use ($mountByMountPoint) {
+		$files = array_merge(...array_map(function(array $results, string $relativeMountPoint) use ($mountByMountPoint) {
 			$mount = $mountByMountPoint[$relativeMountPoint];
-			return array_map(function (ICacheEntry $result) use ($relativeMountPoint, $mount) {
+			return array_map(function(ICacheEntry $result) use ($relativeMountPoint, $mount) {
 				return $this->cacheEntryToFileInfo($mount, $relativeMountPoint, $result);
 			}, $results);
 		}, array_values($resultsPerCache), array_keys($resultsPerCache)));
 
 		// don't include this folder in the results
-		$files = array_filter($files, function (FileInfo $file) {
+		$files = array_filter($files, function(FileInfo $file) {
 			return $file->getPath() !== $this->getPath();
 		});
 
 		// since results were returned per-cache, they are no longer fully sorted
 		$order = $query->getOrder();
 		if ($order) {
-			usort($files, function (FileInfo $a, FileInfo $b) use ($order) {
+			usort($files, function(FileInfo $a, FileInfo $b) use ($order) {
 				foreach ($order as $orderField) {
 					$cmp = $orderField->sortFileInfo($a, $b);
 					if ($cmp !== 0) {
@@ -265,16 +265,16 @@ 
 			});
 		}
 
-		return array_map(function (FileInfo $file) {
+		return array_map(function(FileInfo $file) {
 			return $this->createNode($file->getPath(), $file);
 		}, $files);
 	}
 
 	private function cacheEntryToFileInfo(IMountPoint $mount, string $appendRoot, ICacheEntry $cacheEntry): FileInfo {
 		$cacheEntry['internalPath'] = $cacheEntry['path'];
-		$cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/');
-		$subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : '';
-		return new \OC\Files\FileInfo($this->path . $subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);
+		$cacheEntry['path'] = rtrim($appendRoot.$cacheEntry->getPath(), '/');
+		$subPath = $cacheEntry['path'] !== '' ? '/'.$cacheEntry['path'] : '';
+		return new \OC\Files\FileInfo($this->path.$subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount);
 	}
 
 	/**
@@ -285,7 +285,7 @@ 
 	 */
 	public function searchByMime($mimetype) {
 		if (!str_contains($mimetype, '/')) {
-			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype . '/%'));
+			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_LIKE, 'mimetype', $mimetype.'/%'));
 		} else {
 			$query = $this->queryFromOperator(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'mimetype', $mimetype));
 		}
@@ -309,12 +309,12 @@ 
 	 * @return \OC\Files\Node\Node[]
 	 */
 	public function getById($id) {
-		return $this->root->getByIdInPath((int)$id, $this->getPath());
+		return $this->root->getByIdInPath((int) $id, $this->getPath());
 	}
 
 	protected function getAppDataDirectoryName(): string {
 		$instanceId = \OC::$server->getConfig()->getSystemValueString('instanceid');
-		return 'appdata_' . $instanceId;
+		return 'appdata_'.$instanceId;
 	}
 
 	/**
@@ -336,8 +336,8 @@ 
 			return [];
 		}
 
-		$absolutePath = '/' . ltrim($cacheEntry->getPath(), '/');
-		$currentPath = rtrim($this->path, '/') . '/';
+		$absolutePath = '/'.ltrim($cacheEntry->getPath(), '/');
+		$currentPath = rtrim($this->path, '/').'/';
 
 		if (!str_starts_with($absolutePath, $currentPath)) {
 			return [];
@@ -365,7 +365,7 @@ 
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $this->path, $fileInfo);
 			$this->sendHooks(['postDelete'], [$nonExisting]);
 		} else {
-			throw new NotPermittedException('No delete permission for path "' . $this->path . '"');
+			throw new NotPermittedException('No delete permission for path "'.$this->path.'"');
 		}
 	}
 

lib/private/Files/Mount/MountPoint.php

Spacing +5 added lines, -5 removed lines

@@ -122,7 +122,7 @@ 
 		} else {
 			// Update old classes to new namespace
 			if (str_contains($storage, 'OC_Filestorage_')) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
+				$storage = '\OC\Files\Storage\\'.substr($storage, 15);
 			}
 			$this->class = $storage;
 			$this->arguments = $arguments;
@@ -179,7 +179,7 @@ 
 				return;
 			}
 		} else {
-			\OC::$server->get(LoggerInterface::class)->error('Storage backend ' . $this->class . ' not found', ['app' => 'core']);
+			\OC::$server->get(LoggerInterface::class)->error('Storage backend '.$this->class.' not found', ['app' => 'core']);
 			$this->invalidStorage = true;
 			return;
 		}
@@ -232,13 +232,13 @@ 
 	 */
 	public function getInternalPath($path) {
 		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+		if ($this->mountPoint === $path or $this->mountPoint.'/' === $path) {
 			$internalPath = '';
 		} else {
 			$internalPath = substr($path, strlen($this->mountPoint));
 		}
 		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
+		return (string) $internalPath;
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 			if ($storage === null) {
 				$this->rootId = -1;
 			} else {
-				$this->rootId = (int)$storage->getCache()->getId('');
+				$this->rootId = (int) $storage->getCache()->getId('');
 			}
 		}
 		return $this->rootId;

lib/private/Files/ObjectStore/S3Signature.php

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 		$request = $this->prepareRequest($request, $credentials);
 		$stringToSign = $this->createCanonicalizedString($request);
 		$auth = 'AWS '
-			. $credentials->getAccessKeyId() . ':'
+			. $credentials->getAccessKeyId().':'
 			. $this->signString($stringToSign, $credentials);
 
 		return $request->withHeader('Authorization', $auth);
@@ -150,11 +150,11 @@ 
 		RequestInterface $request,
 		$expires = null
 	) {
-		$buffer = $request->getMethod() . "\n";
+		$buffer = $request->getMethod()."\n";
 
 		// Add the interesting headers
 		foreach ($this->signableHeaders as $header) {
-			$buffer .= $request->getHeaderLine($header) . "\n";
+			$buffer .= $request->getHeaderLine($header)."\n";
 		}
 
 		$date = $expires ?: $request->getHeaderLine('date');
@@ -172,7 +172,7 @@ 
 			if (str_starts_with($name, 'x-amz-')) {
 				$value = implode(',', $header);
 				if (strlen($value) > 0) {
-					$headers[$name] = $name . ':' . $value;
+					$headers[$name] = $name.':'.$value;
 				}
 			}
 		}
@@ -183,7 +183,7 @@ 
 
 		ksort($headers);
 
-		return implode("\n", $headers) . "\n";
+		return implode("\n", $headers)."\n";
 	}
 
 	private function createCanonicalizedResource(RequestInterface $request) {
@@ -193,7 +193,7 @@ 
 		if ($data['bucket']) {
 			$buffer .= $data['bucket'];
 			if (!empty($data['key']) || !$data['path_style']) {
-				$buffer .= '/' . $data['key'];
+				$buffer .= '/'.$data['key'];
 			}
 		}