nextcloud / server

lib/public/AppFramework/Db/Entity.php

Indentation +290 added lines, -290 removed lines

@@ -19,294 +19,294 @@
  * @psalm-consistent-constructor
  */
 abstract class Entity {
-	/** @var int $id */
-	public $id = null;
-
-	private array $_updatedFields = [];
-	/** @var array<string, \OCP\DB\Types::*> */
-	private array $_fieldTypes = ['id' => 'integer'];
-
-	/**
-	 * Simple alternative constructor for building entities from a request
-	 * @param array $params the array which was obtained via $this->params('key')
-	 *                      in the controller
-	 * @since 7.0.0
-	 */
-	public static function fromParams(array $params): static {
-		$instance = new static();
-
-		foreach ($params as $key => $value) {
-			$method = 'set' . ucfirst($key);
-			$instance->$method($value);
-		}
-
-		return $instance;
-	}
-
-
-	/**
-	 * Maps the keys of the row array to the attributes
-	 * @param array $row the row to map onto the entity
-	 * @since 7.0.0
-	 */
-	public static function fromRow(array $row): static {
-		$instance = new static();
-
-		foreach ($row as $key => $value) {
-			$prop = $instance->columnToProperty($key);
-			$instance->setter($prop, [$value]);
-		}
-
-		$instance->resetUpdatedFields();
-
-		return $instance;
-	}
-
-
-	/**
-	 * @return array<string, \OCP\DB\Types::*> with attribute and type
-	 * @since 7.0.0
-	 */
-	public function getFieldTypes(): array {
-		return $this->_fieldTypes;
-	}
-
-
-	/**
-	 * Marks the entity as clean needed for setting the id after the insertion
-	 * @since 7.0.0
-	 */
-	public function resetUpdatedFields(): void {
-		$this->_updatedFields = [];
-	}
-
-	/**
-	 * Generic setter for properties
-	 *
-	 * @throws \InvalidArgumentException
-	 * @since 7.0.0
-	 *
-	 */
-	protected function setter(string $name, array $args): void {
-		// setters should only work for existing attributes
-		if (!property_exists($this, $name)) {
-			throw new \BadFunctionCallException($name . ' is not a valid attribute');
-		}
-
-		if ($args[0] === $this->$name) {
-			return;
-		}
-		$this->markFieldUpdated($name);
-
-		// if type definition exists, cast to correct type
-		if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
-			$type = $this->_fieldTypes[$name];
-			if ($type === Types::BLOB) {
-				// (B)LOB is treated as string when we read from the DB
-				if (is_resource($args[0])) {
-					$args[0] = stream_get_contents($args[0]);
-				}
-				$type = Types::STRING;
-			}
-
-			switch ($type) {
-				case Types::BIGINT:
-				case Types::SMALLINT:
-					settype($args[0], Types::INTEGER);
-					break;
-				case Types::BINARY:
-				case Types::DECIMAL:
-				case Types::TEXT:
-					settype($args[0], Types::STRING);
-					break;
-				case Types::TIME:
-				case Types::DATE:
-				case Types::DATETIME:
-				case Types::DATETIME_TZ:
-					if (!$args[0] instanceof \DateTime) {
-						$args[0] = new \DateTime($args[0]);
-					}
-					break;
-				case Types::TIME_IMMUTABLE:
-				case Types::DATE_IMMUTABLE:
-				case Types::DATETIME_IMMUTABLE:
-				case Types::DATETIME_TZ_IMMUTABLE:
-					if (!$args[0] instanceof \DateTimeImmutable) {
-						$args[0] = new \DateTimeImmutable($args[0]);
-					}
-					break;
-				case Types::JSON:
-					if (!is_array($args[0])) {
-						$args[0] = json_decode($args[0], true);
-					}
-					break;
-				default:
-					settype($args[0], $type);
-			}
-		}
-		$this->$name = $args[0];
-
-	}
-
-	/**
-	 * Generic getter for properties
-	 * @since 7.0.0
-	 */
-	protected function getter(string $name): mixed {
-		// getters should only work for existing attributes
-		if (property_exists($this, $name)) {
-			return $this->$name;
-		} else {
-			throw new \BadFunctionCallException($name
-				. ' is not a valid attribute');
-		}
-	}
-
-
-	/**
-	 * Each time a setter is called, push the part after set
-	 * into an array: for instance setId will save Id in the
-	 * updated fields array so it can be easily used to create the
-	 * getter method
-	 * @since 7.0.0
-	 */
-	public function __call(string $methodName, array $args) {
-		if (str_starts_with($methodName, 'set')) {
-			$this->setter(lcfirst(substr($methodName, 3)), $args);
-		} elseif (str_starts_with($methodName, 'get')) {
-			return $this->getter(lcfirst(substr($methodName, 3)));
-		} elseif ($this->isGetterForBoolProperty($methodName)) {
-			return $this->getter(lcfirst(substr($methodName, 2)));
-		} else {
-			throw new \BadFunctionCallException($methodName
-				. ' does not exist');
-		}
-	}
-
-	/**
-	 * @param string $methodName
-	 * @return bool
-	 * @since 18.0.0
-	 */
-	protected function isGetterForBoolProperty(string $methodName): bool {
-		if (str_starts_with($methodName, 'is')) {
-			$fieldName = lcfirst(substr($methodName, 2));
-			return isset($this->_fieldTypes[$fieldName]) && str_starts_with($this->_fieldTypes[$fieldName], 'bool');
-		}
-		return false;
-	}
-
-	/**
-	 * Mark am attribute as updated
-	 * @param string $attribute the name of the attribute
-	 * @since 7.0.0
-	 */
-	protected function markFieldUpdated(string $attribute): void {
-		$this->_updatedFields[$attribute] = true;
-	}
-
-
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @since 7.0.0
-	 */
-	public function columnToProperty(string $columnName) {
-		$parts = explode('_', $columnName);
-		$property = '';
-
-		foreach ($parts as $part) {
-			if ($property === '') {
-				$property = $part;
-			} else {
-				$property .= ucfirst($part);
-			}
-		}
-
-		return $property;
-	}
-
-
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 * @since 7.0.0
-	 */
-	public function propertyToColumn(string $property): string {
-		$parts = preg_split('/(?=[A-Z])/', $property);
-
-		$column = '';
-		foreach ($parts as $part) {
-			if ($column === '') {
-				$column = $part;
-			} else {
-				$column .= '_' . lcfirst($part);
-			}
-		}
-
-		return $column;
-	}
-
-
-	/**
-	 * @return array array of updated fields for update query
-	 * @since 7.0.0
-	 */
-	public function getUpdatedFields(): array {
-		return $this->_updatedFields;
-	}
-
-
-	/**
-	 * Adds type information for a field so that it's automatically cast to
-	 * that value once its being returned from the database
-	 *
-	 * @param string $fieldName the name of the attribute
-	 * @param \OCP\DB\Types::* $type the type which will be used to match a cast
-	 * @since 31.0.0 Parameter $type is now restricted to {@see \OCP\DB\Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
-	 * @since 7.0.0
-	 */
-	protected function addType(string $fieldName, string $type): void {
-		/** @psalm-suppress TypeDoesNotContainType */
-		if (in_array($type, ['bool', 'double', 'int', 'array', 'object'], true)) {
-			// Mapping legacy strings to the actual types
-			$type = match ($type) {
-				'int' => Types::INTEGER,
-				'bool' => Types::BOOLEAN,
-				'double' => Types::FLOAT,
-				'array',
-				'object' => Types::STRING,
-			};
-		}
-
-		$this->_fieldTypes[$fieldName] = $type;
-	}
-
-
-	/**
-	 * Slugify the value of a given attribute
-	 * Warning: This doesn't result in a unique value
-	 *
-	 * @param string $attributeName the name of the attribute, which value should be slugified
-	 * @return string slugified value
-	 * @since 7.0.0
-	 * @deprecated 24.0.0
-	 */
-	public function slugify(string $attributeName): string {
-		// toSlug should only work for existing attributes
-		if (property_exists($this, $attributeName)) {
-			$value = $this->$attributeName;
-			// replace everything except alphanumeric with a single '-'
-			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
-			$value = strtolower($value);
-			// trim '-'
-			return trim($value, '-');
-		}
-
-		throw new \BadFunctionCallException($attributeName . ' is not a valid attribute');
-	}
+    /** @var int $id */
+    public $id = null;
+
+    private array $_updatedFields = [];
+    /** @var array<string, \OCP\DB\Types::*> */
+    private array $_fieldTypes = ['id' => 'integer'];
+
+    /**
+     * Simple alternative constructor for building entities from a request
+     * @param array $params the array which was obtained via $this->params('key')
+     *                      in the controller
+     * @since 7.0.0
+     */
+    public static function fromParams(array $params): static {
+        $instance = new static();
+
+        foreach ($params as $key => $value) {
+            $method = 'set' . ucfirst($key);
+            $instance->$method($value);
+        }
+
+        return $instance;
+    }
+
+
+    /**
+     * Maps the keys of the row array to the attributes
+     * @param array $row the row to map onto the entity
+     * @since 7.0.0
+     */
+    public static function fromRow(array $row): static {
+        $instance = new static();
+
+        foreach ($row as $key => $value) {
+            $prop = $instance->columnToProperty($key);
+            $instance->setter($prop, [$value]);
+        }
+
+        $instance->resetUpdatedFields();
+
+        return $instance;
+    }
+
+
+    /**
+     * @return array<string, \OCP\DB\Types::*> with attribute and type
+     * @since 7.0.0
+     */
+    public function getFieldTypes(): array {
+        return $this->_fieldTypes;
+    }
+
+
+    /**
+     * Marks the entity as clean needed for setting the id after the insertion
+     * @since 7.0.0
+     */
+    public function resetUpdatedFields(): void {
+        $this->_updatedFields = [];
+    }
+
+    /**
+     * Generic setter for properties
+     *
+     * @throws \InvalidArgumentException
+     * @since 7.0.0
+     *
+     */
+    protected function setter(string $name, array $args): void {
+        // setters should only work for existing attributes
+        if (!property_exists($this, $name)) {
+            throw new \BadFunctionCallException($name . ' is not a valid attribute');
+        }
+
+        if ($args[0] === $this->$name) {
+            return;
+        }
+        $this->markFieldUpdated($name);
+
+        // if type definition exists, cast to correct type
+        if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
+            $type = $this->_fieldTypes[$name];
+            if ($type === Types::BLOB) {
+                // (B)LOB is treated as string when we read from the DB
+                if (is_resource($args[0])) {
+                    $args[0] = stream_get_contents($args[0]);
+                }
+                $type = Types::STRING;
+            }
+
+            switch ($type) {
+                case Types::BIGINT:
+                case Types::SMALLINT:
+                    settype($args[0], Types::INTEGER);
+                    break;
+                case Types::BINARY:
+                case Types::DECIMAL:
+                case Types::TEXT:
+                    settype($args[0], Types::STRING);
+                    break;
+                case Types::TIME:
+                case Types::DATE:
+                case Types::DATETIME:
+                case Types::DATETIME_TZ:
+                    if (!$args[0] instanceof \DateTime) {
+                        $args[0] = new \DateTime($args[0]);
+                    }
+                    break;
+                case Types::TIME_IMMUTABLE:
+                case Types::DATE_IMMUTABLE:
+                case Types::DATETIME_IMMUTABLE:
+                case Types::DATETIME_TZ_IMMUTABLE:
+                    if (!$args[0] instanceof \DateTimeImmutable) {
+                        $args[0] = new \DateTimeImmutable($args[0]);
+                    }
+                    break;
+                case Types::JSON:
+                    if (!is_array($args[0])) {
+                        $args[0] = json_decode($args[0], true);
+                    }
+                    break;
+                default:
+                    settype($args[0], $type);
+            }
+        }
+        $this->$name = $args[0];
+
+    }
+
+    /**
+     * Generic getter for properties
+     * @since 7.0.0
+     */
+    protected function getter(string $name): mixed {
+        // getters should only work for existing attributes
+        if (property_exists($this, $name)) {
+            return $this->$name;
+        } else {
+            throw new \BadFunctionCallException($name
+                . ' is not a valid attribute');
+        }
+    }
+
+
+    /**
+     * Each time a setter is called, push the part after set
+     * into an array: for instance setId will save Id in the
+     * updated fields array so it can be easily used to create the
+     * getter method
+     * @since 7.0.0
+     */
+    public function __call(string $methodName, array $args) {
+        if (str_starts_with($methodName, 'set')) {
+            $this->setter(lcfirst(substr($methodName, 3)), $args);
+        } elseif (str_starts_with($methodName, 'get')) {
+            return $this->getter(lcfirst(substr($methodName, 3)));
+        } elseif ($this->isGetterForBoolProperty($methodName)) {
+            return $this->getter(lcfirst(substr($methodName, 2)));
+        } else {
+            throw new \BadFunctionCallException($methodName
+                . ' does not exist');
+        }
+    }
+
+    /**
+     * @param string $methodName
+     * @return bool
+     * @since 18.0.0
+     */
+    protected function isGetterForBoolProperty(string $methodName): bool {
+        if (str_starts_with($methodName, 'is')) {
+            $fieldName = lcfirst(substr($methodName, 2));
+            return isset($this->_fieldTypes[$fieldName]) && str_starts_with($this->_fieldTypes[$fieldName], 'bool');
+        }
+        return false;
+    }
+
+    /**
+     * Mark am attribute as updated
+     * @param string $attribute the name of the attribute
+     * @since 7.0.0
+     */
+    protected function markFieldUpdated(string $attribute): void {
+        $this->_updatedFields[$attribute] = true;
+    }
+
+
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @since 7.0.0
+     */
+    public function columnToProperty(string $columnName) {
+        $parts = explode('_', $columnName);
+        $property = '';
+
+        foreach ($parts as $part) {
+            if ($property === '') {
+                $property = $part;
+            } else {
+                $property .= ucfirst($part);
+            }
+        }
+
+        return $property;
+    }
+
+
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     * @since 7.0.0
+     */
+    public function propertyToColumn(string $property): string {
+        $parts = preg_split('/(?=[A-Z])/', $property);
+
+        $column = '';
+        foreach ($parts as $part) {
+            if ($column === '') {
+                $column = $part;
+            } else {
+                $column .= '_' . lcfirst($part);
+            }
+        }
+
+        return $column;
+    }
+
+
+    /**
+     * @return array array of updated fields for update query
+     * @since 7.0.0
+     */
+    public function getUpdatedFields(): array {
+        return $this->_updatedFields;
+    }
+
+
+    /**
+     * Adds type information for a field so that it's automatically cast to
+     * that value once its being returned from the database
+     *
+     * @param string $fieldName the name of the attribute
+     * @param \OCP\DB\Types::* $type the type which will be used to match a cast
+     * @since 31.0.0 Parameter $type is now restricted to {@see \OCP\DB\Types} constants. The formerly accidentally supported types 'int'|'bool'|'double' are mapped to Types::INTEGER|Types::BOOLEAN|Types::FLOAT accordingly.
+     * @since 7.0.0
+     */
+    protected function addType(string $fieldName, string $type): void {
+        /** @psalm-suppress TypeDoesNotContainType */
+        if (in_array($type, ['bool', 'double', 'int', 'array', 'object'], true)) {
+            // Mapping legacy strings to the actual types
+            $type = match ($type) {
+                'int' => Types::INTEGER,
+                'bool' => Types::BOOLEAN,
+                'double' => Types::FLOAT,
+                'array',
+                'object' => Types::STRING,
+            };
+        }
+
+        $this->_fieldTypes[$fieldName] = $type;
+    }
+
+
+    /**
+     * Slugify the value of a given attribute
+     * Warning: This doesn't result in a unique value
+     *
+     * @param string $attributeName the name of the attribute, which value should be slugified
+     * @return string slugified value
+     * @since 7.0.0
+     * @deprecated 24.0.0
+     */
+    public function slugify(string $attributeName): string {
+        // toSlug should only work for existing attributes
+        if (property_exists($this, $attributeName)) {
+            $value = $this->$attributeName;
+            // replace everything except alphanumeric with a single '-'
+            $value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
+            $value = strtolower($value);
+            // trim '-'
+            return trim($value, '-');
+        }
+
+        throw new \BadFunctionCallException($attributeName . ' is not a valid attribute');
+    }
 }

