nextcloud / server

apps/dav/lib/Migration/Version1011Date20190725113607.php

Indentation +46 added lines, -46 removed lines

@@ -37,55 +37,55 @@
  */
 class Version1011Date20190725113607 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$types = ['resource', 'room'];
-		foreach ($types as $type) {
-			if (!$schema->hasTable($this->getMetadataTableName($type))) {
-				$table = $schema->createTable($this->getMetadataTableName($type));
+        $types = ['resource', 'room'];
+        foreach ($types as $type) {
+            if (!$schema->hasTable($this->getMetadataTableName($type))) {
+                $table = $schema->createTable($this->getMetadataTableName($type));
 
-				$table->addColumn('id', Types::BIGINT, [
-					'autoincrement' => true,
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn($type . '_id', Types::BIGINT, [
-					'notnull' => true,
-					'length' => 11,
-					'unsigned' => true,
-				]);
-				$table->addColumn('key', Types::STRING, [
-					'notnull' => true,
-					'length' => 255,
-				]);
-				$table->addColumn('value', Types::STRING, [
-					'notnull' => false,
-					'length' => 4000,
-				]);
+                $table->addColumn('id', Types::BIGINT, [
+                    'autoincrement' => true,
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn($type . '_id', Types::BIGINT, [
+                    'notnull' => true,
+                    'length' => 11,
+                    'unsigned' => true,
+                ]);
+                $table->addColumn('key', Types::STRING, [
+                    'notnull' => true,
+                    'length' => 255,
+                ]);
+                $table->addColumn('value', Types::STRING, [
+                    'notnull' => false,
+                    'length' => 4000,
+                ]);
 
-				$table->setPrimaryKey(['id']);
-				$table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
-			}
-		}
+                $table->setPrimaryKey(['id']);
+                $table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
+            }
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param string $type
-	 * @return string
-	 */
-	private function getMetadataTableName(string $type):string {
-		return 'calendar_' . $type . 's_md';
-	}
+    /**
+     * @param string $type
+     * @return string
+     */
+    private function getMetadataTableName(string $type):string {
+        return 'calendar_' . $type . 's_md';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 					'length' => 11,
 					'unsigned' => true,
 				]);
-				$table->addColumn($type . '_id', Types::BIGINT, [
+				$table->addColumn($type.'_id', Types::BIGINT, [
 					'notnull' => true,
 					'length' => 11,
 					'unsigned' => true,
@@ -74,7 +74,7 @@ 
 				]);
 
 				$table->setPrimaryKey(['id']);
-				$table->addIndex([$type . '_id', 'key'], $this->getMetadataTableName($type) . '_idk');
+				$table->addIndex([$type.'_id', 'key'], $this->getMetadataTableName($type).'_idk');
 			}
 		}
 
@@ -86,6 +86,6 @@ 
 	 * @return string
 	 */
 	private function getMetadataTableName(string $type):string {
-		return 'calendar_' . $type . 's_md';
+		return 'calendar_'.$type.'s_md';
 	}
 }

lib/private/AppFramework/Bootstrap/FunctionInjector.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
 	public function injectFn(callable $fn) {
 		$reflected = new ReflectionFunction(Closure::fromCallable($fn));
-		return $fn(...array_map(function (ReflectionParameter $param) {
+		return $fn(...array_map(function(ReflectionParameter $param) {
 			// First we try by type (more likely these days)
 			if (($type = $param->getType()) !== null) {
 				try {

Indentation +29 added lines, -29 removed lines

@@ -33,36 +33,36 @@
 use function array_map;
 
 class FunctionInjector {
-	/** @var ContainerInterface */
-	private $container;
+    /** @var ContainerInterface */
+    private $container;
 
-	public function __construct(ContainerInterface $container) {
-		$this->container = $container;
-	}
+    public function __construct(ContainerInterface $container) {
+        $this->container = $container;
+    }
 
-	public function injectFn(callable $fn) {
-		$reflected = new ReflectionFunction(Closure::fromCallable($fn));
-		return $fn(...array_map(function (ReflectionParameter $param) {
-			// First we try by type (more likely these days)
-			if (($type = $param->getType()) !== null) {
-				try {
-					return $this->container->get($type->getName());
-				} catch (QueryException $ex) {
-					// Ignore and try name as well
-				}
-			}
-			// Second we try by name (mostly for primitives)
-			try {
-				return $this->container->get($param->getName());
-			} catch (QueryException $ex) {
-				// As a last resort we pass `null` if allowed
-				if ($type !== null && $type->allowsNull()) {
-					return null;
-				}
+    public function injectFn(callable $fn) {
+        $reflected = new ReflectionFunction(Closure::fromCallable($fn));
+        return $fn(...array_map(function (ReflectionParameter $param) {
+            // First we try by type (more likely these days)
+            if (($type = $param->getType()) !== null) {
+                try {
+                    return $this->container->get($type->getName());
+                } catch (QueryException $ex) {
+                    // Ignore and try name as well
+                }
+            }
+            // Second we try by name (mostly for primitives)
+            try {
+                return $this->container->get($param->getName());
+            } catch (QueryException $ex) {
+                // As a last resort we pass `null` if allowed
+                if ($type !== null && $type->allowsNull()) {
+                    return null;
+                }
 
-				// Nothing worked, time to bail out
-				throw $ex;
-			}
-		}, $reflected->getParameters()));
-	}
+                // Nothing worked, time to bail out
+                throw $ex;
+            }
+        }, $reflected->getParameters()));
+    }
 }

lib/public/Lock/LockedException.php

Spacing +2 added lines, -2 removed lines

@@ -60,11 +60,11 @@
 		if ($readablePath) {
 			$message = "\"$path\"(\"$readablePath\") is locked";
 		} else {
-			$message = '"' . $path . '" is locked';
+			$message = '"'.$path.'" is locked';
 		}
 		$this->existingLock = $existingLock;
 		if ($existingLock) {
-			$message .= ', existing lock on file: ' . $existingLock;
+			$message .= ', existing lock on file: '.$existingLock;
 		}
 		parent::__construct($message, 0, $previous);
 		$this->path = $path;

Indentation +53 added lines, -53 removed lines

@@ -14,64 +14,64 @@
  * @since 8.1.0
  */
 class LockedException extends \Exception {
-	/**
-	 * Locked path
-	 *
-	 * @var string
-	 */
-	private $path;
+    /**
+     * Locked path
+     *
+     * @var string
+     */
+    private $path;
 
-	/** @var string|null */
-	private $existingLock;
+    /** @var string|null */
+    private $existingLock;
 
-	private ?string $readablePath;
+    private ?string $readablePath;
 
-	/**
-	 * LockedException constructor.
-	 *
-	 * @param string $path locked path
-	 * @param \Exception|null $previous previous exception for cascading
-	 * @param string $existingLock since 14.0.0
-	 * @param string $readablePath since 20.0.0
-	 * @since 8.1.0
-	 */
-	public function __construct(string $path, ?\Exception $previous = null, ?string $existingLock = null, ?string $readablePath = null) {
-		$this->readablePath = $readablePath;
-		if ($readablePath) {
-			$message = "\"$path\"(\"$readablePath\") is locked";
-		} else {
-			$message = '"' . $path . '" is locked';
-		}
-		$this->existingLock = $existingLock;
-		if ($existingLock) {
-			$message .= ', existing lock on file: ' . $existingLock;
-		}
-		parent::__construct($message, 0, $previous);
-		$this->path = $path;
-	}
+    /**
+     * LockedException constructor.
+     *
+     * @param string $path locked path
+     * @param \Exception|null $previous previous exception for cascading
+     * @param string $existingLock since 14.0.0
+     * @param string $readablePath since 20.0.0
+     * @since 8.1.0
+     */
+    public function __construct(string $path, ?\Exception $previous = null, ?string $existingLock = null, ?string $readablePath = null) {
+        $this->readablePath = $readablePath;
+        if ($readablePath) {
+            $message = "\"$path\"(\"$readablePath\") is locked";
+        } else {
+            $message = '"' . $path . '" is locked';
+        }
+        $this->existingLock = $existingLock;
+        if ($existingLock) {
+            $message .= ', existing lock on file: ' . $existingLock;
+        }
+        parent::__construct($message, 0, $previous);
+        $this->path = $path;
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getPath(): string {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 8.1.0
+     */
+    public function getPath(): string {
+        return $this->path;
+    }
 
-	/**
-	 * @return string
-	 * @since 19.0.0
-	 */
-	public function getExistingLock(): ?string {
-		return $this->existingLock;
-	}
+    /**
+     * @return string
+     * @since 19.0.0
+     */
+    public function getExistingLock(): ?string {
+        return $this->existingLock;
+    }
 
-	/**
-	 * @return ?string
-	 * @since 32.0.0
-	 */
-	public function getReadablePath(): ?string {
-		return $this->readablePath;
-	}
+    /**
+     * @return ?string
+     * @since 32.0.0
+     */
+    public function getReadablePath(): ?string {
+        return $this->readablePath;
+    }
 
 }

apps/sharebymail/lib/AppInfo/Application.php

Indentation +9 added lines, -9 removed lines

@@ -35,16 +35,16 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'sharebymail';
+    public const APP_ID = 'sharebymail';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/federation/lib/Migration/Version1010Date20200630191302.php

Indentation +46 added lines, -46 removed lines

@@ -33,51 +33,51 @@
 
 class Version1010Date20200630191302 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('trusted_servers')) {
-			$table = $schema->createTable('trusted_servers');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('url', Types::STRING, [
-				'notnull' => true,
-				'length' => 512,
-			]);
-			$table->addColumn('url_hash', Types::STRING, [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => false,
-				'length' => 128,
-			]);
-			$table->addColumn('shared_secret', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-			]);
-			$table->addColumn('status', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 2,
-			]);
-			$table->addColumn('sync_token', Types::STRING, [
-				'notnull' => false,
-				'length' => 512,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['url_hash'], 'url_hash');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('trusted_servers')) {
+            $table = $schema->createTable('trusted_servers');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('url', Types::STRING, [
+                'notnull' => true,
+                'length' => 512,
+            ]);
+            $table->addColumn('url_hash', Types::STRING, [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => false,
+                'length' => 128,
+            ]);
+            $table->addColumn('shared_secret', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+            ]);
+            $table->addColumn('status', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 2,
+            ]);
+            $table->addColumn('sync_token', Types::STRING, [
+                'notnull' => false,
+                'length' => 512,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['url_hash'], 'url_hash');
+        }
+        return $schema;
+    }
 }

apps/contactsinteraction/lib/AppInfo/Application.php

Indentation +9 added lines, -9 removed lines

@@ -33,16 +33,16 @@
 use OCP\Contacts\Events\ContactInteractedWithEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'contactsinteraction';
+    public const APP_ID = 'contactsinteraction';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

apps/cloud_federation_api/lib/AppInfo/Application.php

Indentation +9 added lines, -9 removed lines

@@ -33,16 +33,16 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'cloud_federation_api';
+    public const APP_ID = 'cloud_federation_api';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

lib/private/ServerContainer.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 
 		if (isset($this->namespaces[$namespace])) {
 			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+				$applicationClassName = 'OCA\\'.$sensitiveNamespace.'\\AppInfo\\Application';
 				if (class_exists($applicationClassName)) {
 					$app = new $applicationClassName();
 					if (isset($this->appContainers[$namespace])) {
@@ -159,7 +159,7 @@ 
 		}
 
 		try {
-			[,$namespace,] = explode('\\', $id);
+			[,$namespace, ] = explode('\\', $id);
 			return $this->getAppContainer(strtolower($namespace), $namespace);
 		} catch (QueryException $e) {
 			return null;

Indentation +150 added lines, -150 removed lines

@@ -21,154 +21,154 @@
  * @package OC
  */
 class ServerContainer extends SimpleContainer {
-	/** @var DIContainer[] */
-	protected $appContainers;
-
-	/** @var string[] */
-	protected $hasNoAppContainer;
-
-	/** @var string[] */
-	protected $namespaces;
-
-	/**
-	 * ServerContainer constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->appContainers = [];
-		$this->namespaces = [];
-		$this->hasNoAppContainer = [];
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $appNamespace
-	 */
-	public function registerNamespace(string $appName, string $appNamespace): void {
-		// Cut of OCA\ and lowercase
-		$appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
-		$this->namespaces[$appNamespace] = $appName;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param DIContainer $container
-	 */
-	public function registerAppContainer(string $appName, DIContainer $container): void {
-		$this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
-	}
-
-	/**
-	 * @param string $appName
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	public function getRegisteredAppContainer(string $appName): DIContainer {
-		if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
-			return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
-		}
-
-		throw new QueryException();
-	}
-
-	/**
-	 * @param string $namespace
-	 * @param string $sensitiveNamespace
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
-		if (isset($this->appContainers[$namespace])) {
-			return $this->appContainers[$namespace];
-		}
-
-		if (isset($this->namespaces[$namespace])) {
-			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
-				if (class_exists($applicationClassName)) {
-					$app = new $applicationClassName();
-					if (isset($this->appContainers[$namespace])) {
-						$this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
-						return $this->appContainers[$namespace];
-					}
-				}
-				$this->hasNoAppContainer[$namespace] = true;
-			}
-
-			return new DIContainer($this->namespaces[$namespace]);
-		}
-		throw new QueryException();
-	}
-
-	public function has($id, bool $noRecursion = false): bool {
-		if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
-			return $appContainer->has($id);
-		}
-
-		return parent::has($id);
-	}
-
-	/**
-	 * @template T
-	 * @param class-string<T>|string $name
-	 * @return T|mixed
-	 * @psalm-template S as class-string<T>|string
-	 * @psalm-param S $name
-	 * @psalm-return (S is class-string<T> ? T : mixed)
-	 * @throws QueryException
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 */
-	public function query(string $name, bool $autoload = true) {
-		$name = $this->sanitizeName($name);
-
-		if (str_starts_with($name, 'OCA\\')) {
-			// Skip server container query for app namespace classes
-			try {
-				return parent::query($name, false);
-			} catch (QueryException $e) {
-				// Continue with general autoloading then
-			}
-			// In case the service starts with OCA\ we try to find the service in
-			// the apps container first.
-			if (($appContainer = $this->getAppContainerForService($name)) !== null) {
-				try {
-					return $appContainer->queryNoFallback($name);
-				} catch (QueryException $e) {
-					// Didn't find the service or the respective app container
-					// In this case the service won't be part of the core container,
-					// so we can throw directly
-					throw $e;
-				}
-			}
-		} elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
-			$segments = explode('\\', $name);
-			try {
-				$appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
-				return $appContainer->queryNoFallback($name);
-			} catch (QueryException $e) {
-				// Didn't find the service or the respective app container,
-				// ignore it and fall back to the core container.
-			}
-		}
-
-		return parent::query($name, $autoload);
-	}
-
-	/**
-	 * @internal
-	 * @param string $id
-	 * @return DIContainer|null
-	 */
-	public function getAppContainerForService(string $id): ?DIContainer {
-		if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
-			return null;
-		}
-
-		try {
-			[,$namespace,] = explode('\\', $id);
-			return $this->getAppContainer(strtolower($namespace), $namespace);
-		} catch (QueryException $e) {
-			return null;
-		}
-	}
+    /** @var DIContainer[] */
+    protected $appContainers;
+
+    /** @var string[] */
+    protected $hasNoAppContainer;
+
+    /** @var string[] */
+    protected $namespaces;
+
+    /**
+     * ServerContainer constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->appContainers = [];
+        $this->namespaces = [];
+        $this->hasNoAppContainer = [];
+    }
+
+    /**
+     * @param string $appName
+     * @param string $appNamespace
+     */
+    public function registerNamespace(string $appName, string $appNamespace): void {
+        // Cut of OCA\ and lowercase
+        $appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
+        $this->namespaces[$appNamespace] = $appName;
+    }
+
+    /**
+     * @param string $appName
+     * @param DIContainer $container
+     */
+    public function registerAppContainer(string $appName, DIContainer $container): void {
+        $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
+    }
+
+    /**
+     * @param string $appName
+     * @return DIContainer
+     * @throws QueryException
+     */
+    public function getRegisteredAppContainer(string $appName): DIContainer {
+        if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
+            return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
+        }
+
+        throw new QueryException();
+    }
+
+    /**
+     * @param string $namespace
+     * @param string $sensitiveNamespace
+     * @return DIContainer
+     * @throws QueryException
+     */
+    protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
+        if (isset($this->appContainers[$namespace])) {
+            return $this->appContainers[$namespace];
+        }
+
+        if (isset($this->namespaces[$namespace])) {
+            if (!isset($this->hasNoAppContainer[$namespace])) {
+                $applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+                if (class_exists($applicationClassName)) {
+                    $app = new $applicationClassName();
+                    if (isset($this->appContainers[$namespace])) {
+                        $this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
+                        return $this->appContainers[$namespace];
+                    }
+                }
+                $this->hasNoAppContainer[$namespace] = true;
+            }
+
+            return new DIContainer($this->namespaces[$namespace]);
+        }
+        throw new QueryException();
+    }
+
+    public function has($id, bool $noRecursion = false): bool {
+        if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
+            return $appContainer->has($id);
+        }
+
+        return parent::has($id);
+    }
+
+    /**
+     * @template T
+     * @param class-string<T>|string $name
+     * @return T|mixed
+     * @psalm-template S as class-string<T>|string
+     * @psalm-param S $name
+     * @psalm-return (S is class-string<T> ? T : mixed)
+     * @throws QueryException
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     */
+    public function query(string $name, bool $autoload = true) {
+        $name = $this->sanitizeName($name);
+
+        if (str_starts_with($name, 'OCA\\')) {
+            // Skip server container query for app namespace classes
+            try {
+                return parent::query($name, false);
+            } catch (QueryException $e) {
+                // Continue with general autoloading then
+            }
+            // In case the service starts with OCA\ we try to find the service in
+            // the apps container first.
+            if (($appContainer = $this->getAppContainerForService($name)) !== null) {
+                try {
+                    return $appContainer->queryNoFallback($name);
+                } catch (QueryException $e) {
+                    // Didn't find the service or the respective app container
+                    // In this case the service won't be part of the core container,
+                    // so we can throw directly
+                    throw $e;
+                }
+            }
+        } elseif (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
+            $segments = explode('\\', $name);
+            try {
+                $appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
+                return $appContainer->queryNoFallback($name);
+            } catch (QueryException $e) {
+                // Didn't find the service or the respective app container,
+                // ignore it and fall back to the core container.
+            }
+        }
+
+        return parent::query($name, $autoload);
+    }
+
+    /**
+     * @internal
+     * @param string $id
+     * @return DIContainer|null
+     */
+    public function getAppContainerForService(string $id): ?DIContainer {
+        if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
+            return null;
+        }
+
+        try {
+            [,$namespace,] = explode('\\', $id);
+            return $this->getAppContainer(strtolower($namespace), $namespace);
+        } catch (QueryException $e) {
+            return null;
+        }
+    }
 }

lib/public/User/Backend/ICustomLogout.php

Indentation +8 added lines, -8 removed lines

@@ -32,12 +32,12 @@
  * SSO providers that also have a SSO logout url
  */
 interface ICustomLogout {
-	/**
-	 * @since 20.0.0
-	 *
-	 * The url to redirect to for logout
-	 *
-	 * @return string
-	 */
-	public function getLogoutUrl(): string;
+    /**
+     * @since 20.0.0
+     *
+     * The url to redirect to for logout
+     *
+     * @return string
+     */
+    public function getLogoutUrl(): string;
 }