nextcloud / server

tests/lib/App/AppManagerTest.php

Spacing +16 added lines, -16 removed lines

@@ -45,12 +45,12 @@ 
 
 		$config->expects($this->any())
 			->method('getValue')
-			->willReturnCallback(function ($app, $key, $default) use (&$appConfig) {
+			->willReturnCallback(function($app, $key, $default) use (&$appConfig) {
 				return (isset($appConfig[$app]) and isset($appConfig[$app][$key])) ? $appConfig[$app][$key] : $default;
 			});
 		$config->expects($this->any())
 			->method('setValue')
-			->willReturnCallback(function ($app, $key, $value) use (&$appConfig) {
+			->willReturnCallback(function($app, $key, $value) use (&$appConfig) {
 				if (!isset($appConfig[$app])) {
 					$appConfig[$app] = [];
 				}
@@ -58,7 +58,7 @@ 
 			});
 		$config->expects($this->any())
 			->method('getValues')
-			->willReturnCallback(function ($app, $key) use (&$appConfig) {
+			->willReturnCallback(function($app, $key) use (&$appConfig) {
 				if ($app) {
 					return $appConfig[$app];
 				} else {
@@ -73,7 +73,7 @@ 
 			});
 		$config->expects($this->any())
 			->method('searchValues')
-			->willReturnCallback(function ($key, $lazy, $type) use (&$appConfig) {
+			->willReturnCallback(function($key, $lazy, $type) use (&$appConfig) {
 				$values = [];
 				foreach ($appConfig as $appid => $appData) {
 					if (isset($appData[$key])) {
@@ -171,16 +171,16 @@ 
 	}
 
 	public static function dataGetAppIcon(): array {
-		$nothing = function ($appId) {
+		$nothing = function($appId) {
 			self::assertEquals('test', $appId);
 			throw new \RuntimeException();
 		};
 
-		$createCallback = function ($workingIcons) {
-			return function ($appId, $icon) use ($workingIcons) {
+		$createCallback = function($workingIcons) {
+			return function($appId, $icon) use ($workingIcons) {
 				self::assertEquals('test', $appId);
 				if (in_array($icon, $workingIcons)) {
-					return '/path/' . $icon;
+					return '/path/'.$icon;
 				}
 				throw new \RuntimeException();
 			};
@@ -471,13 +471,13 @@ 
 	}
 
 	public function testGetAppPath(): void {
-		$this->assertEquals(\OC::$SERVERROOT . '/apps/files', $this->manager->getAppPath('files'));
+		$this->assertEquals(\OC::$SERVERROOT.'/apps/files', $this->manager->getAppPath('files'));
 	}
 
 	public function testGetAppPathSymlink(): void {
 		$fakeAppDirname = sha1(uniqid('test', true));
-		$fakeAppPath = sys_get_temp_dir() . '/' . $fakeAppDirname;
-		$fakeAppLink = \OC::$SERVERROOT . '/' . $fakeAppDirname;
+		$fakeAppPath = sys_get_temp_dir().'/'.$fakeAppDirname;
+		$fakeAppLink = \OC::$SERVERROOT.'/'.$fakeAppDirname;
 
 		mkdir($fakeAppPath);
 		if (symlink($fakeAppPath, $fakeAppLink) === false) {
@@ -487,11 +487,11 @@ 
 		// Use the symlink as the app path
 		\OC::$APPSROOTS[] = [
 			'path' => $fakeAppLink,
-			'url' => \OC::$WEBROOT . '/' . $fakeAppDirname,
+			'url' => \OC::$WEBROOT.'/'.$fakeAppDirname,
 			'writable' => false,
 		];
 
-		$fakeTestAppPath = $fakeAppPath . '/' . 'test-test-app';
+		$fakeTestAppPath = $fakeAppPath.'/'.'test-test-app';
 		mkdir($fakeTestAppPath);
 
 		$generatedAppPath = $this->manager->getAppPath('test-test-app');
@@ -500,7 +500,7 @@ 
 		unlink($fakeAppLink);
 		rmdir($fakeAppPath);
 
-		$this->assertEquals($fakeAppLink . '/test-test-app', $generatedAppPath);
+		$this->assertEquals($fakeAppLink.'/test-test-app', $generatedAppPath);
 	}
 
 	public function testGetAppPathFail(): void {
@@ -644,7 +644,7 @@ 
 		$manager->expects($this->any())
 			->method('getAppInfo')
 			->willReturnCallback(
-				function ($appId) use ($appInfos) {
+				function($appId) use ($appInfos) {
 					return $appInfos[$appId];
 				}
 			);
@@ -703,7 +703,7 @@ 
 		$manager->expects($this->any())
 			->method('getAppInfo')
 			->willReturnCallback(
-				function ($appId) use ($appInfos) {
+				function($appId) use ($appInfos) {
 					return $appInfos[$appId];
 				}
 			);

lib/private/Server.php

Spacing +95 added lines, -95 removed lines

@@ -263,10 +263,10 @@ 
 		$this->registerParameter('isCLI', \OC::$CLI);
 		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
 
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(ContainerInterface::class, function(ContainerInterface $c) {
 			return $c;
 		});
-		$this->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(ContainerInterface $c) {
 			return $c;
 		});
 
@@ -284,11 +284,11 @@ 
 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
-		$this->registerService(View::class, function (Server $c) {
+		$this->registerService(View::class, function(Server $c) {
 			return new View();
 		}, false);
 
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
+		$this->registerService(IPreview::class, function(ContainerInterface $c) {
 			return new PreviewManager(
 				$c->get(\OCP\IConfig::class),
 				$c->get(IRootFolder::class),
@@ -307,7 +307,7 @@ 
 		});
 		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(ContainerInterface $c) {
 			return new \OC\Preview\Watcher(
 				new \OC\Preview\Storage\Root(
 					$c->get(IRootFolder::class),
@@ -316,11 +316,11 @@ 
 			);
 		});
 
-		$this->registerService(IProfiler::class, function (Server $c) {
+		$this->registerService(IProfiler::class, function(Server $c) {
 			return new Profiler($c->get(SystemConfig::class));
 		});
 
-		$this->registerService(\OCP\Encryption\IManager::class, function (Server $c): Encryption\Manager {
+		$this->registerService(\OCP\Encryption\IManager::class, function(Server $c): Encryption\Manager {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -338,7 +338,7 @@ 
 			);
 		});
 
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
+		$this->registerService(IFile::class, function(ContainerInterface $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->get(IUserManager::class),
@@ -352,7 +352,7 @@ 
 			);
 		});
 
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
+		$this->registerService(IStorage::class, function(ContainerInterface $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -371,23 +371,23 @@ 
 
 		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+		$this->registerService('SystemTagManagerFactory', function(ContainerInterface $c) {
 			/** @var \OCP\IConfig $config */
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagManager::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getManager();
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
 
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+		$this->registerService(ISystemTagObjectMapper::class, function(ContainerInterface $c) {
 			return $c->get('SystemTagManagerFactory')->getObjectMapper();
 		});
 		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
+		$this->registerService('RootFolder', function(ContainerInterface $c) {
 			$manager = \OC\Files\Filesystem::getMountManager();
 			$view = new View();
 			/** @var IUserSession $userSession */
@@ -412,7 +412,7 @@ 
 
 			return $root;
 		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
+		$this->registerService(HookConnector::class, function(ContainerInterface $c) {
 			return new HookConnector(
 				$c->get(IRootFolder::class),
 				new View(),
@@ -421,19 +421,19 @@ 
 			);
 		});
 
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(IRootFolder::class, function(ContainerInterface $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->get('RootFolder');
 			});
 		});
 
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+		$this->registerService(DisplayNameCache::class, function(ContainerInterface $c) {
 			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
 		});
 
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(ContainerInterface $c) {
 			$groupManager = new \OC\Group\Manager(
 				$this->get(IUserManager::class),
 				$this->get(IEventDispatcher::class),
@@ -444,7 +444,7 @@ 
 			return $groupManager;
 		});
 
-		$this->registerService(Store::class, function (ContainerInterface $c) {
+		$this->registerService(Store::class, function(ContainerInterface $c) {
 			$session = $c->get(ISession::class);
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
 				$tokenProvider = $c->get(IProvider::class);
@@ -459,7 +459,7 @@ 
 		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
 		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
 
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
+		$this->registerService(\OC\User\Session::class, function(Server $c) {
 			$manager = $c->get(IUserManager::class);
 			$session = new \OC\Session\Memory();
 			$timeFactory = new TimeFactory();
@@ -483,40 +483,40 @@ 
 				$c->get(IEventDispatcher::class),
 			);
 			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
 			});
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
 			});
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
 
@@ -524,12 +524,12 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
 			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+			$userSession->listen('\OC\User', 'preRememberedLogin', function($uid) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
 
@@ -537,19 +537,19 @@ 
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
+			$userSession->listen('\OC\User', 'logout', function($user) {
 				\OC_Hook::emit('OC_User', 'logout', []);
 
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
+			$userSession->listen('\OC\User', 'postLogout', function($user) {
 				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = $this->get(IEventDispatcher::class);
 				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) {
 				/** @var \OC\User\User $user */
 				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
 			});
@@ -563,14 +563,14 @@ 
 
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+		$this->registerService(\OC\SystemConfig::class, function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 
 		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
 		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
 
-		$this->registerService(IFactory::class, function (Server $c) {
+		$this->registerService(IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->get(\OCP\IConfig::class),
 				$c->getRequest(),
@@ -583,11 +583,11 @@ 
 
 		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
 
-		$this->registerService(ICache::class, function ($c) {
+		$this->registerService(ICache::class, function($c) {
 			return new Cache\File();
 		});
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 			$profiler = $c->get(IProfiler::class);
 			$arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
 				$profiler,
@@ -602,7 +602,7 @@ 
 
 			if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				$logQuery = $config->getValue('log_query');
-				$prefixClosure = function () use ($logQuery, $serverVersion): ?string {
+				$prefixClosure = function() use ($logQuery, $serverVersion): ?string {
 					if (!$logQuery) {
 						try {
 							$v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true);
@@ -620,10 +620,10 @@ 
 						];
 					}
 					$v['core'] = implode(',', $serverVersion->getVersion());
-					$version = implode(',', array_keys($v)) . implode(',', $v);
+					$version = implode(',', array_keys($v)).implode(',', $v);
 					$instanceId = \OC_Util::getInstanceId();
 					$path = \OC::$SERVERROOT;
-					return md5($instanceId . '-' . $version . '-' . $path);
+					return md5($instanceId.'-'.$version.'-'.$path);
 				};
 				return new \OC\Memcache\Factory($prefixClosure,
 					$c->get(LoggerInterface::class),
@@ -642,12 +642,12 @@ 
 		});
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			$l10n = $this->get(IFactory::class)->get('lib');
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
@@ -659,14 +659,14 @@ 
 			);
 		});
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(AvatarManager::class, function (Server $c) {
+		$this->registerService(AvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->get(IUserSession::class),
 				$c->get(\OC\User\Manager::class),
@@ -686,7 +686,7 @@ 
 		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
 
 		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
+		$this->registerService(\OC\Log::class, function(Server $c) {
 			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
 			$factory = new LogFactory($c, $this->get(SystemConfig::class));
 			$logger = $factory->get($logType);
@@ -697,13 +697,13 @@ 
 		// PSR-3 logger
 		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
 
-		$this->registerService(ILogFactory::class, function (Server $c) {
+		$this->registerService(ILogFactory::class, function(Server $c) {
 			return new LogFactory($c, $this->get(SystemConfig::class));
 		});
 
 		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
 
-		$this->registerService(Router::class, function (Server $c) {
+		$this->registerService(Router::class, function(Server $c) {
 			$cacheFactory = $c->get(ICacheFactory::class);
 			if ($cacheFactory->isLocalCacheAvailable()) {
 				$router = $c->resolve(CachingRouter::class);
@@ -714,7 +714,7 @@ 
 		});
 		$this->registerAlias(IRouter::class, Router::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			$config = $c->get(\OCP\IConfig::class);
 			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
 				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
@@ -744,7 +744,7 @@ 
 		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
 
 		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
+		$this->registerService(Connection::class, function(Server $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -757,17 +757,17 @@ 
 
 		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
 		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+		$this->registerService(NegativeDnsCache::class, function(ContainerInterface $c) {
 			return new NegativeDnsCache(
 				$c->get(ICacheFactory::class),
 			);
 		});
 		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IEventLogger::class, function(ContainerInterface $c) {
 			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
 		});
 
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+		$this->registerService(IQueryLogger::class, function(ContainerInterface $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -778,7 +778,7 @@ 
 
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (ContainerInterface $c) {
+		$this->registerService(AppManager::class, function(ContainerInterface $c) {
 			// TODO: use auto-wiring
 			return new \OC\App\AppManager(
 				$c->get(IUserSession::class),
@@ -794,7 +794,7 @@ 
 
 		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
 
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -803,14 +803,14 @@ 
 			);
 		});
 
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+		$this->registerService(IUserMountCache::class, function(ContainerInterface $c) {
 			$mountCache = $c->get(UserMountCache::class);
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->get(IUserManager::class));
 			return $mountCache;
 		});
 
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+		$this->registerService(IMountProviderCollection::class, function(ContainerInterface $c) {
 			$loader = $c->get(IStorageFactory::class);
 			$mountCache = $c->get(IUserMountCache::class);
 			$eventLogger = $c->get(IEventLogger::class);
@@ -830,7 +830,7 @@ 
 			return $manager;
 		});
 
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
+		$this->registerService(IBus::class, function(ContainerInterface $c) {
 			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
 			if ($busClass) {
 				[$app, $class] = explode('::', $busClass, 2);
@@ -849,7 +849,7 @@ 
 		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
 		$this->registerAlias(IThrottler::class, Throttler::class);
 
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function($c) {
 			$config = $c->get(\OCP\IConfig::class);
 			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
 				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
@@ -862,7 +862,7 @@ 
 		});
 
 		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
+		$this->registerService(Checker::class, function(ContainerInterface $c) {
 			// IConfig requires a working database. This code
 			// might however be called when Nextcloud is not yet setup.
 			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
@@ -885,7 +885,7 @@ 
 				$c->get(IMimeTypeDetector::class)
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\IRequest::class, function(ContainerInterface $c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -920,14 +920,14 @@ 
 			);
 		});
 
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+		$this->registerService(IRequestId::class, function(ContainerInterface $c): IRequestId {
 			return new RequestId(
 				$_SERVER['UNIQUE_ID'] ?? '',
 				$this->get(ISecureRandom::class)
 			);
 		});
 
-		$this->registerService(IMailer::class, function (Server $c) {
+		$this->registerService(IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->get(\OCP\IConfig::class),
 				$c->get(LoggerInterface::class),
@@ -942,7 +942,7 @@ 
 		/** @since 30.0.0 */
 		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
 
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass) || !class_exists($factoryClass)) {
@@ -951,11 +951,11 @@ 
 			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
 			return new $factoryClass($this);
 		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILDAPProvider::class, function(ContainerInterface $c) {
 			$factory = $c->get(ILDAPProviderFactory::class);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+		$this->registerService(ILockingProvider::class, function(ContainerInterface $c) {
 			$ini = $c->get(IniGetWrapper::class);
 			$config = $c->get(\OCP\IConfig::class);
 			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -977,51 +977,51 @@ 
 			return new NoopLockingProvider();
 		});
 
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
+		$this->registerService(ILockManager::class, function(Server $c): LockManager {
 			return new LockManager();
 		});
 
 		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
+		$this->registerService(SetupManager::class, function($c) {
 			// create the setupmanager through the mount manager to resolve the cyclic dependency
 			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
 		});
 		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
 
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+		$this->registerService(IMimeTypeDetector::class, function(ContainerInterface $c) {
 			return new \OC\Files\Type\Detection(
 				$c->get(IURLGenerator::class),
 				$c->get(LoggerInterface::class),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 
 		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
 		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
 
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+		$this->registerService(CapabilitiesManager::class, function(ContainerInterface $c) {
 			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
 		});
 
-		$this->registerService(ICommentsManager::class, function (Server $c) {
+		$this->registerService(ICommentsManager::class, function(Server $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
 			$factory = new $factoryClass($this);
 			$manager = $factory->getManager();
 
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->get(IUserManager::class);
 				$userDisplayName = $manager->getDisplayName($id);
 				if ($userDisplayName === null) {
@@ -1035,7 +1035,7 @@ 
 		});
 
 		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			try {
 				$classExists = class_exists('OCA\Theming\ThemingDefaults');
 			} catch (\OCP\AutoloadNotAllowedException $e) {
@@ -1076,7 +1076,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			return new JSCombiner(
 				$c->getAppDataDir('js'),
 				$c->get(IURLGenerator::class),
@@ -1087,7 +1087,7 @@ 
 		});
 		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
 
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+		$this->registerService('CryptoWrapper', function(ContainerInterface $c) {
 			// FIXME: Instantiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1111,12 +1111,12 @@ 
 				$request
 			);
 		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+		$this->registerService(SessionStorage::class, function(ContainerInterface $c) {
 			return new SessionStorage($c->get(ISession::class));
 		});
 		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
 
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IProviderFactory::class, function(ContainerInterface $c) {
 			$config = $c->get(\OCP\IConfig::class);
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1125,7 +1125,7 @@ 
 
 		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
 
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
 			$instance = new Collaboration\Collaborators\Search($c);
 
 			// register default plugins
@@ -1149,20 +1149,20 @@ 
 
 		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
 		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(ContainerInterface $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->get(IRootFolder::class),
 				$c->get(SystemConfig::class)
 			);
 		});
 
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(ContainerInterface $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->get(ISession::class);
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(ContainerInterface $c) {
 			return new DiscoveryService(
 				$c->get(ICacheFactory::class),
 				$c->get(IClientService::class)
@@ -1170,7 +1170,7 @@ 
 		});
 		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
 
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+		$this->registerService(ICloudIdManager::class, function(ContainerInterface $c) {
 			return new CloudIdManager(
 				$c->get(\OCP\Contacts\IManager::class),
 				$c->get(IURLGenerator::class),
@@ -1182,7 +1182,7 @@ 
 
 		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
 		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
+		$this->registerService(ICloudFederationFactory::class, function(Server $c) {
 			return new CloudFederationFactory();
 		});
 
@@ -1191,23 +1191,23 @@ 
 		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
 		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->get('ThemingDefaults')
 			);
 		});
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+		$this->registerService(\OCP\ISession::class, function(ContainerInterface $c) {
 			return $c->get(\OCP\IUserSession::class)->getSession();
 		}, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+		$this->registerService(IShareHelper::class, function(ContainerInterface $c) {
 			return new ShareHelper(
 				$c->get(\OCP\Share\IManager::class)
 			);
 		});
 
-		$this->registerService(Installer::class, function (ContainerInterface $c) {
+		$this->registerService(Installer::class, function(ContainerInterface $c) {
 			return new Installer(
 				$c->get(AppFetcher::class),
 				$c->get(IClientService::class),
@@ -1218,11 +1218,11 @@ 
 			);
 		});
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IApiFactory::class, function(ContainerInterface $c) {
 			return new ApiFactory($c->get(IClientService::class));
 		});
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+		$this->registerService(IInstanceFactory::class, function(ContainerInterface $c) {
 			$memcacheFactory = $c->get(ICacheFactory::class);
 			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
 		});
@@ -1706,11 +1706,11 @@ 
 	}
 
 	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias) {
 			try {
 				/** @var LoggerInterface $logger */
 				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+				$logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
 			} catch (ContainerExceptionInterface $e) {
 				// Could not get logger. Continue
 			}

lib/private/Route/Router.php

Spacing +15 added lines, -15 removed lines

@@ -85,7 +85,7 @@ 
 			foreach ($this->appManager->getEnabledApps() as $app) {
 				try {
 					$appPath = $this->appManager->getAppPath($app);
-					$file = $appPath . '/appinfo/routes.php';
+					$file = $appPath.'/appinfo/routes.php';
 					if (file_exists($file)) {
 						$this->routingFiles[$app] = $file;
 					}
@@ -111,7 +111,7 @@ 
 		if ($this->loaded) {
 			return;
 		}
-		$this->eventLogger->start('route:load:' . $requestedApp, 'Loading Routes for ' . $requestedApp);
+		$this->eventLogger->start('route:load:'.$requestedApp, 'Loading Routes for '.$requestedApp);
 		if (is_null($app)) {
 			$this->loaded = true;
 			$routingFiles = $this->getRoutingFiles();
@@ -127,7 +127,7 @@ 
 			}
 			try {
 				$appPath = $this->appManager->getAppPath($app);
-				$file = $appPath . '/appinfo/routes.php';
+				$file = $appPath.'/appinfo/routes.php';
 				if (file_exists($file)) {
 					$routingFiles = [$app => $file];
 				} else {
@@ -158,7 +158,7 @@ 
 				$this->root->addCollection($collection);
 
 				// Also add the OCS collection
-				$collection = $this->getCollection($app . '.ocs');
+				$collection = $this->getCollection($app.'.ocs');
 				$collection->addPrefix('/ocsapp');
 				$this->root->addCollection($collection);
 			}
@@ -169,7 +169,7 @@ 
 			$this->loadedApps['core'] = true;
 			$this->useCollection('root');
 			$this->setupRoutes($this->getAttributeRoutes('core'), 'core');
-			$this->requireRouteFile(__DIR__ . '/../../../core/routes.php', 'core');
+			$this->requireRouteFile(__DIR__.'/../../../core/routes.php', 'core');
 
 			// Also add the OCS collection
 			$collection = $this->getCollection('root.ocs');
@@ -181,7 +181,7 @@ 
 			$collection->addPrefix('/ocs');
 			$this->root->addCollection($collection);
 		}
-		$this->eventLogger->end('route:load:' . $requestedApp);
+		$this->eventLogger->end('route:load:'.$requestedApp);
 	}
 
 	/**
@@ -245,14 +245,14 @@ 
 		$this->eventLogger->start('route:match', 'Match route');
 		if (str_starts_with($url, '/apps/')) {
 			// empty string / 'apps' / $app / rest of the route
-			[, , $app,] = explode('/', $url, 4);
+			[,, $app, ] = explode('/', $url, 4);
 
 			$app = $this->appManager->cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
 			$this->loadRoutes($app);
 		} elseif (str_starts_with($url, '/ocsapp/apps/')) {
 			// empty string / 'ocsapp' / 'apps' / $app / rest of the route
-			[, , , $app,] = explode('/', $url, 5);
+			[,,, $app, ] = explode('/', $url, 5);
 
 			$app = $this->appManager->cleanAppId($app);
 			\OC::$REQUESTEDAPP = $app;
@@ -279,7 +279,7 @@ 
 				// However, since Symfony does not allow empty route names, the route
 				// we need to match is '/', so we need to append the '/' here.
 				try {
-					$parameters = $matcher->match($url . '/');
+					$parameters = $matcher->match($url.'/');
 				} catch (ResourceNotFoundException $newException) {
 					// If we still didn't match a route, we throw the original exception
 					throw $e;
@@ -452,7 +452,7 @@ 
 		$this->root->addCollection($collection);
 
 		// Also add the OCS collection
-		$collection = $this->getCollection($app . '.ocs');
+		$collection = $this->getCollection($app.'.ocs');
 		$collection->addPrefix('/ocsapp');
 		$this->root->addCollection($collection);
 	}
@@ -464,11 +464,11 @@ 
 		$routes = [];
 
 		if ($app === 'core') {
-			$appControllerPath = __DIR__ . '/../../../core/Controller';
+			$appControllerPath = __DIR__.'/../../../core/Controller';
 			$appNameSpace = 'OC\\Core';
 		} else {
 			try {
-				$appControllerPath = $this->appManager->getAppPath($app) . '/lib/Controller';
+				$appControllerPath = $this->appManager->getAppPath($app).'/lib/Controller';
 			} catch (AppPathNotFoundException) {
 				return [];
 			}
@@ -485,7 +485,7 @@ 
 				continue;
 			}
 
-			$class = new ReflectionClass($appNameSpace . '\\Controller\\' . basename($file->getPathname(), '.php'));
+			$class = new ReflectionClass($appNameSpace.'\\Controller\\'.basename($file->getPathname(), '.php'));
 
 			foreach ($class->getMethods() as $method) {
 				foreach ($method->getAttributes(RouteAttribute::class, ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
@@ -493,7 +493,7 @@ 
 
 					$serializedRoute = $route->toArray();
 					// Remove 'Controller' suffix
-					$serializedRoute['name'] = substr($class->getShortName(), 0, -10) . '#' . $method->getName();
+					$serializedRoute['name'] = substr($class->getShortName(), 0, -10).'#'.$method->getName();
 
 					$key = $route->getType();
 
@@ -544,7 +544,7 @@ 
 	private function getApplicationClass(string $appName) {
 		$appNameSpace = App::buildAppNamespace($appName);
 
-		$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
+		$applicationClassName = $appNameSpace.'\\AppInfo\\Application';
 
 		if (class_exists($applicationClassName)) {
 			$application = $this->container->get($applicationClassName);

lib/private/Route/CachingRouter.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function generate($name, $parameters = [], $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute;
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;
@@ -75,7 +75,7 @@ 
 	 */
 	public function findMatchingRoute(string $url): array {
 		$this->eventLogger->start('cacheroute:match', 'Match route');
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection';
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().'#rootCollection';
 		$cachedRoutes = $this->cache->get($key);
 		if (!$cachedRoutes) {
 			parent::loadRoutes();
@@ -92,7 +92,7 @@ 
 				// However, since Symfony does not allow empty route names, the route
 				// we need to match is '/', so we need to append the '/' here.
 				try {
-					$parameters = $matcher->match($url . '/');
+					$parameters = $matcher->match($url.'/');
 				} catch (ResourceNotFoundException $newException) {
 					// If we still didn't match a route, we throw the original exception
 					throw $e;