lib/public/DB/ISchemaWrapper.php

Indentation +69 added lines, -69 removed lines

@@ -20,81 +20,81 @@
  * @since 13.0.0
  */
 interface ISchemaWrapper {
-	/**
-	 * @param string $tableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 * @since 13.0.0
-	 */
-	public function getTable($tableName);
+    /**
+     * @param string $tableName
+     *
+     * @return \Doctrine\DBAL\Schema\Table
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     * @since 13.0.0
+     */
+    public function getTable($tableName);
 
-	/**
-	 * Does this schema have a table with the given name?
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 *
-	 * @return boolean
-	 * @since 13.0.0
-	 */
-	public function hasTable($tableName);
+    /**
+     * Does this schema have a table with the given name?
+     *
+     * @param string $tableName Prefix is automatically prepended
+     *
+     * @return boolean
+     * @since 13.0.0
+     */
+    public function hasTable($tableName);
 
-	/**
-	 * Creates a new table.
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 * @return \Doctrine\DBAL\Schema\Table
-	 * @since 13.0.0
-	 */
-	public function createTable($tableName);
+    /**
+     * Creates a new table.
+     *
+     * @param string $tableName Prefix is automatically prepended
+     * @return \Doctrine\DBAL\Schema\Table
+     * @since 13.0.0
+     */
+    public function createTable($tableName);
 
-	/**
-	 * Drops a table from the schema.
-	 *
-	 * @param string $tableName Prefix is automatically prepended
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 * @since 13.0.0
-	 */
-	public function dropTable($tableName);
+    /**
+     * Drops a table from the schema.
+     *
+     * @param string $tableName Prefix is automatically prepended
+     * @return \Doctrine\DBAL\Schema\Schema
+     * @since 13.0.0
+     */
+    public function dropTable($tableName);
 
-	/**
-	 * Gets all tables of this schema.
-	 *
-	 * @return \Doctrine\DBAL\Schema\Table[]
-	 * @since 13.0.0
-	 */
-	public function getTables();
+    /**
+     * Gets all tables of this schema.
+     *
+     * @return \Doctrine\DBAL\Schema\Table[]
+     * @since 13.0.0
+     */
+    public function getTables();
 
-	/**
-	 * Gets all table names, prefixed with table prefix
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getTableNames();
+    /**
+     * Gets all table names, prefixed with table prefix
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getTableNames();
 
-	/**
-	 * Gets all table names
-	 *
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function getTableNamesWithoutPrefix();
+    /**
+     * Gets all table names
+     *
+     * @return array
+     * @since 13.0.0
+     */
+    public function getTableNamesWithoutPrefix();
 
-	/**
-	 * Gets the DatabasePlatform for the database.
-	 *
-	 * @return AbstractPlatform
-	 *
-	 * @throws Exception
-	 * @since 23.0.0
-	 */
-	public function getDatabasePlatform();
+    /**
+     * Gets the DatabasePlatform for the database.
+     *
+     * @return AbstractPlatform
+     *
+     * @throws Exception
+     * @since 23.0.0
+     */
+    public function getDatabasePlatform();
 
-	/**
-	 * Drop autoincrement from an existing table of the database.
-	 *
-	 * @since 33.0.0
-	 */
-	public function dropAutoincrementColumn(string $table, string $column): void;
+    /**
+     * Drop autoincrement from an existing table of the database.
+     *
+     * @since 33.0.0
+     */
+    public function dropAutoincrementColumn(string $table, string $column): void;
 }

lib/public/Snowflake/IGenerator.php

