nextcloud / server

lib/private/AppFramework/DependencyInjection/DIContainer.php

Spacing +14 added lines, -14 removed lines

@@ -97,20 +97,20 @@ 
 		/* Cannot be an alias because Output is not in OCA */
 		$this->registerService(IOutput::class, fn (ContainerInterface $c): IOutput => new Output($c->get('webRoot')));
 
-		$this->registerService(Folder::class, function () {
+		$this->registerService(Folder::class, function() {
 			return $this->getServer()->getUserFolder();
 		});
 
-		$this->registerService(IAppData::class, function (ContainerInterface $c): IAppData {
+		$this->registerService(IAppData::class, function(ContainerInterface $c): IAppData {
 			return $c->get(IAppDataFactory::class)->get($c->get('appName'));
 		});
 
-		$this->registerService(IL10N::class, function (ContainerInterface $c) {
+		$this->registerService(IL10N::class, function(ContainerInterface $c) {
 			return $this->getServer()->getL10N($c->get('appName'));
 		});
 
 		// Log wrappers
-		$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(LoggerInterface::class, function(ContainerInterface $c) {
 			/* Cannot be an alias because it uses LoggerInterface so it would infinite loop */
 			return new ScopedPsrLogger(
 				$c->get(PsrLoggerAdapter::class),
@@ -118,7 +118,7 @@ 
 			);
 		});
 
-		$this->registerService(IServerContainer::class, function () {
+		$this->registerService(IServerContainer::class, function() {
 			return $this->getServer();
 		});
 		/** @deprecated 32.0.0 */
@@ -130,28 +130,28 @@ 
 		$this->registerDeprecatedAlias(IAppContainer::class, ContainerInterface::class);
 
 		// commonly used attributes
-		$this->registerService('userId', function (ContainerInterface $c): ?string {
+		$this->registerService('userId', function(ContainerInterface $c): ?string {
 			return $c->get(ISession::class)->get('user_id');
 		});
 
-		$this->registerService('webRoot', function (ContainerInterface $c): string {
+		$this->registerService('webRoot', function(ContainerInterface $c): string {
 			return $c->get(IServerContainer::class)->getWebRoot();
 		});
 
-		$this->registerService('OC_Defaults', function (ContainerInterface $c): object {
+		$this->registerService('OC_Defaults', function(ContainerInterface $c): object {
 			return $c->get(IServerContainer::class)->get('ThemingDefaults');
 		});
 
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('Protocol', Http::class);
-		$this->registerService(Http::class, function (ContainerInterface $c) {
+		$this->registerService(Http::class, function(ContainerInterface $c) {
 			$protocol = $c->get(IRequest::class)->getHttpProtocol();
 			return new Http($_SERVER, $protocol);
 		});
 
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('Dispatcher', Dispatcher::class);
-		$this->registerService(Dispatcher::class, function (ContainerInterface $c) {
+		$this->registerService(Dispatcher::class, function(ContainerInterface $c) {
 			return new Dispatcher(
 				$c->get(Http::class),
 				$c->get(MiddlewareDispatcher::class),
@@ -177,7 +177,7 @@ 
 		 */
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+		$this->registerService(MiddlewareDispatcher::class, function(ContainerInterface $c) {
 			$server = $this->getServer();
 
 			$dispatcher = new MiddlewareDispatcher();
@@ -293,7 +293,7 @@ 
 	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
 	 */
 	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
+		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
 			return $this->query($serviceName);
 		});
 	}
@@ -356,7 +356,7 @@ 
 			return parent::query($name, chain: $chain);
 		} elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
 			return parent::query($name, chain: $chain);
-		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
+		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName).'\\')) {
 			return parent::query($name, chain: $chain);
 		} elseif (
 			str_starts_with($name, 'OC\\AppFramework\\Services\\')
@@ -366,7 +366,7 @@ 
 			return parent::query($name, chain: $chain);
 		}
 
-		throw new QueryException('Could not resolve ' . $name . '!'
+		throw new QueryException('Could not resolve '.$name.'!'
 			. ' Class can not be instantiated', 1);
 	}
 }

lib/private/AppFramework/Utility/SimpleContainer.php

Spacing +12 added lines, -12 removed lines

@@ -66,7 +66,7 @@ 
 		if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects && !$class->isInternal()) {
 			/* For PHP>=8.4, use a lazy ghost to delay constructor and dependency resolving */
 			/** @psalm-suppress UndefinedMethod */
-			return $class->newLazyGhost(function (object $object) use ($constructor, $chain): void {
+			return $class->newLazyGhost(function(object $object) use ($constructor, $chain): void {
 				/** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
 				$object->__construct(...$this->buildClassConstructorParameters($constructor, $chain));
 			});
@@ -79,7 +79,7 @@ 
 	 * @param list<class-string> $chain
 	 */
 	private function buildClassConstructorParameters(\ReflectionMethod $constructor, array $chain): array {
-		return array_map(function (ReflectionParameter $parameter) use ($chain) {
+		return array_map(function(ReflectionParameter $parameter) use ($chain) {
 			$parameterType = $parameter->getType();
 
 			$resolveName = $parameter->getName();
@@ -110,7 +110,7 @@ 
 						}
 
 						// don't lose the error we got while trying to query by type
-						throw new QueryException($e->getMessage(), (int)$e->getCode(), $e);
+						throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
 					}
 				}
 
@@ -124,7 +124,7 @@ 
 	 * @param list<class-string> $chain
 	 */
 	public function resolve($name, array $chain = []) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
+		$baseMsg = 'Could not resolve '.$name.'!';
 		try {
 			$class = new ReflectionClass($name);
 			if ($class->isInstantiable()) {
@@ -135,7 +135,7 @@ 
 			}
 		} catch (ReflectionException $e) {
 			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+			throw new QueryNotFoundException($baseMsg.' '.$e->getMessage());
 		}
 	}
 
@@ -151,17 +151,17 @@ 
 
 		if ($autoload) {
 			if (in_array($name, $chain, true)) {
-				throw new RuntimeException('Tried to query ' . $name . ', but it is already in the chain: ' . implode(', ', $chain));
+				throw new RuntimeException('Tried to query '.$name.', but it is already in the chain: '.implode(', ', $chain));
 			}
 
 			$object = $this->resolve($name, array_merge($chain, [$name]));
-			$this->registerService($name, function () use ($object) {
+			$this->registerService($name, function() use ($object) {
 				return $object;
 			});
 			return $object;
 		}
 
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+		throw new QueryNotFoundException('Could not resolve '.$name.'!');
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @param bool $shared
 	 */
 	public function registerService($name, Closure $closure, $shared = true) {
-		$wrapped = function () use ($closure) {
+		$wrapped = function() use ($closure) {
 			return $closure($this);
 		};
 		$name = $this->sanitizeName($name);
@@ -204,16 +204,16 @@ 
 	 * @param string $target the target that should be resolved instead
 	 */
 	public function registerAlias($alias, $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target): mixed {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target): mixed {
 			return $container->get($target);
 		}, false);
 	}
 
 	protected function registerDeprecatedAlias(string $alias, string $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias): mixed {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias): mixed {
 			try {
 				$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.', [
+				$logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', [
 					'app' => $this->appName ?? 'serverDI',
 				]);
 			} catch (ContainerExceptionInterface $e) {