Indentation +15 added lines, -15 removed lines

@@ -27,20 +27,20 @@
 #[Consumable(since: '33.0.0')]
 interface IGenerator {
 
-	/**
-	 * Offset applied on timestamps to keep it short
-	 * Start from 2025-10-01 at 00:00:00
-	 *
-	 * @since 33.0
-	 */
-	public const TS_OFFSET = 1759276800;
+    /**
+     * Offset applied on timestamps to keep it short
+     * Start from 2025-10-01 at 00:00:00
+     *
+     * @since 33.0
+     */
+    public const TS_OFFSET = 1759276800;
 
-	/**
-	 * Get a new Snowflake ID.
-	 *
-	 * Each call to this method is guaranteed to return a different ID.
-	 *
-	 * @since 33.0
-	 */
-	public function nextId(): string;
+    /**
+     * Get a new Snowflake ID.
+     *
+     * Each call to this method is guaranteed to return a different ID.
+     *
+     * @since 33.0
+     */
+    public function nextId(): string;
 }

lib/public/Snowflake/IDecoder.php

Indentation +13 added lines, -13 removed lines

@@ -19,17 +19,17 @@
  */
 #[Consumable(since: '33.0.0')]
 interface IDecoder {
-	/**
-	 * Decode information contained into Snowflake ID
-	 *
-	 * It includes:
-	 *  - server ID: identify server on which ID was generated
-	 *  - sequence ID: sequence number (number of snowflakes generated in the same second)
-	 *  - createdAt: timestamp at which ID was generated
-	 *  - isCli: if ID was generated using CLI or not
-	 *
-	 * @return array{createdAt: \DateTimeImmutable, serverId: int<0,1023>, sequenceId: int<0,4095>, isCli: bool, seconds: positive-int, milliseconds: int<0,999>}
-	 * @since 33.0
-	 */
-	public function decode(string $snowflakeId): array;
+    /**
+     * Decode information contained into Snowflake ID
+     *
+     * It includes:
+     *  - server ID: identify server on which ID was generated
+     *  - sequence ID: sequence number (number of snowflakes generated in the same second)
+     *  - createdAt: timestamp at which ID was generated
+     *  - isCli: if ID was generated using CLI or not
+     *
+     * @return array{createdAt: \DateTimeImmutable, serverId: int<0,1023>, sequenceId: int<0,4095>, isCli: bool, seconds: positive-int, milliseconds: int<0,999>}
+     * @since 33.0
+     */
+    public function decode(string $snowflakeId): array;
 }

lib/private/Server.php

Indentation +1369 added lines, -1369 removed lines

@@ -253,1415 +253,1415 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
-			return new Watcher(
-				$c->get(\OC\Preview\Storage\StorageFactory::class),
-				$c->get(PreviewMapper::class),
-				$c->get(IDBConnection::class),
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$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) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IAppConfig::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$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) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$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);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$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) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$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) {
-				/** @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) {
-				/** @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) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$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) {
-				/** @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) {
-				\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) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$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) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$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) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$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]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$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->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$logger = $c->get(LoggerInterface::class);
-			$serverVersion = $c->get(ServerVersion::class);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				return new \OC\Memcache\Factory(
-					$logger,
-					$profiler,
-					$serverVersion,
-					ArrayCache::class,
-					ArrayCache::class,
-					ArrayCache::class
-				);
-			}
-
-			return new \OC\Memcache\Factory(
-				$logger,
-				$profiler,
-				$serverVersion,
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.local', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.distributed', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.locking', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('redis_log_file')
-			);
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$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) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n,
-				$c->get(ITimeFactory::class),
-			);
-		});
-
-		$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) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$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) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$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) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$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(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$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');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$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) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$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
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$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(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$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) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$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) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$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)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$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)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$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')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$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) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$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) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$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 = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$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) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$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) {
-			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) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
+            return new Watcher(
+                $c->get(\OC\Preview\Storage\StorageFactory::class),
+                $c->get(PreviewMapper::class),
+                $c->get(IDBConnection::class),
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $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) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IAppConfig::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $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) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $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);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $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) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $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) {
+                /** @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) {
+                /** @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) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $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) {
+                /** @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) {
+                \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) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $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) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $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) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $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]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $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->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerAlias(ICache::class, Cache\File::class);
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $logger = $c->get(LoggerInterface::class);
+            $serverVersion = $c->get(ServerVersion::class);
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                return new \OC\Memcache\Factory(
+                    $logger,
+                    $profiler,
+                    $serverVersion,
+                    ArrayCache::class,
+                    ArrayCache::class,
+                    ArrayCache::class
+                );
+            }
+
+            return new \OC\Memcache\Factory(
+                $logger,
+                $profiler,
+                $serverVersion,
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.local', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.distributed', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.locking', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('redis_log_file')
+            );
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $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) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n,
+                $c->get(ITimeFactory::class),
+            );
+        });
+
+        $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) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $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) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $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) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $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(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $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');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $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) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $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
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $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(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $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) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $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) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $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)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $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)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $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')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $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) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $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) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $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 = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util($c->get(ServerVersion::class), $c->get(\OCP\IConfig::class), $this->get(IAppManager::class), $c->getAppDataDir('theming'), $imageManager),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $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) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $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) {
+            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) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $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) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->registerAlias(IGenerator::class, Generator::class);
-		$this->registerAlias(IDecoder::class, Decoder::class);
+        $this->registerAlias(IGenerator::class, Generator::class);
+        $this->registerAlias(IDecoder::class, Decoder::class);
 
-		$this->connectDispatcher();
-	}
+        $this->connectDispatcher();
+    }
 
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/private/AppFramework/Http/Dispatcher.php

Indentation +224 added lines, -224 removed lines

@@ -26,228 +26,228 @@
  * Class to dispatch the request to the middleware dispatcher
  */
 class Dispatcher {
-	/** @var MiddlewareDispatcher */
-	private $middlewareDispatcher;
-
-	/** @var Http */
-	private $protocol;
-
-	/** @var ControllerMethodReflector */
-	private $reflector;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var ConnectionAdapter */
-	private $connection;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var IEventLogger */
-	private $eventLogger;
-
-	private ContainerInterface $appContainer;
-
-	/**
-	 * @param Http $protocol the http protocol with contains all status headers
-	 * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
-	 *                                                   runs the middleware
-	 * @param ControllerMethodReflector $reflector the reflector that is used to inject
-	 *                                             the arguments for the controller
-	 * @param IRequest $request the incoming request
-	 * @param IConfig $config
-	 * @param ConnectionAdapter $connection
-	 * @param LoggerInterface $logger
-	 * @param IEventLogger $eventLogger
-	 */
-	public function __construct(
-		Http $protocol,
-		MiddlewareDispatcher $middlewareDispatcher,
-		ControllerMethodReflector $reflector,
-		IRequest $request,
-		IConfig $config,
-		ConnectionAdapter $connection,
-		LoggerInterface $logger,
-		IEventLogger $eventLogger,
-		ContainerInterface $appContainer,
-	) {
-		$this->protocol = $protocol;
-		$this->middlewareDispatcher = $middlewareDispatcher;
-		$this->reflector = $reflector;
-		$this->request = $request;
-		$this->config = $config;
-		$this->connection = $connection;
-		$this->logger = $logger;
-		$this->eventLogger = $eventLogger;
-		$this->appContainer = $appContainer;
-	}
-
-
-	/**
-	 * Handles a request and calls the dispatcher on the controller
-	 * @param Controller $controller the controller which will be called
-	 * @param string $methodName the method name which will be called on
-	 *                           the controller
-	 * @return array $array[0] contains the http status header as a string,
-	 *               $array[1] contains response headers as an array,
-	 *               $array[2] contains response cookies as an array,
-	 *               $array[3] contains the response output as a string,
-	 *               $array[4] contains the response object
-	 * @throws \Exception
-	 */
-	public function dispatch(Controller $controller, string $methodName): array {
-		$out = [null, [], null];
-
-		try {
-			// prefill reflector with everything that's needed for the
-			// middlewares
-			$this->reflector->reflect($controller, $methodName);
-
-			$this->middlewareDispatcher->beforeController($controller,
-				$methodName);
-
-			$databaseStatsBefore = [];
-			if ($this->config->getSystemValueBool('debug', false)) {
-				$databaseStatsBefore = $this->connection->getInner()->getStats();
-			}
-
-			$response = $this->executeController($controller, $methodName);
-
-			if (!empty($databaseStatsBefore)) {
-				$databaseStatsAfter = $this->connection->getInner()->getStats();
-				$numBuilt = $databaseStatsAfter['built'] - $databaseStatsBefore['built'];
-				$numExecuted = $databaseStatsAfter['executed'] - $databaseStatsBefore['executed'];
-
-				if ($numBuilt > 50) {
-					$this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.', [
-						'class' => get_class($controller),
-						'method' => $methodName,
-						'count' => $numBuilt,
-					]);
-				}
-
-				if ($numExecuted > 100) {
-					$this->logger->warning('Controller {class}::{method} executed {count} queries.', [
-						'class' => get_class($controller),
-						'method' => $methodName,
-						'count' => $numExecuted,
-					]);
-				}
-			}
-
-			// if an exception appears, the middleware checks if it can handle the
-			// exception and creates a response. If no response is created, it is
-			// assumed that there's no middleware who can handle it and the error is
-			// thrown again
-		} catch (\Exception $exception) {
-			$response = $this->middlewareDispatcher->afterException(
-				$controller, $methodName, $exception);
-		} catch (\Throwable $throwable) {
-			$exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable);
-			$response = $this->middlewareDispatcher->afterException(
-				$controller, $methodName, $exception);
-		}
-
-		$response = $this->middlewareDispatcher->afterController(
-			$controller, $methodName, $response);
-
-		// depending on the cache object the headers need to be changed
-		$out[0] = $this->protocol->getStatusHeader($response->getStatus());
-		$out[1] = array_merge($response->getHeaders());
-		$out[2] = $response->getCookies();
-		$out[3] = $this->middlewareDispatcher->beforeOutput(
-			$controller, $methodName, $response->render()
-		);
-		$out[4] = $response;
-
-		return $out;
-	}
-
-
-	/**
-	 * Uses the reflected parameters, types and request parameters to execute
-	 * the controller
-	 * @param Controller $controller the controller to be executed
-	 * @param string $methodName the method on the controller that should be executed
-	 * @return Response
-	 */
-	private function executeController(Controller $controller, string $methodName): Response {
-		$arguments = [];
-
-		// valid types that will be cast
-		$types = ['int', 'integer', 'bool', 'boolean', 'float', 'double'];
-
-		foreach ($this->reflector->getParameters() as $param => $default) {
-			// try to get the parameter from the request object and cast
-			// it to the type annotated in the @param annotation
-			$value = $this->request->getParam($param, $default);
-			$type = $this->reflector->getType($param);
-
-			// Converted the string `'false'` to false when the controller wants a boolean
-			if ($value === 'false' && ($type === 'bool' || $type === 'boolean')) {
-				$value = false;
-			} elseif ($value !== null && \in_array($type, $types, true)) {
-				settype($value, $type);
-				$this->ensureParameterValueSatisfiesRange($param, $value);
-			} elseif ($value === null && $type !== null && $this->appContainer->has($type)) {
-				$value = $this->appContainer->get($type);
-			}
-
-			$arguments[] = $value;
-		}
-
-		$this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
-		try {
-			$response = \call_user_func_array([$controller, $methodName], $arguments);
-		} catch (\TypeError $e) {
-			// Only intercept TypeErrors occurring on the first line, meaning that the invocation of the controller method failed.
-			// Any other TypeError happens inside the controller method logic and should be logged as normal.
-			if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
-				$this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
-				return new Response(Http::STATUS_BAD_REQUEST);
-			}
-
-			throw $e;
-		}
-		$this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
-
-		if (!($response instanceof Response)) {
-			$this->logger->debug($controller::class . '::' . $methodName . ' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
-		}
-
-		// format response
-		if ($response instanceof DataResponse || !($response instanceof Response)) {
-			$format = $this->request->getFormat();
-
-			if ($format !== null) {
-				$response = $controller->buildResponse($response, $format);
-			} else {
-				$response = $controller->buildResponse($response);
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @psalm-param mixed $value
-	 * @throws ParameterOutOfRangeException
-	 */
-	private function ensureParameterValueSatisfiesRange(string $param, $value): void {
-		$rangeInfo = $this->reflector->getRange($param);
-		if ($rangeInfo) {
-			if ($value < $rangeInfo['min'] || $value > $rangeInfo['max']) {
-				throw new ParameterOutOfRangeException(
-					$param,
-					$value,
-					$rangeInfo['min'],
-					$rangeInfo['max'],
-				);
-			}
-		}
-	}
+    /** @var MiddlewareDispatcher */
+    private $middlewareDispatcher;
+
+    /** @var Http */
+    private $protocol;
+
+    /** @var ControllerMethodReflector */
+    private $reflector;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var ConnectionAdapter */
+    private $connection;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var IEventLogger */
+    private $eventLogger;
+
+    private ContainerInterface $appContainer;
+
+    /**
+     * @param Http $protocol the http protocol with contains all status headers
+     * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
+     *                                                   runs the middleware
+     * @param ControllerMethodReflector $reflector the reflector that is used to inject
+     *                                             the arguments for the controller
+     * @param IRequest $request the incoming request
+     * @param IConfig $config
+     * @param ConnectionAdapter $connection
+     * @param LoggerInterface $logger
+     * @param IEventLogger $eventLogger
+     */
+    public function __construct(
+        Http $protocol,
+        MiddlewareDispatcher $middlewareDispatcher,
+        ControllerMethodReflector $reflector,
+        IRequest $request,
+        IConfig $config,
+        ConnectionAdapter $connection,
+        LoggerInterface $logger,
+        IEventLogger $eventLogger,
+        ContainerInterface $appContainer,
+    ) {
+        $this->protocol = $protocol;
+        $this->middlewareDispatcher = $middlewareDispatcher;
+        $this->reflector = $reflector;
+        $this->request = $request;
+        $this->config = $config;
+        $this->connection = $connection;
+        $this->logger = $logger;
+        $this->eventLogger = $eventLogger;
+        $this->appContainer = $appContainer;
+    }
+
+
+    /**
+     * Handles a request and calls the dispatcher on the controller
+     * @param Controller $controller the controller which will be called
+     * @param string $methodName the method name which will be called on
+     *                           the controller
+     * @return array $array[0] contains the http status header as a string,
+     *               $array[1] contains response headers as an array,
+     *               $array[2] contains response cookies as an array,
+     *               $array[3] contains the response output as a string,
+     *               $array[4] contains the response object
+     * @throws \Exception
+     */
+    public function dispatch(Controller $controller, string $methodName): array {
+        $out = [null, [], null];
+
+        try {
+            // prefill reflector with everything that's needed for the
+            // middlewares
+            $this->reflector->reflect($controller, $methodName);
+
+            $this->middlewareDispatcher->beforeController($controller,
+                $methodName);
+
+            $databaseStatsBefore = [];
+            if ($this->config->getSystemValueBool('debug', false)) {
+                $databaseStatsBefore = $this->connection->getInner()->getStats();
+            }
+
+            $response = $this->executeController($controller, $methodName);
+
+            if (!empty($databaseStatsBefore)) {
+                $databaseStatsAfter = $this->connection->getInner()->getStats();
+                $numBuilt = $databaseStatsAfter['built'] - $databaseStatsBefore['built'];
+                $numExecuted = $databaseStatsAfter['executed'] - $databaseStatsBefore['executed'];
+
+                if ($numBuilt > 50) {
+                    $this->logger->debug('Controller {class}::{method} created {count} QueryBuilder objects, please check if they are created inside a loop by accident.', [
+                        'class' => get_class($controller),
+                        'method' => $methodName,
+                        'count' => $numBuilt,
+                    ]);
+                }
+
+                if ($numExecuted > 100) {
+                    $this->logger->warning('Controller {class}::{method} executed {count} queries.', [
+                        'class' => get_class($controller),
+                        'method' => $methodName,
+                        'count' => $numExecuted,
+                    ]);
+                }
+            }
+
+            // if an exception appears, the middleware checks if it can handle the
+            // exception and creates a response. If no response is created, it is
+            // assumed that there's no middleware who can handle it and the error is
+            // thrown again
+        } catch (\Exception $exception) {
+            $response = $this->middlewareDispatcher->afterException(
+                $controller, $methodName, $exception);
+        } catch (\Throwable $throwable) {
+            $exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable);
+            $response = $this->middlewareDispatcher->afterException(
+                $controller, $methodName, $exception);
+        }
+
+        $response = $this->middlewareDispatcher->afterController(
+            $controller, $methodName, $response);
+
+        // depending on the cache object the headers need to be changed
+        $out[0] = $this->protocol->getStatusHeader($response->getStatus());
+        $out[1] = array_merge($response->getHeaders());
+        $out[2] = $response->getCookies();
+        $out[3] = $this->middlewareDispatcher->beforeOutput(
+            $controller, $methodName, $response->render()
+        );
+        $out[4] = $response;
+
+        return $out;
+    }
+
+
+    /**
+     * Uses the reflected parameters, types and request parameters to execute
+     * the controller
+     * @param Controller $controller the controller to be executed
+     * @param string $methodName the method on the controller that should be executed
+     * @return Response
+     */
+    private function executeController(Controller $controller, string $methodName): Response {
+        $arguments = [];
+
+        // valid types that will be cast
+        $types = ['int', 'integer', 'bool', 'boolean', 'float', 'double'];
+
+        foreach ($this->reflector->getParameters() as $param => $default) {
+            // try to get the parameter from the request object and cast
+            // it to the type annotated in the @param annotation
+            $value = $this->request->getParam($param, $default);
+            $type = $this->reflector->getType($param);
+
+            // Converted the string `'false'` to false when the controller wants a boolean
+            if ($value === 'false' && ($type === 'bool' || $type === 'boolean')) {
+                $value = false;
+            } elseif ($value !== null && \in_array($type, $types, true)) {
+                settype($value, $type);
+                $this->ensureParameterValueSatisfiesRange($param, $value);
+            } elseif ($value === null && $type !== null && $this->appContainer->has($type)) {
+                $value = $this->appContainer->get($type);
+            }
+
+            $arguments[] = $value;
+        }
+
+        $this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
+        try {
+            $response = \call_user_func_array([$controller, $methodName], $arguments);
+        } catch (\TypeError $e) {
+            // Only intercept TypeErrors occurring on the first line, meaning that the invocation of the controller method failed.
+            // Any other TypeError happens inside the controller method logic and should be logged as normal.
+            if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
+                $this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
+                return new Response(Http::STATUS_BAD_REQUEST);
+            }
+
+            throw $e;
+        }
+        $this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
+
+        if (!($response instanceof Response)) {
+            $this->logger->debug($controller::class . '::' . $methodName . ' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
+        }
+
+        // format response
+        if ($response instanceof DataResponse || !($response instanceof Response)) {
+            $format = $this->request->getFormat();
+
+            if ($format !== null) {
+                $response = $controller->buildResponse($response, $format);
+            } else {
+                $response = $controller->buildResponse($response);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @psalm-param mixed $value
+     * @throws ParameterOutOfRangeException
+     */
+    private function ensureParameterValueSatisfiesRange(string $param, $value): void {
+        $rangeInfo = $this->reflector->getRange($param);
+        if ($rangeInfo) {
+            if ($value < $rangeInfo['min'] || $value > $rangeInfo['max']) {
+                throw new ParameterOutOfRangeException(
+                    $param,
+                    $value,
+                    $rangeInfo['min'],
+                    $rangeInfo['max'],
+                );
+            }
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -147,7 +147,7 @@ 
 			$response = $this->middlewareDispatcher->afterException(
 				$controller, $methodName, $exception);
 		} catch (\Throwable $throwable) {
-			$exception = new \Exception($throwable->getMessage() . ' in file \'' . $throwable->getFile() . '\' line ' . $throwable->getLine(), $throwable->getCode(), $throwable);
+			$exception = new \Exception($throwable->getMessage().' in file \''.$throwable->getFile().'\' line '.$throwable->getLine(), $throwable->getCode(), $throwable);
 			$response = $this->middlewareDispatcher->afterException(
 				$controller, $methodName, $exception);
 		}
@@ -200,23 +200,23 @@ 
 			$arguments[] = $value;
 		}
 
-		$this->eventLogger->start('controller:' . get_class($controller) . '::' . $methodName, 'App framework controller execution');
+		$this->eventLogger->start('controller:'.get_class($controller).'::'.$methodName, 'App framework controller execution');
 		try {
 			$response = \call_user_func_array([$controller, $methodName], $arguments);
 		} catch (\TypeError $e) {
 			// Only intercept TypeErrors occurring on the first line, meaning that the invocation of the controller method failed.
 			// Any other TypeError happens inside the controller method logic and should be logged as normal.
 			if ($e->getFile() === $this->reflector->getFile() && $e->getLine() === $this->reflector->getStartLine()) {
-				$this->logger->debug('Failed to call controller method: ' . $e->getMessage(), ['exception' => $e]);
+				$this->logger->debug('Failed to call controller method: '.$e->getMessage(), ['exception' => $e]);
 				return new Response(Http::STATUS_BAD_REQUEST);
 			}
 
 			throw $e;
 		}
-		$this->eventLogger->end('controller:' . get_class($controller) . '::' . $methodName);
+		$this->eventLogger->end('controller:'.get_class($controller).'::'.$methodName);
 
 		if (!($response instanceof Response)) {
-			$this->logger->debug($controller::class . '::' . $methodName . ' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
+			$this->logger->debug($controller::class.'::'.$methodName.' returned raw data. Please wrap it in a Response or one of it\'s inheritors.');
 		}
 
 		// format response

lib/private/Preview/Storage/LocalPreviewStorage.php

Indentation +212 added lines, -212 removed lines

@@ -29,216 +29,216 @@
 use RecursiveIteratorIterator;
 
 class LocalPreviewStorage implements IPreviewStorage {
-	private readonly string $rootFolder;
-	private readonly string $instanceId;
-
-	public function __construct(
-		private readonly IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-		private readonly IAppConfig $appConfig,
-		private readonly IDBConnection $connection,
-		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly LoggerInterface $logger,
-		private readonly IGenerator $generator,
-	) {
-		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
-	}
-
-	#[Override]
-	public function writePreview(Preview $preview, mixed $stream): int {
-		$previewPath = $this->constructPath($preview);
-		$this->createParentFiles($previewPath);
-		return file_put_contents($previewPath, $stream);
-	}
-
-	#[Override]
-	public function readPreview(Preview $preview): mixed {
-		$previewPath = $this->constructPath($preview);
-		$resource = @fopen($previewPath, 'r');
-		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
-		}
-		return $resource;
-	}
-
-	#[Override]
-	public function deletePreview(Preview $preview): void {
-		$previewPath = $this->constructPath($preview);
-		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
-		}
-	}
-
-	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
-	}
-
-	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
-	}
-
-	private function createParentFiles(string $path): void {
-		$dirname = dirname($path);
-		@mkdir($dirname, recursive: true);
-		if (!is_dir($dirname)) {
-			throw new NotPermittedException("Unable to create directory '$dirname'");
-		}
-	}
-
-	#[Override]
-	public function migratePreview(Preview $preview, SimpleFile $file): void {
-		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
-		if (!file_exists($sourcePath)) {
-			return;
-		}
-
-		$destinationPath = $this->constructPath($preview);
-		if (file_exists($destinationPath)) {
-			@unlink($sourcePath); // We already have a new preview, just delete the old one
-			return;
-		}
-
-		$this->createParentFiles($destinationPath);
-		$ok = rename($sourcePath, $destinationPath);
-		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
-		}
-	}
-
-	#[Override]
-	public function scan(): int {
-		$checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
-
-		$scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
-		$previewsFound = 0;
-		foreach (new RecursiveIteratorIterator($scanner) as $file) {
-			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
-				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
-					continue;
-				}
-				$preview->setId($this->generator->nextId());
-				try {
-					$preview->setSize($file->getSize());
-					$preview->setMtime($file->getMtime());
-					$preview->setEncrypted(false);
-
-					$qb = $this->connection->getQueryBuilder();
-					$result = $qb->select('storage', 'etag', 'mimetype')
-						->from('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
-						->setMaxResults(1)
-						->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
-						->executeQuery()
-						->fetchAll();
-
-					if (empty($result)) {
-						// original file is deleted
-						@unlink($file->getRealPath());
-						continue;
-					}
-
-					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
-						$rowAffected = $qb->delete('filecache')
-							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
-							->executeStatement();
-						if ($rowAffected > 0) {
-							$this->deleteParentsFromFileCache(dirname($relativePath));
-						}
-					}
-
-					$preview->setStorageId($result[0]['storage']);
-					$preview->setEtag($result[0]['etag']);
-					$preview->setSourceMimetype($result[0]['mimetype']);
-
-					// try to insert, if that fails the preview is already in the DB
-					$this->previewMapper->insert($preview);
-
-					// Move old flat preview to new format
-					$dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
-					if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
-						$previewPath = $this->constructPath($preview);
-						$this->createParentFiles($previewPath);
-						$ok = rename($file->getRealPath(), $previewPath);
-						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
-						}
-					}
-				} catch (Exception $e) {
-					if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-						throw $e;
-					}
-				}
-				$previewsFound++;
-			}
-		}
-
-		return $previewsFound;
-	}
-
-	private function deleteParentsFromFileCache(string $dirname): void {
-		$qb = $this->connection->getQueryBuilder();
-
-		$result = $qb->select('fileid', 'path', 'storage', 'parent')
-			->from('filecache')
-			->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
-			->setMaxResults(1)
-			->runAcrossAllShards()
-			->executeQuery()
-			->fetchAll();
-
-		if (empty($result)) {
-			return;
-		}
-
-		$this->connection->beginTransaction();
-
-		$parentId = $result[0]['parent'];
-		$fileId = $result[0]['fileid'];
-		$storage = $result[0]['storage'];
-
-		try {
-			while (true) {
-				$qb = $this->connection->getQueryBuilder();
-				$childs = $qb->select('fileid', 'path', 'storage')
-					->from('filecache')
-					->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (!empty($childs)) {
-					break;
-				}
-
-				$qb = $this->connection->getQueryBuilder();
-				$qb->delete('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-					->hintShardKey('storage', $result[0]['storage'])
-					->executeStatement();
-
-				$qb = $this->connection->getQueryBuilder();
-				$result = $qb->select('fileid', 'path', 'storage', 'parent')
-					->from('filecache')
-					->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
-					->setMaxResults(1)
-					->hintShardKey('storage', $storage)
-					->executeQuery()
-					->fetchAll();
-
-				if (empty($result)) {
-					break;
-				}
-
-				$fileId = $parentId;
-				$parentId = $result[0]['parent'];
-			}
-		} finally {
-			$this->connection->commit();
-		}
-	}
+    private readonly string $rootFolder;
+    private readonly string $instanceId;
+
+    public function __construct(
+        private readonly IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+        private readonly IAppConfig $appConfig,
+        private readonly IDBConnection $connection,
+        private readonly IMimeTypeDetector $mimeTypeDetector,
+        private readonly LoggerInterface $logger,
+        private readonly IGenerator $generator,
+    ) {
+        $this->instanceId = $this->config->getSystemValueString('instanceid');
+        $this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+    }
+
+    #[Override]
+    public function writePreview(Preview $preview, mixed $stream): int {
+        $previewPath = $this->constructPath($preview);
+        $this->createParentFiles($previewPath);
+        return file_put_contents($previewPath, $stream);
+    }
+
+    #[Override]
+    public function readPreview(Preview $preview): mixed {
+        $previewPath = $this->constructPath($preview);
+        $resource = @fopen($previewPath, 'r');
+        if ($resource === false) {
+            throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+        }
+        return $resource;
+    }
+
+    #[Override]
+    public function deletePreview(Preview $preview): void {
+        $previewPath = $this->constructPath($preview);
+        if (!@unlink($previewPath) && is_file($previewPath)) {
+            throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+        }
+    }
+
+    public function getPreviewRootFolder(): string {
+        return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+    }
+
+    private function constructPath(Preview $preview): string {
+        return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+    }
+
+    private function createParentFiles(string $path): void {
+        $dirname = dirname($path);
+        @mkdir($dirname, recursive: true);
+        if (!is_dir($dirname)) {
+            throw new NotPermittedException("Unable to create directory '$dirname'");
+        }
+    }
+
+    #[Override]
+    public function migratePreview(Preview $preview, SimpleFile $file): void {
+        // legacy flat directory
+        $sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+        if (!file_exists($sourcePath)) {
+            return;
+        }
+
+        $destinationPath = $this->constructPath($preview);
+        if (file_exists($destinationPath)) {
+            @unlink($sourcePath); // We already have a new preview, just delete the old one
+            return;
+        }
+
+        $this->createParentFiles($destinationPath);
+        $ok = rename($sourcePath, $destinationPath);
+        if (!$ok) {
+            throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+        }
+    }
+
+    #[Override]
+    public function scan(): int {
+        $checkForFileCache = !$this->appConfig->getValueBool('core', 'previewMovedDone');
+
+        $scanner = new RecursiveDirectoryIterator($this->getPreviewRootFolder());
+        $previewsFound = 0;
+        foreach (new RecursiveIteratorIterator($scanner) as $file) {
+            if ($file->isFile()) {
+                $preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+                if ($preview === false) {
+                    $this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+                    continue;
+                }
+                $preview->setId($this->generator->nextId());
+                try {
+                    $preview->setSize($file->getSize());
+                    $preview->setMtime($file->getMtime());
+                    $preview->setEncrypted(false);
+
+                    $qb = $this->connection->getQueryBuilder();
+                    $result = $qb->select('storage', 'etag', 'mimetype')
+                        ->from('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($preview->getFileId())))
+                        ->setMaxResults(1)
+                        ->runAcrossAllShards() // Unavoidable because we can't extract the storage_id from the preview name
+                        ->executeQuery()
+                        ->fetchAll();
+
+                    if (empty($result)) {
+                        // original file is deleted
+                        @unlink($file->getRealPath());
+                        continue;
+                    }
+
+                    if ($checkForFileCache) {
+                        $relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+                        $rowAffected = $qb->delete('filecache')
+                            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
+                            ->executeStatement();
+                        if ($rowAffected > 0) {
+                            $this->deleteParentsFromFileCache(dirname($relativePath));
+                        }
+                    }
+
+                    $preview->setStorageId($result[0]['storage']);
+                    $preview->setEtag($result[0]['etag']);
+                    $preview->setSourceMimetype($result[0]['mimetype']);
+
+                    // try to insert, if that fails the preview is already in the DB
+                    $this->previewMapper->insert($preview);
+
+                    // Move old flat preview to new format
+                    $dirName = str_replace($this->getPreviewRootFolder(), '', $file->getPath());
+                    if (preg_match('/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9a-e]\/[0-9]+/', $dirName) !== 1) {
+                        $previewPath = $this->constructPath($preview);
+                        $this->createParentFiles($previewPath);
+                        $ok = rename($file->getRealPath(), $previewPath);
+                        if (!$ok) {
+                            throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+                        }
+                    }
+                } catch (Exception $e) {
+                    if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                        throw $e;
+                    }
+                }
+                $previewsFound++;
+            }
+        }
+
+        return $previewsFound;
+    }
+
+    private function deleteParentsFromFileCache(string $dirname): void {
+        $qb = $this->connection->getQueryBuilder();
+
+        $result = $qb->select('fileid', 'path', 'storage', 'parent')
+            ->from('filecache')
+            ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($dirname))))
+            ->setMaxResults(1)
+            ->runAcrossAllShards()
+            ->executeQuery()
+            ->fetchAll();
+
+        if (empty($result)) {
+            return;
+        }
+
+        $this->connection->beginTransaction();
+
+        $parentId = $result[0]['parent'];
+        $fileId = $result[0]['fileid'];
+        $storage = $result[0]['storage'];
+
+        try {
+            while (true) {
+                $qb = $this->connection->getQueryBuilder();
+                $childs = $qb->select('fileid', 'path', 'storage')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('parent', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (!empty($childs)) {
+                    break;
+                }
+
+                $qb = $this->connection->getQueryBuilder();
+                $qb->delete('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
+                    ->hintShardKey('storage', $result[0]['storage'])
+                    ->executeStatement();
+
+                $qb = $this->connection->getQueryBuilder();
+                $result = $qb->select('fileid', 'path', 'storage', 'parent')
+                    ->from('filecache')
+                    ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($parentId)))
+                    ->setMaxResults(1)
+                    ->hintShardKey('storage', $storage)
+                    ->executeQuery()
+                    ->fetchAll();
+
+                if (empty($result)) {
+                    break;
+                }
+
+                $fileId = $parentId;
+                $parentId = $result[0]['parent'];
+            }
+        } finally {
+            $this->connection->commit();
+        }
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -42,7 +42,7 @@ 
 		private readonly IGenerator $generator,
 	) {
 		$this->instanceId = $this->config->getSystemValueString('instanceid');
-		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+		$this->rootFolder = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data');
 	}
 
 	#[Override]
@@ -57,7 +57,7 @@ 
 		$previewPath = $this->constructPath($preview);
 		$resource = @fopen($previewPath, 'r');
 		if ($resource === false) {
-			throw new NotFoundException('Unable to open preview stream at ' . $previewPath);
+			throw new NotFoundException('Unable to open preview stream at '.$previewPath);
 		}
 		return $resource;
 	}
@@ -66,16 +66,16 @@ 
 	public function deletePreview(Preview $preview): void {
 		$previewPath = $this->constructPath($preview);
 		if (!@unlink($previewPath) && is_file($previewPath)) {
-			throw new NotPermittedException('Unable to delete preview at ' . $previewPath);
+			throw new NotPermittedException('Unable to delete preview at '.$previewPath);
 		}
 	}
 
 	public function getPreviewRootFolder(): string {
-		return $this->rootFolder . '/appdata_' . $this->instanceId . '/preview/';
+		return $this->rootFolder.'/appdata_'.$this->instanceId.'/preview/';
 	}
 
 	private function constructPath(Preview $preview): string {
-		return $this->getPreviewRootFolder() . implode('/', str_split(substr(md5((string)$preview->getFileId()), 0, 7))) . '/' . $preview->getFileId() . '/' . $preview->getName();
+		return $this->getPreviewRootFolder().implode('/', str_split(substr(md5((string) $preview->getFileId()), 0, 7))).'/'.$preview->getFileId().'/'.$preview->getName();
 	}
 
 	private function createParentFiles(string $path): void {
@@ -89,7 +89,7 @@ 
 	#[Override]
 	public function migratePreview(Preview $preview, SimpleFile $file): void {
 		// legacy flat directory
-		$sourcePath = $this->getPreviewRootFolder() . $preview->getFileId() . '/' . $preview->getName();
+		$sourcePath = $this->getPreviewRootFolder().$preview->getFileId().'/'.$preview->getName();
 		if (!file_exists($sourcePath)) {
 			return;
 		}
@@ -103,7 +103,7 @@ 
 		$this->createParentFiles($destinationPath);
 		$ok = rename($sourcePath, $destinationPath);
 		if (!$ok) {
-			throw new LogicException('Failed to move ' . $sourcePath . ' to ' . $destinationPath);
+			throw new LogicException('Failed to move '.$sourcePath.' to '.$destinationPath);
 		}
 	}
 
@@ -115,9 +115,9 @@ 
 		$previewsFound = 0;
 		foreach (new RecursiveIteratorIterator($scanner) as $file) {
 			if ($file->isFile()) {
-				$preview = Preview::fromPath((string)$file, $this->mimeTypeDetector);
+				$preview = Preview::fromPath((string) $file, $this->mimeTypeDetector);
 				if ($preview === false) {
-					$this->logger->error('Unable to parse preview information for ' . $file->getRealPath());
+					$this->logger->error('Unable to parse preview information for '.$file->getRealPath());
 					continue;
 				}
 				$preview->setId($this->generator->nextId());
@@ -142,7 +142,7 @@ 
 					}
 
 					if ($checkForFileCache) {
-						$relativePath = str_replace($this->rootFolder . '/', '', $file->getRealPath());
+						$relativePath = str_replace($this->rootFolder.'/', '', $file->getRealPath());
 						$rowAffected = $qb->delete('filecache')
 							->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($relativePath))))
 							->executeStatement();
@@ -165,7 +165,7 @@ 
 						$this->createParentFiles($previewPath);
 						$ok = rename($file->getRealPath(), $previewPath);
 						if (!$ok) {
-							throw new LogicException('Failed to move ' . $file->getRealPath() . ' to ' . $previewPath);
+							throw new LogicException('Failed to move '.$file->getRealPath().' to '.$previewPath);
 						}
 					}
 				} catch (Exception $e) {

lib/private/Preview/Db/PreviewMapper.php

Indentation +205 added lines, -205 removed lines

@@ -23,209 +23,209 @@
  */
 class PreviewMapper extends QBMapper {
 
-	private const TABLE_NAME = 'previews';
-	private const LOCATION_TABLE_NAME = 'preview_locations';
-	private const VERSION_TABLE_NAME = 'preview_versions';
-
-	public function __construct(
-		IDBConnection $db,
-		private readonly IMimeTypeLoader $mimeTypeLoader,
-		private readonly IGenerator $snowflake,
-	) {
-		parent::__construct($db, self::TABLE_NAME, Preview::class);
-	}
-
-	protected function mapRowToEntity(array $row): Entity {
-		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
-		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
-
-		return parent::mapRowToEntity($row);
-	}
-
-	#[Override]
-	public function insert(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-
-		$preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
-		$preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
-
-		if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
-			$qb = $this->db->getQueryBuilder();
-			$id = $this->snowflake->nextId();
-			$qb->insert(self::VERSION_TABLE_NAME)
-				->values([
-					'id' => $id,
-					'version' => $preview->getVersion(),
-					'file_id' => $preview->getFileId(),
-				])
-				->executeStatement();
-			$entity->setVersionId($id);
-		}
-		return parent::insert($preview);
-	}
-
-	#[Override]
-	public function update(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-
-		$preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
-		$preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
-
-		return parent::update($preview);
-	}
-
-	#[Override]
-	public function delete(Entity $entity): Entity {
-		/** @var Preview $preview */
-		$preview = $entity;
-		if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
-			$qb = $this->db->getQueryBuilder();
-			$qb->delete(self::VERSION_TABLE_NAME)
-				->where($qb->expr()->eq('file_id', $qb->createNamedParameter($preview->getFileId())))
-				->andWhere($qb->expr()->eq('version', $qb->createNamedParameter($preview->getVersion())))
-				->executeStatement();
-		}
-
-		return parent::delete($entity);
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 * @throws Exception
-	 */
-	public function getAvailablePreviewsForFile(int $fileId): \Generator {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where($selectQb->expr()->eq('p.file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-		yield from $this->yieldEntities($selectQb);
-	}
-
-	/**
-	 * @param int[] $fileIds
-	 * @return array<int, Preview[]>
-	 * @throws Exception
-	 */
-	public function getAvailablePreviews(array $fileIds): array {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where(
-				$selectQb->expr()->in('p.file_id', $selectQb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)),
-			);
-		$previews = array_fill_keys($fileIds, []);
-		foreach ($this->yieldEntities($selectQb) as $preview) {
-			$previews[$preview->getFileId()][] = $preview;
-		}
-		return $previews;
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 */
-	public function getByFileId(int $fileId): \Generator {
-		$selectQb = $this->db->getQueryBuilder();
-		$this->joinLocation($selectQb)
-			->where($selectQb->expr()->eq('file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-		yield from $this->yieldEntities($selectQb);
-	}
-
-	/**
-	 * @param int[] $previewIds
-	 */
-	public function deleteByIds(array $previewIds): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->andX(
-				$qb->expr()->in('id', $qb->createNamedParameter($previewIds, IQueryBuilder::PARAM_INT_ARRAY))
-			))->executeStatement();
-	}
-
-	protected function joinLocation(IQueryBuilder $qb): IQueryBuilder {
-		return $qb->select('p.*', 'l.bucket_name', 'l.object_store_name', 'v.version')
-			->from(self::TABLE_NAME, 'p')
-			->leftJoin('p', self::LOCATION_TABLE_NAME, 'l', $qb->expr()->eq(
-				'p.location_id', 'l.id'
-			))
-			->leftJoin('p', self::VERSION_TABLE_NAME, 'v', $qb->expr()->eq(
-				'p.version_id', 'v.id'
-			));
-	}
-
-	/**
-	 * Get the location id corresponding to the $bucket and $objectStore. Create one
-	 * if not existing yet.
-	 *
-	 * @throws Exception
-	 */
-	public function getLocationId(string $bucket, string $objectStore): string {
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('id')
-			->from(self::LOCATION_TABLE_NAME)
-			->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
-			->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
-			->executeQuery();
-		$data = $result->fetchOne();
-		if ($data) {
-			return (string)$data;
-		} else {
-			try {
-				$id = $this->snowflake->nextId();
-				$qb->insert(self::LOCATION_TABLE_NAME)
-					->values([
-						'id' => $qb->createNamedParameter($id),
-						'bucket_name' => $qb->createNamedParameter($bucket),
-						'object_store_name' => $qb->createNamedParameter($objectStore),
-					])->executeStatement();
-				return $id;
-			} catch (Exception $e) {
-				if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					// Fetch again as there seems to be another entry added meanwhile
-					$result = $qb->select('id')
-						->from(self::LOCATION_TABLE_NAME)
-						->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
-						->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
-						->executeQuery();
-					$data = $result->fetchOne();
-					if ($data) {
-						return (string)$data;
-					}
-				}
-
-				throw $e;
-			}
-		}
-	}
-
-	public function deleteAll(): void {
-		$delete = $this->db->getQueryBuilder();
-		$delete->delete($this->getTableName());
-	}
-
-	/**
-	 * @return \Generator<Preview>
-	 */
-	public function getPreviews(int $lastId, int $limit = 1000): \Generator {
-		$qb = $this->db->getQueryBuilder();
-		$this->joinLocation($qb)
-			->where($qb->expr()->gt('p.id', $qb->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
-			->setMaxResults($limit);
-		return $this->yieldEntities($qb);
-
-	}
-
-	/**
-	 * @param string[] $mimeTypes
-	 * @return \Generator<Preview>
-	 */
-	public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
-		$qb = $this->db->getQueryBuilder();
-		$this->joinLocation($qb)
-			->where($qb->expr()->orX(
-				...array_map(function (string $mimeType) use ($qb): string {
-					return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
-				}, $mimeTypes)
-			));
-		return $this->yieldEntities($qb);
-	}
+    private const TABLE_NAME = 'previews';
+    private const LOCATION_TABLE_NAME = 'preview_locations';
+    private const VERSION_TABLE_NAME = 'preview_versions';
+
+    public function __construct(
+        IDBConnection $db,
+        private readonly IMimeTypeLoader $mimeTypeLoader,
+        private readonly IGenerator $snowflake,
+    ) {
+        parent::__construct($db, self::TABLE_NAME, Preview::class);
+    }
+
+    protected function mapRowToEntity(array $row): Entity {
+        $row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
+        $row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
+
+        return parent::mapRowToEntity($row);
+    }
+
+    #[Override]
+    public function insert(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+
+        $preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
+        $preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
+
+        if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
+            $qb = $this->db->getQueryBuilder();
+            $id = $this->snowflake->nextId();
+            $qb->insert(self::VERSION_TABLE_NAME)
+                ->values([
+                    'id' => $id,
+                    'version' => $preview->getVersion(),
+                    'file_id' => $preview->getFileId(),
+                ])
+                ->executeStatement();
+            $entity->setVersionId($id);
+        }
+        return parent::insert($preview);
+    }
+
+    #[Override]
+    public function update(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+
+        $preview->setMimetypeId($this->mimeTypeLoader->getId($preview->getMimeType()));
+        $preview->setSourceMimetypeId($this->mimeTypeLoader->getId($preview->getSourceMimeType()));
+
+        return parent::update($preview);
+    }
+
+    #[Override]
+    public function delete(Entity $entity): Entity {
+        /** @var Preview $preview */
+        $preview = $entity;
+        if ($preview->getVersion() !== null && $preview->getVersion() !== '') {
+            $qb = $this->db->getQueryBuilder();
+            $qb->delete(self::VERSION_TABLE_NAME)
+                ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($preview->getFileId())))
+                ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter($preview->getVersion())))
+                ->executeStatement();
+        }
+
+        return parent::delete($entity);
+    }
+
+    /**
+     * @return \Generator<Preview>
+     * @throws Exception
+     */
+    public function getAvailablePreviewsForFile(int $fileId): \Generator {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where($selectQb->expr()->eq('p.file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+        yield from $this->yieldEntities($selectQb);
+    }
+
+    /**
+     * @param int[] $fileIds
+     * @return array<int, Preview[]>
+     * @throws Exception
+     */
+    public function getAvailablePreviews(array $fileIds): array {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where(
+                $selectQb->expr()->in('p.file_id', $selectQb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)),
+            );
+        $previews = array_fill_keys($fileIds, []);
+        foreach ($this->yieldEntities($selectQb) as $preview) {
+            $previews[$preview->getFileId()][] = $preview;
+        }
+        return $previews;
+    }
+
+    /**
+     * @return \Generator<Preview>
+     */
+    public function getByFileId(int $fileId): \Generator {
+        $selectQb = $this->db->getQueryBuilder();
+        $this->joinLocation($selectQb)
+            ->where($selectQb->expr()->eq('file_id', $selectQb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+        yield from $this->yieldEntities($selectQb);
+    }
+
+    /**
+     * @param int[] $previewIds
+     */
+    public function deleteByIds(array $previewIds): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->andX(
+                $qb->expr()->in('id', $qb->createNamedParameter($previewIds, IQueryBuilder::PARAM_INT_ARRAY))
+            ))->executeStatement();
+    }
+
+    protected function joinLocation(IQueryBuilder $qb): IQueryBuilder {
+        return $qb->select('p.*', 'l.bucket_name', 'l.object_store_name', 'v.version')
+            ->from(self::TABLE_NAME, 'p')
+            ->leftJoin('p', self::LOCATION_TABLE_NAME, 'l', $qb->expr()->eq(
+                'p.location_id', 'l.id'
+            ))
+            ->leftJoin('p', self::VERSION_TABLE_NAME, 'v', $qb->expr()->eq(
+                'p.version_id', 'v.id'
+            ));
+    }
+
+    /**
+     * Get the location id corresponding to the $bucket and $objectStore. Create one
+     * if not existing yet.
+     *
+     * @throws Exception
+     */
+    public function getLocationId(string $bucket, string $objectStore): string {
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('id')
+            ->from(self::LOCATION_TABLE_NAME)
+            ->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
+            ->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
+            ->executeQuery();
+        $data = $result->fetchOne();
+        if ($data) {
+            return (string)$data;
+        } else {
+            try {
+                $id = $this->snowflake->nextId();
+                $qb->insert(self::LOCATION_TABLE_NAME)
+                    ->values([
+                        'id' => $qb->createNamedParameter($id),
+                        'bucket_name' => $qb->createNamedParameter($bucket),
+                        'object_store_name' => $qb->createNamedParameter($objectStore),
+                    ])->executeStatement();
+                return $id;
+            } catch (Exception $e) {
+                if ($e->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    // Fetch again as there seems to be another entry added meanwhile
+                    $result = $qb->select('id')
+                        ->from(self::LOCATION_TABLE_NAME)
+                        ->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($bucket)))
+                        ->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($objectStore)))
+                        ->executeQuery();
+                    $data = $result->fetchOne();
+                    if ($data) {
+                        return (string)$data;
+                    }
+                }
+
+                throw $e;
+            }
+        }
+    }
+
+    public function deleteAll(): void {
+        $delete = $this->db->getQueryBuilder();
+        $delete->delete($this->getTableName());
+    }
+
+    /**
+     * @return \Generator<Preview>
+     */
+    public function getPreviews(int $lastId, int $limit = 1000): \Generator {
+        $qb = $this->db->getQueryBuilder();
+        $this->joinLocation($qb)
+            ->where($qb->expr()->gt('p.id', $qb->createNamedParameter($lastId, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults($limit);
+        return $this->yieldEntities($qb);
+
+    }
+
+    /**
+     * @param string[] $mimeTypes
+     * @return \Generator<Preview>
+     */
+    public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
+        $qb = $this->db->getQueryBuilder();
+        $this->joinLocation($qb)
+            ->where($qb->expr()->orX(
+                ...array_map(function (string $mimeType) use ($qb): string {
+                    return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
+                }, $mimeTypes)
+            ));
+        return $this->yieldEntities($qb);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -36,8 +36,8 @@ 
 	}
 
 	protected function mapRowToEntity(array $row): Entity {
-		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype_id']);
-		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int)$row['source_mimetype_id']);
+		$row['mimetype'] = $this->mimeTypeLoader->getMimetypeById((int) $row['mimetype_id']);
+		$row['source_mimetype'] = $this->mimeTypeLoader->getMimetypeById((int) $row['source_mimetype_id']);
 
 		return parent::mapRowToEntity($row);
 	}
@@ -167,7 +167,7 @@ 
 			->executeQuery();
 		$data = $result->fetchOne();
 		if ($data) {
-			return (string)$data;
+			return (string) $data;
 		} else {
 			try {
 				$id = $this->snowflake->nextId();
@@ -188,7 +188,7 @@ 
 						->executeQuery();
 					$data = $result->fetchOne();
 					if ($data) {
-						return (string)$data;
+						return (string) $data;
 					}
 				}
 
@@ -222,7 +222,7 @@ 
 		$qb = $this->db->getQueryBuilder();
 		$this->joinLocation($qb)
 			->where($qb->expr()->orX(
-				...array_map(function (string $mimeType) use ($qb): string {
+				...array_map(function(string $mimeType) use ($qb): string {
 					return $qb->expr()->eq('source_mimetype_id', $qb->createNamedParameter($this->mimeTypeLoader->getId($mimeType), IQueryBuilder::PARAM_INT));
 				}, $mimeTypes)
 			));

lib/private/Preview/Db/Preview.php

Indentation +123 added lines, -123 removed lines

@@ -56,127 +56,127 @@
  * @see PreviewMapper
  */
 class Preview extends Entity {
-	protected ?int $fileId = null;
-	protected ?int $oldFileId = null;
-	protected ?int $storageId = null;
-	protected ?string $locationId = null;
-	protected ?string $bucketName = null;
-	protected ?string $objectStoreName = null;
-	protected ?int $width = null;
-	protected ?int $height = null;
-	protected ?int $mimetypeId = null;
-	protected ?int $sourceMimetypeId = null;
-	protected string $mimetype = 'application/octet-stream';
-	protected string $sourceMimetype = 'application/octet-stream';
-	protected ?int $mtime = null;
-	protected ?int $size = null;
-	protected ?bool $max = null;
-	protected ?bool $cropped = null;
-	protected ?string $etag = null;
-	protected ?string $version = null;
-	protected ?string $versionId = null;
-	protected ?bool $encrypted = null;
-
-	public function __construct() {
-		$this->addType('id', Types::STRING);
-		$this->addType('fileId', Types::BIGINT);
-		$this->addType('storageId', Types::BIGINT);
-		$this->addType('oldFileId', Types::BIGINT);
-		$this->addType('locationId', Types::STRING);
-		$this->addType('width', Types::INTEGER);
-		$this->addType('height', Types::INTEGER);
-		$this->addType('mimetypeId', Types::INTEGER);
-		$this->addType('sourceMimetypeId', Types::INTEGER);
-		$this->addType('mtime', Types::INTEGER);
-		$this->addType('size', Types::INTEGER);
-		$this->addType('max', Types::BOOLEAN);
-		$this->addType('cropped', Types::BOOLEAN);
-		$this->addType('encrypted', Types::BOOLEAN);
-		$this->addType('etag', Types::STRING);
-		$this->addType('versionId', Types::STRING);
-	}
-
-	public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview|false {
-		$preview = new self();
-		$preview->setFileId((int)basename(dirname($path)));
-
-		$fileName = pathinfo($path, PATHINFO_FILENAME) . '.' . pathinfo($path, PATHINFO_EXTENSION);
-		$ok = preg_match('/(([A-Za-z0-9\+\/]+)-)?([0-9]+)-([0-9]+)(-(max))?(-(crop))?\.([a-z]{3,4})/', $fileName, $matches);
-
-		if ($ok !== 1) {
-			return false;
-		}
-
-		[
-			2 => $version,
-			3 => $width,
-			4 => $height,
-			6 => $max,
-			8 => $crop,
-		] = $matches;
-
-		$preview->setMimeType($mimeTypeDetector->detectPath($fileName));
-
-		$preview->setWidth((int)$width);
-		$preview->setHeight((int)$height);
-		$preview->setCropped($crop === 'crop');
-		$preview->setMax($max === 'max');
-
-		if (!empty($version)) {
-			$preview->setVersion($version);
-		}
-		return $preview;
-	}
-
-	public function getName(): string {
-		$path = ($this->getVersion() > -1 ? $this->getVersion() . '-' : '') . $this->getWidth() . '-' . $this->getHeight();
-		if ($this->isCropped()) {
-			$path .= '-crop';
-		}
-		if ($this->isMax()) {
-			$path .= '-max';
-		}
-
-		$ext = $this->getExtension();
-		$path .= '.' . $ext;
-		return $path;
-	}
-
-	public function getExtension(): string {
-		return match ($this->getMimeType()) {
-			'image/png' => 'png',
-			'image/gif' => 'gif',
-			'image/jpeg' => 'jpg',
-			'image/webp' => 'webp',
-			default => 'png',
-		};
-	}
-
-	public function setBucketName(string $bucketName): void {
-		$this->bucketName = $bucketName;
-	}
-
-	public function setObjectStoreName(string $objectStoreName): void {
-		$this->objectStoreName = $objectStoreName;
-	}
-
-	public function setVersion(?string $version): void {
-		$this->version = $version;
-	}
-
-	public function getMimeType(): string {
-		return $this->mimetype;
-	}
-
-	public function setMimeType(string $mimeType): void {
-		$this->mimetype = $mimeType;
-	}
-
-	public function getSourceMimeType(): string {
-		return $this->sourceMimetype;
-	}
-
-	public function setSourceMimeType(string $mimeType): void {
-		$this->sourceMimetype = $mimeType;
-	}
+    protected ?int $fileId = null;
+    protected ?int $oldFileId = null;
+    protected ?int $storageId = null;
+    protected ?string $locationId = null;
+    protected ?string $bucketName = null;
+    protected ?string $objectStoreName = null;
+    protected ?int $width = null;
+    protected ?int $height = null;
+    protected ?int $mimetypeId = null;
+    protected ?int $sourceMimetypeId = null;
+    protected string $mimetype = 'application/octet-stream';
+    protected string $sourceMimetype = 'application/octet-stream';
+    protected ?int $mtime = null;
+    protected ?int $size = null;
+    protected ?bool $max = null;
+    protected ?bool $cropped = null;
+    protected ?string $etag = null;
+    protected ?string $version = null;
+    protected ?string $versionId = null;
+    protected ?bool $encrypted = null;
+
+    public function __construct() {
+        $this->addType('id', Types::STRING);
+        $this->addType('fileId', Types::BIGINT);
+        $this->addType('storageId', Types::BIGINT);
+        $this->addType('oldFileId', Types::BIGINT);
+        $this->addType('locationId', Types::STRING);
+        $this->addType('width', Types::INTEGER);
+        $this->addType('height', Types::INTEGER);
+        $this->addType('mimetypeId', Types::INTEGER);
+        $this->addType('sourceMimetypeId', Types::INTEGER);
+        $this->addType('mtime', Types::INTEGER);
+        $this->addType('size', Types::INTEGER);
+        $this->addType('max', Types::BOOLEAN);
+        $this->addType('cropped', Types::BOOLEAN);
+        $this->addType('encrypted', Types::BOOLEAN);
+        $this->addType('etag', Types::STRING);
+        $this->addType('versionId', Types::STRING);
+    }
+
+    public static function fromPath(string $path, IMimeTypeDetector $mimeTypeDetector): Preview|false {
+        $preview = new self();
+        $preview->setFileId((int)basename(dirname($path)));
+
+        $fileName = pathinfo($path, PATHINFO_FILENAME) . '.' . pathinfo($path, PATHINFO_EXTENSION);
+        $ok = preg_match('/(([A-Za-z0-9\+\/]+)-)?([0-9]+)-([0-9]+)(-(max))?(-(crop))?\.([a-z]{3,4})/', $fileName, $matches);
+
+        if ($ok !== 1) {
+            return false;
+        }
+
+        [
+            2 => $version,
+            3 => $width,
+            4 => $height,
+            6 => $max,
+            8 => $crop,
+        ] = $matches;
+
+        $preview->setMimeType($mimeTypeDetector->detectPath($fileName));
+
+        $preview->setWidth((int)$width);
+        $preview->setHeight((int)$height);
+        $preview->setCropped($crop === 'crop');
+        $preview->setMax($max === 'max');
+
+        if (!empty($version)) {
+            $preview->setVersion($version);
+        }
+        return $preview;
+    }
+
+    public function getName(): string {
+        $path = ($this->getVersion() > -1 ? $this->getVersion() . '-' : '') . $this->getWidth() . '-' . $this->getHeight();
+        if ($this->isCropped()) {
+            $path .= '-crop';
+        }
+        if ($this->isMax()) {
+            $path .= '-max';
+        }
+
+        $ext = $this->getExtension();
+        $path .= '.' . $ext;
+        return $path;
+    }
+
+    public function getExtension(): string {
+        return match ($this->getMimeType()) {
+            'image/png' => 'png',
+            'image/gif' => 'gif',
+            'image/jpeg' => 'jpg',
+            'image/webp' => 'webp',
+            default => 'png',
+        };
+    }
+
+    public function setBucketName(string $bucketName): void {
+        $this->bucketName = $bucketName;
+    }
+
+    public function setObjectStoreName(string $objectStoreName): void {
+        $this->objectStoreName = $objectStoreName;
+    }
+
+    public function setVersion(?string $version): void {
+        $this->version = $version;
+    }
+
+    public function getMimeType(): string {
+        return $this->mimetype;
+    }
+
+    public function setMimeType(string $mimeType): void {
+        $this->mimetype = $mimeType;
+    }
+
+    public function getSourceMimeType(): string {
+        return $this->sourceMimetype;
+    }
+
+    public function setSourceMimeType(string $mimeType): void {
+        $this->sourceMimetype = $mimeType;
+    }
 }